diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..5990fbc
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,434 @@
+<script>
+import router from "./static/common/js/router";
+import config from "./static/common/js/config.js"
+
+var jweixin = require("jweixin-module");
+export default {
+  data() {
+    return {
+      show: false,
+    }
+  },
+  globalData: {},
+  created() {
+
+  },
+  onLaunch() {
+    if (typeof window.entryUrl === 'undefined' || window.entryUrl === '') {
+      window.entryUrl = location.href.split('#')[0]
+    }
+    router.initApp(this);
+    // 处理项目加载时白名单不生效异常问题
+    let isUrl = this._route.fullPath.split('?')[0]
+    let notNeed = config.whiteList.includes(isUrl)
+    if (notNeed) {
+      uni.navigateTo({
+        url: this._route.fullPath,
+      });
+      return
+    }
+    var that = this;
+    uni.getSystemInfo({
+      success: function (res) {
+        // 根据 model 进行判断
+        if (res.model.indexOf("iPhone") >= 0) {
+          that.$u.vuex("vuex_iPhone", true);
+        }
+      },
+    });
+    if (!that.vuex_user.isFill) {
+      this.$u.vuex("vuex_msgList", "");
+      this.$u.vuex("vuex_user", "");
+      this.$u.vuex("vuex_token", "");
+      this.$u.vuex("vuex_userInfo", "");
+      uni.clearStorage();
+      this.$u.route({
+        url: "/pages/login/login/login",
+      });
+      return;
+
+      uni.navigateTo({
+        url: "/pages/login/roleSelection",
+      });
+      return
+    }
+
+
+  },
+  // onShow(){
+  //  console.log('onShow')
+  // },
+  methods: {
+    getLocation() {
+      var that = this;
+      if (this.isWechat()) {
+        const isiOS = !!navigator.userAgent.match(
+            /\(i[^;]+;( U;)? CPU.+Mac OS X/
+        ); //ios终端
+        // 进行签名的时候  Android 不用使用之前的链接， ios 需要
+        const signLink = isiOS
+            ? window.entryUrl
+            : window.location.href.split("#")[0];
+        //获取当前url然后传递给后台获取授权和签名信息，后台需要解码才能使用
+        // const url =encodeURIComponent(signLink);
+        const url = signLink;
+        const data = {
+          url: url,
+        };
+        this.$u.api.GetInfoMation(data).then((res) => {
+          jweixin.config({
+            debug: false,
+            appId: res.appId,
+            timestamp: res.timestamp,
+            nonceStr: res.noncestr,
+            signature: res.signature,
+            jsApiList: [
+              //这里是需要用到的接口名称
+              "getLocation", //获取位置
+              "openLocation", //打开位置
+            ],
+          });
+
+          // jweixin.config 执行失败时调用
+          jweixin.error((err) => {
+            uni.hideLoading();
+            console.log("授权失败，您可能无法使用部分功能", err);
+          });
+          jweixin.ready(function () {
+            jweixin.getLocation({
+              type: "gcj02", // 默认为wgs84的gps坐标，如果要返 回直接给openLocation用的火星坐标，可传入'gcj02'
+              success: (res) => {
+                uni.hideLoading();
+                that.$u.vuex('vuex_userLocation', res)
+
+                var data = {
+                  userId: that.vuex_user.id,
+                  longitude: res.longitude + "",
+                  latitude: res.latitude + "",
+                };
+                that.$u.api.upPosition(data)
+              },
+              fail: function (res) {
+                uni.hideLoading();
+                console.log(res, "err");
+              },
+              complete: function (res) {
+                uni.hideLoading();
+                console.log(res, "is");
+              },
+            });
+          });
+        });
+      } else {
+        uni.getLocation({
+          type: "gcj02 ",
+          isHighAccuracy: true,
+          highAccuracyExpireTime: 3000,
+          success: (res) => {
+
+            uni.hideLoading();
+
+            this.$u.vuex('vuex_userLocation', res)
+            var data = {
+              userId: this.vuex_user.id,
+              longitude: res.longitude + "",
+              latitude: res.latitude + "",
+            };
+            this.$u.api.upPosition(data)
+          },
+          fail: (err) => {
+            uni.hideLoading();
+            console.log("地理位置获取失败", err);
+          },
+        });
+      }
+    },
+    isWechat() {
+      var ua = window.navigator.userAgent.toLowerCase();
+      if (ua.match(/micromessenger/i) == "micromessenger") {
+        // console.log(‘是微信客户端’)
+        return true;
+      } else {
+        // console.log(‘不是微信客户端’)
+        return false;
+      }
+    },
+    charLink() {
+      var that = this;
+      (function start(ms) {
+        setTimeout(() => {
+          try {
+            that.$connection
+                .start()
+                .then(() => {
+                  // console.log(that.$connection.connection.transport.webSocket._webSocket.url)
+                  // that.connectionId = that.$connection.connection.transport.url.split(
+                  // 	"=")[1]
+                  that.connectionId = that.$connection.connection.transport.webSocket._webSocket.url.split(
+                      "=")[1]
+                  that.CharLogin()
+                })
+                .catch((e) => {
+                  //重试
+                  that.$connection.sto
+                  console.log("websocket连接失败", e);
+                  return start(5000);
+                });
+          } catch (e) {
+            //重试
+            return start(5000);
+          }
+        }, ms);
+      })(0)
+      //接收消息
+      this.$connection.on("ReceiveMessage", (user, message, type) => {
+
+        if (this._route.fullPath.indexOf('dialogBox') < 0) {
+          var tab = this.vuex_tabbar;
+          tab[1].isDot = true;
+          this.$u.vuex('vuex_tabbar', tab);
+          var msgList = this.vuex_tabbar
+          var msgList = this.vuex_msgList
+          // 管理员对普通用户
+          if (type == 4) {
+            user = 'admin'
+          }
+          if (type == 3) {
+            user += 'user'
+          }
+          if (msgList.indexOf(user) < 0) {
+            msgList += (user + ',');
+          }
+          this.$u.vuex('vuex_msgList', msgList)
+        }
+      });
+      //接收系统消息
+      this.$connection.on("SystemMessage", (title, content, time) => {
+        if (this._route.fullPath.indexOf('sysList') < 0) {
+          var tab = this.vuex_tabbar;
+          tab[1].isDot = true;
+          this.$u.vuex('vuex_tabbar', tab);
+          var msgList = this.vuex_tabbar
+          var msgList = this.vuex_msgList
+          if (msgList.indexOf('SystemMessage') < 0) {
+            msgList += 'SystemMessage,';
+          }
+          this.$u.vuex('vuex_msgList', msgList)
+        }
+      });
+      //接收互动消息
+      this.$connection.on("InteractMessage", (data, type) => {
+        if (this._route.fullPath.indexOf('interactionList') < 0) {
+          var tab = this.vuex_tabbar;
+          tab[1].isDot = true;
+          this.$u.vuex('vuex_tabbar', tab);
+          var msgList = this.vuex_tabbar
+          var msgList = this.vuex_msgList
+          if (msgList.indexOf('InteractMessage') < 0) {
+            msgList += 'InteractMessage,';
+          }
+          this.$u.vuex('vuex_msgList', msgList)
+        }
+      });
+    },
+    CharLogin() {
+      //绑定用户账号和connectionId
+      if (this.vuex_user.id) {
+        this.$connection
+            .invoke("login", this.connectionId, this.vuex_user.id)
+            .then((res) => {
+
+            })
+            .catch((err) => {
+            });
+        //初始化获取定位
+        this.getLocation()
+      } else {
+        setTimeout(() => {
+          this.CharLogin()
+        }, 1000)
+      }
+    },
+  },
+  mounted() {
+    this.charLink()
+  },
+};
+</script>
+
+<style lang="scss">
+@import "uview-ui/index.scss";
+@import "common/demo.scss";
+
+.u-tabbar__content__item__button {
+  top: 0.07rem !important;
+}
+
+.u-navbar-placeholder,
+.u-navbar-inner {
+  height: 0.44rem !important;
+}
+
+.u-tabbar__content__item__text {
+  font-size: 20rpx !important;
+}
+
+.u-tabbar__content__item__button .u-icon__img {
+  width: 44rpx !important;
+  height: 44rpx !important;
+}
+
+.u-size-mini {
+  font-size: 0.12rem !important;
+}
+
+uni-modal .uni-modal__hd {
+  padding: 0.1rem;
+}
+
+uni-modal .uni-modal__bd {
+  padding-top: 20rpx;
+  // font-weight: bold;
+  font-size: 34rpx;
+  color: rgba(0, 0, 0, 0.9);
+}
+
+uni-modal .uni-modal__btn {
+  border-radius: 16rpx;
+  font-size: 28rpx;
+}
+
+uni-modal .uni-modal__btn:after {
+  border: none !important;
+}
+
+uni-modal .uni-modal__btn_default {
+  background: #e6f6ff;
+  color: #3CB5FB !important;
+  margin-right: 20rpx;
+}
+
+uni-modal .uni-modal__ft {
+  line-height: 80rpx;
+}
+
+uni-modal .uni-modal__ft:after {
+  border: none !important;
+}
+
+uni-modal .uni-modal__btn_primary {
+  background: #3cb5fb;
+  color: #ffffff !important;
+}
+
+
+uni-modal .uni-modal {
+  padding: 40rpx;
+  box-sizing: border-box;
+  border-radius: 30rpx;
+}
+
+.u-tabbar__content {
+  height: 0.5rem !important;
+}
+
+.phone .u-tabbar__content {
+  padding-bottom: 0.14rem;
+}
+
+.u-tabs-scorll-flex .u-tabs-item {
+  transition: all 0.1s;
+  font-size: 0.15rem !important;
+}
+
+* {
+  font-family: "pingfang";
+}
+
+html {
+  font-size: 200rpx;
+}
+
+uni-page-body {
+  height: 100%;
+}
+
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+  "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+  "Microsoft Yahei", sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  // max-width: 1536rpx;
+  margin: 0 auto;
+  background-color: #f6f7fa;
+}
+
+view,
+image,
+text {
+  box-sizing: border-box;
+  flex-shrink: 0;
+}
+
+#app {
+  width: 100vw;
+  height: 100vh;
+}
+
+.flex-row {
+  display: flex;
+  flex-direction: row;
+}
+
+.flex-col {
+  display: flex;
+  flex-direction: column;
+}
+
+.justify-start {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.justify-center {
+  display: flex;
+  justify-content: center;
+}
+
+.justify-end {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.justify-evenly {
+  display: flex;
+  justify-content: space-evenly;
+}
+
+.justify-around {
+  display: flex;
+  justify-content: space-around;
+}
+
+.justify-between {
+  display: flex;
+  justify-content: space-between;
+}
+
+.items-start {
+  display: flex;
+  align-items: flex-start;
+}
+
+.items-center {
+  display: flex;
+  align-items: center;
+}
+
+.items-end {
+  display: flex;
+  align-items: flex-end;
+}
+</style>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..8e39ead
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 www.uviewui.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/README.en.md b/README.en.md
new file mode 100644
index 0000000..c86ce47
--- /dev/null
+++ b/README.en.md
@@ -0,0 +1,36 @@
+# 校柚（H5）
+
+#### Description
+校柚（H5）
+
+#### Software Architecture
+Software architecture description
+
+#### Installation
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### Instructions
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### Contribution
+
+1.  Fork the repository
+2.  Create Feat_xxx branch
+3.  Commit your code
+4.  Create Pull Request
+
+
+#### Gitee Feature
+
+1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
+2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
+3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
+4.  The most valuable open source project [GVP](https://gitee.com/gvp)
+5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
+6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/README.md b/README.md
index e69de29..f7a7227 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1 @@
+### 项目初始化
\ No newline at end of file
diff --git a/common/classify.data.js b/common/classify.data.js
new file mode 100644
index 0000000..cb4f75a
--- /dev/null
+++ b/common/classify.data.js
@@ -0,0 +1,1087 @@
+export default[
+   {
+      "name": "女装",
+      "foods": [
+          {
+            "name": "A字裙",
+            "key": "A字裙",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
+            "cat": 10
+          },
+          {
+            "name": "T恤",
+            "key": "T恤",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/2.jpg",
+            "cat": 10
+          },
+          {
+            "name": "半身裙",
+            "key": "半身裙",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/3.jpg",
+            "cat": 10
+          },
+          {
+            "name": "衬衫",
+            "key": "衬衫",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/4.jpg",
+            "cat": 10
+          },
+          {
+            "name": "短裙",
+            "key": "短裙",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg",
+            "cat": 10
+          },
+          {
+            "name": "阔腿裤",
+            "key": "阔腿裤",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/6.jpg",
+            "cat": 10
+          },
+          {
+            "name": "连衣裙",
+            "key": "连衣裙",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/7.jpg",
+            "cat": 10
+          },
+          {
+            "name": "妈妈装",
+            "key": "妈妈装",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/8.jpg",
+            "cat": 10
+          },
+          {
+            "name": "牛仔裤",
+            "key": "牛仔裤",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg",
+            "cat": 10
+          },
+          {
+            "name": "情侣装",
+            "key": "情侣装",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/10.jpg",
+            "cat": 10
+          },
+          {
+            "name": "休闲裤",
+            "key": "休闲裤",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/11.jpg",
+            "cat": 10
+          },
+          {
+            "name": "雪纺衫",
+            "key": "雪纺衫",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/12.jpg",
+            "cat": 10
+          },
+          {
+            "name": "防晒衣",
+            "key": "防晒衣",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/13.jpg",
+            "cat": 10
+          },
+          {
+            "name": "礼服/婚纱",
+            "key": "礼服婚纱",
+            "icon": "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
+            "cat": 10
+          }
+      ]
+   },
+   {
+    "name": "美食",
+    "foods": [
+        {
+          "name": "火锅",
+          "key": "火锅",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
+          "cat": 6
+        },
+        {
+          "name": "糕点饼干",
+          "key": "糕点饼干",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/2.jpg",
+          "cat": 6
+        },
+        {
+          "name": "坚果果干",
+          "key": "坚果果干",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/3.jpg",
+          "cat": 6
+        },
+        {
+          "name": "酒类",
+          "key": "酒类",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/4.jpg",
+          "cat": 6
+        },
+        {
+          "name": "辣条",
+          "key": "辣条",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/5.jpg",
+          "cat": 6
+        },
+        {
+          "name": "大礼包",
+          "key": "大礼包",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/6.jpg",
+          "cat": 6
+        },
+        {
+          "name": "精品茗茶",
+          "key": "茶",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
+          "cat": 6
+        },
+        {
+          "name": "休闲食品",
+          "key": "休闲食品",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
+          "cat": 6
+        },
+        {
+          "name": "糖果巧克力",
+          "key": "糖果巧克力",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/9.jpg",
+          "cat": 6
+        },
+        {
+          "name": "方便速食",
+          "key": "方便速食",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/10.jpg",
+          "cat": 6
+        },
+        {
+          "name": "营养代餐",
+          "key": "营养代餐",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/11.jpg",
+          "cat": 6
+        },
+        {
+          "name": "粮油副食",
+          "key": "粮油",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/12.jpg",
+          "cat": 6
+        },
+        {
+          "name": "生鲜水果",
+          "key": "水果",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/13.jpg",
+          "cat": 6
+        },
+        {
+          "name": "饮品",
+          "key": "饮品",
+          "icon": "https://cdn.uviewui.com/uview/common/classify/2/14.jpg",
+          "cat": 6
+        }
+        ]
+    },
+    {
+        "name": "美妆",
+        "foods": [
+            {
+                "name": "化妆刷",
+                "key": "化妆刷",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
+                "cat": 3
+            },
+            {
+                "name": "粉底",
+                "key": "粉底",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/2.jpg",
+                "cat": 3
+            },
+            {
+                "name": "洗发护发",
+                "key": "洗发护发",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/3.jpg",
+                "cat": 3
+            },
+            {
+                "name": "美容工具",
+                "key": "美容工具",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/4.jpg",
+                "cat": 3
+            },
+            {
+                "name": "眼部护理",
+                "key": "眼部护理",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/5.jpg",
+                "cat": 3
+            },
+            {
+                "name": "眉妆",
+                "key": "眉妆",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/6.jpg",
+                "cat": 3
+            },
+            {
+                "name": "卸妆品",
+                "key": "卸妆品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/7.jpg",
+                "cat": 3
+            },
+            {
+                "name": "基础护肤",
+                "key": "基础护肤",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/8.jpg",
+                "cat": 3
+            },
+            {
+                "name": "眼妆",
+                "key": "眼妆",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/9.jpg",
+                "cat": 3
+            },
+            {
+                "name": "唇妆",
+                "key": "唇妆",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/10.jpg",
+                "cat": 3
+            },
+            {
+                "name": "面膜",
+                "key": "面膜",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/11.jpg",
+                "cat": 3
+            },
+            {
+                "name": "沐浴用品",
+                "key": "沐浴用品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/12.jpg",
+                "cat": 3
+            },
+            {
+                "name": "护肤套装",
+                "key": "护肤套装",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/13.jpg",
+                "cat": 3
+            },
+            {
+                "name": "防晒品",
+                "key": "防晒品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
+                "cat": 3
+            },
+            {
+                "name": "美甲",
+                "key": "美甲",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
+                "cat": 3
+            }
+
+        ]
+    },
+    {
+        "name": "居家日用",
+        "foods": [
+            {
+              "name": "垃圾袋",
+              "key": "垃圾袋",
+              "icon": "https://cdn.uviewui.com/uview/common/classify/4/1.jpg",
+              "cat": 4
+            },
+            {
+                "name": "纸巾",
+                "key": "纸巾",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/2.jpg",
+                "cat": 4
+            },
+            {
+                "name": "驱蚊用品",
+                "key": "驱蚊用品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/3.jpg",
+                "cat": 4
+            },
+            {
+                "name": "收纳神器",
+                "key": "收纳神器",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/4.jpg",
+                "cat": 4
+            },
+            {
+                "name": "厨房用品",
+                "key": "厨房用品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/5.jpg",
+                "cat": 4
+            },
+            {
+                "name": "厨房烹饪",
+                "key": "烹饪",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/6.jpg",
+                "cat": 4
+            },
+            {
+                "name": "衣物晾晒",
+                "key": "衣物晾晒",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/7.jpg",
+                "cat": 4
+            },
+            {
+                "name": "衣物护理",
+                "key": "衣物护理",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/8.jpg",
+                "cat": 4
+            },
+            {
+                "name": "宠物用品",
+                "key": "宠物用品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/9.jpg",
+                "cat": 4
+            },
+            {
+                "name": "医药保健",
+                "key": "医药",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/10.jpg",
+                "cat": 4
+            },
+            {
+                "name": "日用百货",
+                "key": "百货",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/11.jpg",
+                "cat": 4
+            },
+            {
+                "name": "清洁用品",
+                "key": "清洁",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/12.jpg",
+                "cat": 4
+            },
+            {
+                "name": "绿植园艺",
+                "key": "绿植",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/4/13.jpg",
+                "cat": 4
+            }
+        ]
+    },
+    {
+        "name": "男装",
+        "foods": [
+            {
+                "name": "爸爸装",
+                "key": "爸爸装",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/1.jpg",
+                "cat": 12
+            },
+            {
+                "name": "牛仔裤",
+                "key": "牛仔裤",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/2.jpg",
+                "cat": 12
+            },
+            {
+                "name": "衬衫",
+                "key": "衬衫",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/3.jpg",
+                "cat": 12
+            },
+            {
+                "name": "休闲裤",
+                "key": "休闲裤",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/4.jpg",
+                "cat": 12
+            },
+            {
+                "name": "外套",
+                "key": "外套",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/5.jpg",
+                "cat": 12
+            },
+            {
+                "name": "T恤",
+                "key": "T恤",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/6.jpg",
+                "cat": 12
+            },
+            {
+                "name": "套装",
+                "key": "套装",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/7.jpg",
+                "cat": 12
+            },
+            {
+                "name": "运动裤",
+                "key": "运动裤",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/8.jpg",
+                "cat": 12
+            },
+            {
+                "name": "马甲/背心",
+                "key": "马甲背心",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/9.jpg",
+                "cat": 12
+            },
+            {
+                "name": "POLO衫",
+                "key": "POLO衫",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/10.jpg",
+                "cat": 12
+            },
+            {
+                "name": "商务装",
+                "key": "商务装",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/5/11.jpg",
+                "cat": 12
+            }
+        ]
+    },
+    {
+        "name": "鞋品",
+        "foods": [
+            {
+                "name": "单鞋",
+                "key": "单鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/1.jpg",
+                "cat": 5
+            },
+            {
+                "name": "皮鞋",
+                "key": "皮鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/2.jpg",
+                "cat": 5
+            },
+            {
+                "name": "帆布鞋",
+                "key": "帆布鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/3.jpg",
+                "cat": 5
+            },
+            {
+                "name": "北京老布鞋",
+                "key": "北京老布鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/4.jpg",
+                "cat": 5
+            },
+            {
+                "name": "运动鞋",
+                "key": "运动鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/5.jpg",
+                "cat": 5
+            },
+            {
+                "name": "拖鞋",
+                "key": "拖鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/6.jpg",
+                "cat": 5
+            },
+            {
+                "name": "凉鞋",
+                "key": "凉鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/7.jpg",
+                "cat": 5
+            },
+            {
+                "name": "休闲鞋",
+                "key": "休闲鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/8.jpg",
+                "cat": 5
+            },
+            {
+                "name": "高跟鞋",
+                "key": "高跟鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/9.jpg",
+                "cat": 5
+            },
+            {
+                "name": "老人鞋",
+                "key": "老人鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/10.jpg",
+                "cat": 5
+            },
+            {
+                "name": "懒人鞋",
+                "key": "懒人鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/6/11.jpg",
+                "cat": 5
+            }
+        ]
+    },
+    {
+        "name": "数码家电",
+        "foods": [
+            {
+                "name": "数据线",
+                "key": "数据线",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/1.jpg",
+                "cat": 8
+            },
+            {
+                "name": "耳机",
+                "key": "耳机",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/2.jpg",
+                "cat": 8
+            },
+            {
+                "name": "生活家电",
+                "key": "家电",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/3.jpg",
+                "cat": 8
+            },
+            {
+                "name": "电风扇",
+                "key": "电风扇",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/4.jpg",
+                "cat": 8
+            },
+            {
+                "name": "电吹风",
+                "key": "电吹风",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/5.jpg",
+                "cat": 8
+            },
+            {
+                "name": "手机壳",
+                "key": "手机壳",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/6.jpg",
+                "cat": 8
+            },
+            {
+                "name": "榨汁机",
+                "key": "榨汁机",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/7.jpg",
+                "cat": 8
+            },
+            {
+                "name": "小家电",
+                "key": "小家电",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/8.jpg",
+                "cat": 8
+            },
+            {
+                "name": "数码电子",
+                "key": "数码",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/9.jpg",
+                "cat": 8
+            },
+            {
+                "name": "电饭锅",
+                "key": "电饭锅",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/10.jpg",
+                "cat": 8
+            },
+            {
+                "name": "手机支架",
+                "key": "手机支架",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/11.jpg",
+                "cat": 8
+            },
+            {
+                "name": "剃须刀",
+                "key": "剃须刀",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/12.jpg",
+                "cat": 8
+            },
+            {
+                "name": "充电宝",
+                "key": "充电宝",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/13.jpg",
+                "cat": 8
+            },
+            {
+                "name": "手机配件",
+                "key": "手机配件",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/7/14.jpg",
+                "cat": 8
+            }
+        ]
+    },
+    {
+        "name": "母婴",
+        "foods": [
+            {
+              "name": "婴童服饰",
+              "key": "衣服",
+              "icon": "https://cdn.uviewui.com/uview/common/classify/8/1.jpg",
+              "cat": 2  
+            },
+            {
+                "name": "玩具乐器",
+                "key": "玩具乐器",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/2.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "尿不湿",
+                "key": "尿不湿",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/3.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "安抚牙胶",
+                "key": "安抚牙胶",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/4.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "奶瓶奶嘴",
+                "key": "奶瓶奶嘴",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/5.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "孕妈用品",
+                "key": "孕妈用品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/6.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "宝宝用品",
+                "key": "宝宝用品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/7.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "婴童湿巾",
+                "key": "湿巾",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/8.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "喂养洗护",
+                "key": "洗护",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/9.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "婴童鞋靴",
+                "key": "童鞋",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/10.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "口水巾",
+                "key": "口水巾",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/11.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "营养辅食",
+                "key": "营养",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/12.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "婴幼书籍",
+                "key": "书籍",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/13.jpg",
+                "cat": 2  
+            },
+            {
+                "name": "婴儿车",
+                "key": "婴儿车",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/8/14.jpg",
+                "cat": 2  
+            }
+        ]
+    },
+    {
+        "name": "箱包",
+        "foods": [
+            {
+                "name": "单肩包",
+                "key": "单肩包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/1.jpg",
+                "cat": 0
+            },
+            {
+                "name": "斜挎包",
+                "key": "斜挎包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/2.jpg",
+                "cat": 0
+            },
+            {
+                "name": "女包",
+                "key": "女包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/3.jpg",
+                "cat": 0
+            },
+            {
+                "name": "男包",
+                "key": "男包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/4.jpg",
+                "cat": 0
+            },
+            {
+                "name": "双肩包",
+                "key": "双肩包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/5.jpg",
+                "cat": 0
+            },
+            {
+                "name": "小方包",
+                "key": "小方包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/6.jpg",
+                "cat": 0
+            },
+            {
+                "name": "钱包",
+                "key": "钱包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/7.jpg",
+                "cat": 0
+            },
+            {
+                "name": "旅行箱包",
+                "key": "旅行箱包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/8.jpg",
+                "cat": 0
+            },
+            {
+                "name": "零钱包",
+                "key": "零钱包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/9.jpg",
+                "cat": 0
+            },
+            {
+                "name": "手提包",
+                "key": "手提包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/10.jpg",
+                "cat": 0
+            },
+            {
+                "name": "胸包",
+                "key": "胸包",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/9/11.jpg",
+                "cat": 0
+            }
+        ]
+    },
+    {
+        "name": "内衣",
+        "foods": [
+            {
+                "name": "袜子",
+                "key": "袜子",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/1.jpg",
+                "cat": 11
+            },
+            {
+                "name": "吊带背心",
+                "key": "吊带背心",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/2.jpg",
+                "cat": 11
+            },
+            {
+                "name": "抹胸",
+                "key": "抹胸",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/3.jpg",
+                "cat": 11
+            },
+            {
+                "name": "内裤",
+                "key": "内裤",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/4.jpg",
+                "cat": 11
+            },
+            {
+                "name": "文胸",
+                "key": "文胸",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/5.jpg",
+                "cat": 11
+            },
+            {
+                "name": "文胸套装",
+                "key": "文胸套装",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/6.jpg",
+                "cat": 11
+            },
+            {
+                "name": "打底塑身",
+                "key": "打底塑身",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/7.jpg",
+                "cat": 11
+            },
+            {
+                "name": "家居服",
+                "key": "家居服",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/8.jpg",
+                "cat": 11
+            },
+            {
+                "name": "船袜",
+                "key": "船袜",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/9.jpg",
+                "cat": 11
+            },
+            {
+                "name": "情侣睡衣",
+                "key": "情侣睡衣",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/10.jpg",
+                "cat": 11
+            },
+            {
+                "name": "丝袜",
+                "key": "丝袜",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/10/11.jpg",
+                "cat": 11
+            }
+        ]
+    },
+    {
+        "name": "文娱车品",
+        "foods": [
+            {
+                "name": "车市车品",
+                "key": "车市车品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/1.jpg",
+                "cat": 7
+            },
+            {
+                "name": "办公文具",
+                "key": "办公文具",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/2.jpg",
+                "cat": 7
+            },
+            {
+                "name": "考试必备",
+                "key": "考试必备",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/3.jpg",
+                "cat": 7
+            },
+            {
+                "name": "笔记本",
+                "key": "笔记本",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/4.jpg",
+                "cat": 7
+            },
+            {
+                "name": "艺术礼品",
+                "key": "礼品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/5.jpg",
+                "cat": 7
+            },
+            {
+                "name": "书写工具",
+                "key": "书写工具",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/6.jpg",
+                "cat": 7
+            },
+            {
+                "name": "车载电器",
+                "key": "车载电器",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/7.jpg",
+                "cat": 7
+            },
+            {
+                "name": "图书音像",
+                "key": "图书音像",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/8.jpg",
+                "cat": 7
+            },
+            {
+                "name": "画具画材",
+                "key": "画具画材",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/11/9.jpg",
+                "cat": 7
+            }
+        ]
+    },
+    {
+        "name": "配饰",
+        "foods": [
+            {
+                "name": "太阳镜",
+                "key": "太阳镜",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/1.jpg",
+                "cat": 0
+            },
+            {
+                "name": "皮带",
+                "key": "皮带",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/2.jpg",
+                "cat": 0
+            },
+            {
+                "name": "棒球帽",
+                "key": "棒球帽",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/3.jpg",
+                "cat": 0
+            },
+            {
+                "name": "手表",
+                "key": "手表",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/4.jpg",
+                "cat": 0
+            },
+            {
+                "name": "发饰",
+                "key": "发饰",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/5.jpg",
+                "cat": 0
+            },
+            {
+                "name": "项链",
+                "key": "项链",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/6.jpg",
+                "cat": 0
+            },
+            {
+                "name": "手饰",
+                "key": "手饰",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/7.jpg",
+                "cat": 0
+            },
+            {
+                "name": "耳环",
+                "key": "耳环",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/8.jpg",
+                "cat": 0
+            },
+            {
+                "name": "帽子丝巾",
+                "key": "帽子丝巾",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/9.jpg",
+                "cat": 0
+            },
+            {
+                "name": "眼镜墨镜",
+                "key": "眼镜墨镜",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/10.jpg",
+                "cat": 0
+            },
+            {
+                "name": "发带发箍",
+                "key": "发带发箍",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/12/11.jpg",
+                "cat": 0
+            }
+        ]
+    },
+    {
+        "name": "家装家纺",
+        "foods": [
+            {
+                "name": "家居饰品",
+                "key": "家居饰品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/1.jpg",
+                "cat": 0
+            },
+            {
+                "name": "凉席",
+                "key": "凉席",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/2.jpg",
+                "cat": 0
+            },
+            {
+                "name": "背枕靠枕",
+                "key": "靠枕",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/3.jpg",
+                "cat": 0
+            },
+            {
+                "name": "床上用品",
+                "key": "床上用品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/4.jpg",
+                "cat": 0
+            },
+            {
+                "name": "摆件",
+                "key": "摆件",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/5.jpg",
+                "cat": 0
+            },
+            {
+                "name": "四件套",
+                "key": "四件套",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/6.jpg",
+                "cat": 0
+            },
+            {
+                "name": "装饰品",
+                "key": "装饰品",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/7.jpg",
+                "cat": 0
+            },
+            {
+                "name": "卫浴用品",
+                "key": "卫浴",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/8.jpg",
+                "cat": 0
+            },
+            {
+                "name": "家居家装",
+                "key": "家具",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/9.jpg",
+                "cat": 0
+            },
+            {
+                "name": "蚊帐",
+                "key": "蚊帐",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/10.jpg",
+                "cat": 0
+            },
+            {
+                "name": "墙纸贴纸",
+                "key": "墙纸",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/11.jpg",
+                "cat": 0
+            },
+            {
+                "name": "空调被",
+                "key": "空调被",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/13/12.jpg",
+                "cat": 0
+            }
+        ]
+    },
+    {
+        "name": "户外运动",
+        "foods": [
+            {
+                "name": "游泳装备",
+                "key": "游泳",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/1.jpg",
+                "cat": 0
+            },
+            {
+                "name": "泳镜",
+                "key": "泳镜",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/2.jpg",
+                "cat": 0
+            },
+            {
+                "name": "户外装备",
+                "key": "户外",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/3.jpg",
+                "cat": 0
+            },
+            {
+                "name": "健身服饰",
+                "key": "健身",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/4.jpg",
+                "cat": 0
+            },
+            {
+                "name": "泳衣",
+                "key": "泳衣",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/5.jpg",
+                "cat": 0
+            },
+            {
+                "name": "瑜伽垫",
+                "key": "瑜伽垫",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/6.jpg",
+                "cat": 0
+            },
+            {
+                "name": "瑜伽用品",
+                "key": "瑜伽",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/7.jpg",
+                "cat": 0
+            },
+            {
+                "name": "健身装备",
+                "key": "健身",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/8.jpg",
+                "cat": 0
+            },
+            {
+                "name": "球迷用品",
+                "key": "球迷",
+                "icon": "https://cdn.uviewui.com/uview/common/classify/14/9.jpg",
+                "cat": 0
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/common/demo.scss b/common/demo.scss
new file mode 100644
index 0000000..547d5d9
--- /dev/null
+++ b/common/demo.scss
@@ -0,0 +1,86 @@
+/* #ifndef APP-NVUE */
+view,
+text {
+	box-sizing: border-box;
+}
+/* #endif */
+
+/* start--演示页面使用的统一样式--start */
+.u-demo {
+	padding: 25px 20px;
+}
+
+.u-demo-wrap {
+	border-width: 1px;
+	border-color: #ddd;
+	border-style: dashed;
+	background-color: rgb(250, 250, 250);
+	padding: 20px 10px;
+	border-radius: 3px;
+}
+
+.u-demo-area {
+	text-align: center;
+}
+
+.u-no-demo-here {
+	color: $u-tips-color;
+	font-size: 13px;
+}
+
+.u-demo-result-line {
+	border-width: 1px;
+	border-color: #ddd;
+	border-style: dashed;
+	padding: 5px 20px;
+	margin-top: 30px;
+	border-radius: 5px;
+	background-color: rgb(240, 240, 240);
+	color: $u-content-color;
+	font-size: 16px;
+	/* #ifndef APP-NVUE */
+	word-break: break-word;
+	display: inline-block;
+	/* #endif */
+	text-align: left;
+	
+}
+
+.u-demo-title,
+.u-config-title {
+	text-align: center;
+	font-size: 16px;
+	font-weight: bold;
+	margin-bottom: 20px;
+}
+
+.u-config-item {
+	margin-top: 25px;
+}
+
+.u-config-title {
+	margin-top: 20px;
+	padding-bottom: 5px;
+}
+
+.u-item-title {
+	position: relative;
+	font-size: 15px;
+	padding-left: 8px;
+	line-height: 1;
+	margin-bottom: 11px;
+}
+
+.u-item-title:after {
+	position: absolute;
+	width: 4px;
+	top: -1px;
+	height: 16px;
+	/* #ifndef APP-NVUE */
+	content: '';
+	/* #endif */
+	left: 0;
+	border-radius: 10px;
+	background-color: $u-content-color;
+}
+/* end--演示页面使用的统一样式--end */
diff --git a/common/http.api.js b/common/http.api.js
new file mode 100644
index 0000000..b412aaa
--- /dev/null
+++ b/common/http.api.js
@@ -0,0 +1,137 @@
+// 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作
+const install = (Vue, vm) => {
+    // 登录
+    let LoginApp = (params = {}) => vm.$u.post('api/Token/LoginApp', params)
+    // 注册
+    let RegisterUser = (params = {}) => vm.$u.post('api/Token/RegisterUser', params);
+    // 基础资料以及保存用户头像
+    let saveUserInfo = (params = {}) => vm.$u.post('app/User/UploadingFormFileHead', params);
+    // 更新用户定位信息
+    let upPosition = (params = {}) => vm.$u.post('app/Position/InsertPosition', params);
+    // 获取用户当前定位信息
+    let getPosition = (params = {}) => vm.$u.get('app/Position/GetPositionByUser', {
+        userId: vm.vuex_user.id
+    });
+    // 获取所有学校
+    let GetAllSchool = (params = {}) => vm.$u.get('app/User/GetSchoolList', params);
+    //获取首页地图信息
+    let HomeMap = (params = {}) => vm.$u.get('/app/User/HomeMap', params);
+    //修改密码
+    let ChangePassword = (params = {}) => vm.$u.post('app/User/ChangePassword', params);
+    //修改密码
+    let myChangePassword = (params = {}) => vm.$u.post('app/My/ChangePassword', params);
+    // 获取搜索页面相关信息
+    let SearchInfo = (params = {}) => vm.$u.get('app/User/SearchRelevant', params);
+    //获取搜索结果页面
+    let getSearch = (params = {}) => vm.$u.get('app/User/GetSearchList', params);
+    // 获取用户信息
+    let getUserInfo = (params = {}) => vm.$u.get('app/User/HomePage', params);
+    // 获取校友帮帮列表
+    let GetHelpList = (params = {}) => vm.$u.get('app/HelpArticle/GetHelpArticleListByKey', params);
+    // 获取学校资讯
+    let GetSchoolList = (params = {}) => vm.$u.get('app/AlumnRange/AlumnRangeSchool', params);
+    //获取最新的用户信息（更新用户数据）
+    let getUser = (params = {}) => vm.$u.get('app/User/GetUser', {userId: vm.vuex_user.id}).then(res => {
+        vm.$u.get('/app/User/GetUserSchool').then(ress => {
+            // res.isAttestationGLY = ress.isAttestationGLY
+            // res.isAttestationJZG = ress.isAttestationJZG
+            // res.isAttestationQY = ress.isAttestationQY
+            // res.isAttestationXY = res.isAttestationXY
+            // res.isAttestationZXS = ress.isAttestationZXS
+            res.schoolId = ress.items.schoolId
+            vm.$u.vuex('vuex_user', {...res.user,...res.userExtension})
+            vm.$u.vuex('vuex_user_hobby', res.lableList)
+        })
+    })
+    //获取用户消息列表
+    let getcharList = (params = {}) => vm.$u.get('app/Chat/GetUserMessageList', params);
+    //获取用户获取关注列表
+    let getFollowList = (params = {}) => vm.$u.get('app/Chat/GetFollowList', {id: vm.vuex_user.id});
+    //	获取系统消息列表
+    let getSysList = (params = {}) => vm.$u.get('app/Chat/GetSystemMessageList', {id: vm.vuex_user.id});
+    //获取管理消息列表
+    let getAdminList = (params = {}) => vm.$u.get('app/Chat/GetManageMessageList', {schoolId: vm.vuex_user.id});
+    //获取互动信息列表
+    let getinteractionList = (params) => vm.$u.get('app/Chat/GetInterMessageList', {id: vm.vuex_user.id, type: params});
+    //校友找找推荐列表
+    let getAlumnSearch = (params = {}) => vm.$u.get('app/AlumnRange/AlumnSearch', params);
+    //获取聊天记录
+    let getChatRecord = (params = {}) => vm.$u.get('app/Chat/GetChatRecord', params);
+    //校友找找列表
+    let AlumnSearchList = (params = {}) => vm.$u.get('app/AlumnRange/AlumnSearchList', params);
+    // 初始化的数据调用微信接口返回参数
+    let GetInfoMation = (params = {}) => vm.$u.get('api/Token/GetInfoMation', params);
+    // 回复绑定
+    let toBind = (params = {}) => vm.$u.get('app/Chat/ReplyBind', params);
+    //我的资讯
+    let MyAlumnRange = (params = {}) => vm.$u.get('app/My/MyAlumnRange', params);
+    // 解除绑定
+    let colseBind = (params = {}) => vm.$u.get('app/Chat/UnbindReply', params);
+    // 删除评论
+    let DelateComment = (params = {}) => vm.$u.get('app/AlumnRange/DelateComment', params);
+    let userVerify = (params = {}) => vm.$u.post('api/Token/IsIdentityCard', params)
+
+    // 获取人脸验证token
+    let getAPIToken = (params = {}) => vm.$u.post('app/My/GetVerifyToken', params)
+    // 查询人脸核验结果
+    let getVerifyInfo = (params = {}) => vm.$u.post('app/My/GetDetailInfo?VerifyToken=' + params)
+    // 根据身份证获取信息
+    let getInfoByCard = (params = {}) => vm.$u.get('app/User/GetCardByPreConfiguredUser', params);
+    // 更新身份信息
+    let updateCard = (params = {}) => vm.$u.post('api/Token/UpdateCard', params)
+
+    //【手机端】添加心愿
+    let PushWishDan = (params = {}) => vm.$u.post("app/My/PushWishDan", params)
+
+    //【手机端】获取个人心愿列表
+    let GetWishListAsync_mobile = (params = {}) => vm.$u.get("app/My/GetWishListAsync_mobile", params)
+    //【手机端】删除心愿 删除=失效
+    let DeleteWish = (params = {}) => vm.$u.post("app/My/DeleteWish", params)
+    //【管理端】获取当前是否开启匿名 开启true 关闭false
+    let CheckNM = (params = {}) => vm.$u.get("/app/My/CheckNM", params)
+
+    // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
+    vm.$u.api = {
+        LoginApp,
+        RegisterUser,
+        saveUserInfo,
+        upPosition,
+        getPosition,
+        GetAllSchool,
+        HomeMap,
+        ChangePassword,
+        myChangePassword,
+        SearchInfo,
+        getSearch,
+        getUserInfo,
+        GetHelpList,
+        GetSchoolList,
+        getUser,
+        getcharList,
+        getFollowList,
+        getSysList,
+        getAdminList,
+        getinteractionList,
+        getAlumnSearch,
+        getChatRecord,
+        AlumnSearchList,
+        GetInfoMation,
+        toBind,
+        colseBind,
+        MyAlumnRange,
+        DelateComment,
+        userVerify,
+        GetWishListAsync_mobile,
+        DeleteWish,
+        CheckNM,
+        PushWishDan,
+        getAPIToken,
+        getVerifyInfo,
+        getInfoByCard,
+        updateCard
+    };
+}
+
+export default {
+    install
+}
diff --git a/common/http.apiList.js b/common/http.apiList.js
new file mode 100644
index 0000000..b5fd25b
--- /dev/null
+++ b/common/http.apiList.js
@@ -0,0 +1,245 @@
+// 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作
+const install = (Vue, vm) => {
+    // 获取行业下所有子行业和标签
+    let GetLableList = (params = {}) => vm.$u.get('app/User/GetLableList', params)
+    // 获取兴趣标签
+    let GetInterestLable = (params = {}) => vm.$u.get('app/User/GetInterestLable', params)
+    // 修改个人资料
+    let UpdateUser = (params = {}) => vm.$u.post('app/User/UpdateUser', params);
+    // 获取所有工作领域
+    let GetWorkFile = (params = {}) => vm.$u.get('app/User/GetWorkFileList', params);
+    // 我的页面
+    let MyPage = (params = {}) => vm.$u.get('app/My/MyPage', params);
+    // 我的教育经历
+    let MyEducations = (params = {}) => vm.$u.get('app/My/MyEducations', params);
+    // 添加教育经历
+    let AddEducation = (params = {}) => vm.$u.post('app/My/AddEducation', params);
+    // 提交校友认证
+    let SubmitAttestationXY = (params = {}) => vm.$u.post('app/My/SubmitAttestationXY', params);
+    // 选择已认证的教育经历 返回学校ID
+    let SelectEducation = (params = {}) => vm.$u.post('app/My/SelectEducation', params);
+    // 我的发布
+    let Publishs = (params = {}) => vm.$u.get('app/My/Publish', params);
+    //用户发布学校资讯
+    let InsertJournaArticle = (params = {}) => vm.$u.post('app/AlumnRange/InsertJournaArticle', params);
+    //用户发布帮帮资讯
+    let InsertHelpArticle = (params = {}) => vm.$u.post('app/AlumnRange/InsertHelpArticle', params);
+    //管理员认证
+    let AttestationGLY = (params = {}) => vm.$u.get('app/My/AttestationGLY', params);
+    //提交管理员认证
+    let SubmitAttestationGLY = (params = {}) => vm.$u.post('app/My/SubmitAttestationGLY', params);
+    //教职工认证
+    let AttestationJZG = (params = {}) => vm.$u.get('app/My/AttestationJZG', params);
+    //提交教职工认证
+    let SubmitAttestationJZG = (params = {}) => vm.$u.post('app/My/SubmitAttestationJZG', params);
+    //基础资料以及教职工认证
+    let UpdateUserJZG = (params = {}) => vm.$u.post("app/User/UpdateUserJZG", params)
+
+    //企业认证
+    let AttestationQY = (params = {}) => vm.$u.get('app/My/AttestationQY', params);
+    //提交企业认证
+    let SubmitAttestationQY = (params = {}) => vm.$u.post('app/My/SubmitAttestationQY', params);
+    //定位、推荐、消息设置
+    let Setting = (params = {}) => vm.$u.post('app/My/Setting', params);
+    //获取当前登录用户
+    let GetUser = (params = {}) => vm.$u.get('app/User/GetUser', params);
+    //获取所有标签
+    let GetSign = (params = {}) => vm.$u.get('app/AlumnRange/GetSign', params);
+    //关注或取关
+    let InsertOrDelFollow = (params = {}) => vm.$u.post('app/Follow/InsertOrDelFollow', params);
+    //评论
+    let InsertComment = (params = {}) => vm.$u.post('app/AlumnRange/InsertComment', params);
+    //获取文章评论信息
+    let GetJournaArticle = (params = {}) => vm.$u.get('app/AlumnRange/GetJournaArticle', params);
+    //获取评论详细信息
+    let GetComment = (params = {}) => vm.$u.get('app/AlumnRange/GetComment', params);
+    //添加收藏(0资讯,1帮帮)
+    let LikeCollect = (params = {}) => vm.$u.get('app/AlumnRange/LikeCollect', params);
+    //点赞(0资讯,1帮帮,2评论) 或取消点赞
+    let LikeHe = (params = {}) => vm.$u.get('app/AlumnRange/LikeHe', params);
+    //用户转发帮帮资讯
+    let ForwardHelpArticle = (params = {}) => vm.$u.post('app/AlumnRange/ForwardHelpArticle', params);
+    //获取用户当前学校信息（未认证为空,未选中默认选择最新认证学校）
+    let GetUserSchool = (params = {}) => vm.$u.get('app/User/GetUserSchool', params);
+    //我的收藏
+    let Collection = (params = {}) => vm.$u.get('app/My/Collection', params)
+    //查看用户发布信息
+    let UserHelp = (params = {}) => vm.$u.get('app/User/UserHelp', params)
+    //审核列表
+    let AuditList = (params = {}) => vm.$u.get('app/My/AuditList', params)
+    //审核详情
+    let AuditDeatil = (params = {}) => vm.$u.get('app/My/AuditDeatil', params)
+    //审核
+    let Audit = (params = {}) => vm.$u.post('app/My/Audit', params);
+    //获取手机验证码
+    let GetPhoneValidateCode = (params = {}) => vm.$u.post('api/Token/GetPhoneValidateCode', params)
+    // 获取验证码
+    let Captcha = (params = {}) => vm.$u.get('api/Token/Captcha', params)
+    //根据页面类型获取手机验证码
+    let GetAppValidateCode = (params = {}) => vm.$u.post('api/Token/GetAppValidateCode', params)
+    //验证码是否正确
+    let IsPhoneCode = (params = {}) => vm.$u.get('api/Token/IsPhoneCode', params)
+    //学校资讯
+    let AlumnRangeSchool = (params = {}) => vm.$u.get('app/AlumnRange/AlumnRangeSchool', params)
+    //意见反馈
+    let SubmitFeedback = (params = {}) => vm.$u.post('app/My/SubmitFeedback', params)
+    //获取学校学院列表
+    let GetCollegeList = (params = {}) => vm.$u.get('app/User/GetCollegeList', params)
+    //获取专业列表
+    let GetMajorList = (params = {}) => vm.$u.get('app/User/GetMajorList', params)
+    //获取当前学校是否认证信息
+    let GetUserApproval = (params = {}) => vm.$u.get('app/User/GetUserApproval', params)
+    //	删除未认证教育经历
+    let DeleteEducation = (params = {}) => vm.$u.get('app/My/DeleteEducation', params)
+    //  删除文章
+    let DelateArticle = (params = {}) => vm.$u.get('app/AlumnRange/DelateArticle', params)
+    //  取消收藏
+    let CancleCollect = (params = {}) => vm.$u.get('app/My/CancleCollect', params)
+    //忘记密码
+    let ForgotPassword = (params = {}) => vm.$u.post('admin/User/ForgotPassword', params)
+    //手机申请返校预约
+    let AddReturnSchoolApi = (params = {}) => vm.$u.post('app/ReturnSchoolPrebook/AddReturnSchool', params);
+    // 返校预约列表 - 待审核
+    let SelectReturnSchoolList_dshApi = (params = {}) => vm.$u.get('app/ReturnSchoolPrebook/SelectReturnSchoolList_dsh', params)
+    // 返校预约列表 - 传状态
+    let SelectReturnSchoolList_typeApi = (params = {}) => vm.$u.get('app/ReturnSchoolPrebook/SelectReturnSchoolList_type', params)
+    // 获取返校预约设置
+    let SelectInfoSetApi = (params = {}) => vm.$u.get('/app/ReturnSchoolPrebook/SelectInfoSet', params)
+    // 获取返校预约设置 没token
+    let SelectInfoSetNoTokenApi = (params = {}) => vm.$u.get('/app/Share/SelectInfoSet', params)
+    // 返校预约详情
+    let SelectReturnSchoolInfoApi = (params = {}) => vm.$u.post('app/ReturnSchoolPrebook/SelectReturnSchoolInfo', params);
+    // 返校预约详情 没token
+    let SelectReturnSchoolInfoNotokenApi = (params = {}) => vm.$u.post('/app/Share/SelectReturnSchoolInfo', params);
+    // 取消返校预约
+    let DelReturnSchoolInfoApi = (params = {}) => vm.$u.post('app/ReturnSchoolPrebook/DelReturnSchoolInfo', params);
+    // 核验二维码
+    let SaveReturnSchoolInfoApi = (params = {}) => vm.$u.post('app/ReturnSchoolPrebook/SaveReturnSchoolInfo', params);
+    // 核验二维码 没token
+    let SaveReturnSchoolInfoNoTokenApi = (params = {}) => vm.$u.post('app/Share/SaveReturnSchoolInfo', params);
+    // 获取二维码
+    let SaveReturnSchoolVerifyApi = (params = {}) => vm.$u.post('app/ReturnSchoolPrebook/SaveReturnSchoolVerify', params);
+    // 获取二维码 没token
+    let SaveReturnSchoolVerifyNoTokenApi = (params = {}) => vm.$u.post('app/Share/SaveReturnSchoolVerify', params);
+    // 添加工作经历
+    let AddWordInfoApi = (params = {}) => vm.$u.post('/app/User/AddWordInfo', params);
+    // 修改工作经历
+    let UpdateWorkInfoApi = (params = {}) => vm.$u.post('/app/User/UpdateWorkInfo', params);
+    // 删除工作经历
+    let DelWorkInfoApi = (params = {}) => vm.$u.post('/app/User/DelWorkInfo', params);
+    // 添加项目经历
+    let AddProjectInfoApi = (params = {}) => vm.$u.post('/app/User/AddProjectInfo', params);
+    // 修改项目经历
+    let UpdateProjectInfoApi = (params = {}) => vm.$u.post('/app/User/UpdateProjectInfo', params);
+    // 删除项目经历
+    let DelProjectInfoApi = (params = {}) => vm.$u.post('/app/User/DelProjectInfo', params);
+    // 制作简历界面
+    let ResumeUserApi = (params = {}) => vm.$u.get('/app/User/ResumeUser', params);
+    // 附件简历列表
+    let GetUserFileApi = (params = {}) => vm.$u.get('/app/User/GetUserFile', params);
+    // 删除附件
+    let DelUserFileApi = (params = {}) => vm.$u.post('/app/User/DelUserFile', params);
+    // 设置展示简历
+    let UpdateUserFileApi = (params = {}) => vm.$u.post('/app/User/UpdateUserFile', params);
+    // 获取学校ID
+    let GetUserSchoolApi = (params = {}) => vm.$u.get('/app/User/GetUserSchool', params);
+    // 获取已预约的日期
+    let GetDateTimeReturnApi = (params = {}) => vm.$u.get('/app/ReturnSchoolPrebook/GetDateTimeReturn', params);
+    // 选择教职工认证
+    let SelectJZGApi = (params = {}) => vm.$u.post('/app/My/SelectJZG', params);
+
+    let ForgotPasswordValidate = (params = {}) => vm.$u.post('/admin/User/ForgotPasswordValidate', params);
+    //忘记密码-验证验证码
+
+    // 删除
+    let DeleteJZGApi = (params = {}) => vm.$u.get('/app/My/DeleteJZG', params);
+    // 返回判断用户身份信息
+    let SelectUserTypeApi = (params = {}) => vm.$u.get('/app/My/SelectUserType', params);
+    // 更新切换用户身份UserType
+    let UpdateUserTypeApi = (params = {}) => vm.$u.get('/app/My/UpdateUserType', params);
+    // 将各个定义的接口名称，统一放进对象挂载到vm.$u.apiList(因为vm就是this，也即this.$u.apiList)下
+    vm.$u.apiList = {
+        Captcha,
+        GetInterestLable,
+        GetLableList,
+        SelectUserTypeApi,
+        UpdateUserTypeApi,
+        ForgotPasswordValidate,
+        DeleteJZGApi,
+        SelectJZGApi,
+        GetDateTimeReturnApi,
+        AddReturnSchoolApi,
+        GetUserSchoolApi,
+        UpdateUserFileApi,
+        DelUserFileApi,
+        AddWordInfoApi,
+        GetUserFileApi,
+        DelWorkInfoApi,
+        UpdateProjectInfoApi,
+        DelProjectInfoApi,
+        AddProjectInfoApi,
+        UpdateWorkInfoApi,
+        ResumeUserApi,
+        SaveReturnSchoolVerifyApi,
+        SelectInfoSetApi,
+        SelectInfoSetNoTokenApi,
+        SelectReturnSchoolList_dshApi,
+        SelectReturnSchoolList_typeApi,
+        SelectReturnSchoolInfoApi,
+        SaveReturnSchoolInfoNoTokenApi,
+        SaveReturnSchoolVerifyNoTokenApi,
+        SelectReturnSchoolInfoNotokenApi,
+        DelReturnSchoolInfoApi,
+        SaveReturnSchoolInfoApi,
+        UpdateUser,
+        GetWorkFile,
+        MyPage,
+        MyEducations,
+        AddEducation,
+        SubmitAttestationXY,
+        SelectEducation,
+        Publishs,
+        InsertJournaArticle,
+        InsertHelpArticle,
+        AttestationGLY,
+        SubmitAttestationGLY,
+        AttestationJZG,
+        SubmitAttestationJZG,
+        AttestationQY,
+        SubmitAttestationQY,
+        Setting,
+        GetUser,
+        GetSign,
+        InsertOrDelFollow,
+        InsertComment,
+        GetJournaArticle,
+        GetComment,
+        LikeCollect,
+        LikeHe,
+        ForwardHelpArticle,
+        GetUserSchool,
+        Collection,
+        UserHelp,
+        AuditList,
+        AuditDeatil,
+        ForwardHelpArticle,
+        Audit,
+        GetPhoneValidateCode,
+        AlumnRangeSchool,
+        IsPhoneCode,
+        SubmitFeedback,
+        GetCollegeList,
+        GetMajorList,
+        GetUserApproval,
+        DeleteEducation,
+        DelateArticle,
+        CancleCollect,
+        GetAppValidateCode,
+        ForgotPassword,
+        UpdateUserJZG
+    };
+}
+
+export default {
+    install
+}
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
new file mode 100644
index 0000000..53b347e
--- /dev/null
+++ b/common/http.interceptor.js
@@ -0,0 +1,64 @@
+// 这里的vm，就是我们在vue文件里面的this，所以我们能在这里获取vuex的变量，比如存放在里面的token
+// 同时，我们也可以在此使用getApp().globalData，如果你把token放在getApp().globalData的话，也是可以使用的
+const install = (Vue, vm) => {
+	Vue.prototype.$u.http.setConfig({
+		// baseUrl: 'https://xy.apps.service.zheke.com',
+		// imgUrl: 'https://xy.apps.service.zheke.com/',
+		baseUrl: 'http://sl.vrgon.com:8003',
+		imgUrl: 'http://sl.vrgon.com:8003/',
+		// imgUrl:'http://115.238.47.235:8987/',
+		// baseUrl: 'http://115.238.47.235:8993',
+		// 如果将此值设置为true，拦截回调中将会返回服务端返回的所有数据response，而不是response.data
+		// 设置为true后，就需要在this.$u.http.interceptor.response进行多一次的判断，请打印查看具体值
+		// originalData: true, 
+		// 设置自定义头部content-type
+		// header: {
+		// 	'content-type': 'xxx'
+		// }
+	});
+	// 请求拦截，配置Token等参数
+	Vue.prototype.$u.http.interceptor.request = (config) => {
+
+		// config.header.Token = 'xxxxxx';
+		// 方式一，存放在vuex的token，假设 ，见：https://uviewui.com/components/globalVariable.html
+		config.header.Authorization = 'Bearer ' + vm.vuex_token;
+		// 方式二，如果没有使用uView封装的vuex方法，那么需要使用$store.state获取
+		// config.header.token = vm.$store.state.token;
+
+		// 方式三，如果token放在了globalData，通过getApp().globalData获取
+		// config.header.token = getApp().globalData.username;
+
+		// 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的，所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
+		// const token = uni.getStorageSync('token');
+		// config.header.token = token;
+		uni.showLoading({
+			title: '加载中'
+		});
+		// setTimeout(function () {
+		// 	uni.hideLoading();
+		// }, 2000);
+
+		return config;
+	}
+	// 响应拦截，判断状态码是否通过
+	Vue.prototype.$u.http.interceptor.response = (res) => {
+		uni.hideLoading();
+		if (res.succeed == true || res.success == true) {
+			return res.data || res;
+		} else {
+			// uni.showToast({
+			// 	title: res.error,
+			// 	duration: 2000,
+			// 	icon: 'none'
+			// });
+			// uni.navigateTo({
+			// 	url: "/pages/login/login/login",
+			// });
+			return false;
+		}
+	}
+}
+
+export default {
+	install
+}
diff --git a/common/index.list.js b/common/index.list.js
new file mode 100644
index 0000000..7e0f5ed
--- /dev/null
+++ b/common/index.list.js
@@ -0,0 +1,585 @@
+module.exports = {
+	list: [{
+			"letter": "A",
+			"data": [{
+					"name": "阿拉斯加",
+					"mobile": "13588889999",
+					"keyword": "阿拉斯加ABA13588889999"
+				},
+				{
+					"name": "阿克苏",
+					"mobile": "0551-4386721",
+					"keyword": "阿克苏AKESU0551-4386721"
+				},
+				{
+					"name": "阿拉善",
+					"mobile": "4008009100",
+					"keyword": "阿拉善ALASHAN4008009100"
+				},
+				{
+					"name": "阿勒泰",
+					"mobile": "13588889999",
+					"keyword": "阿勒泰ALETAI13588889999"
+				},
+				{
+					"name": "阿里",
+					"mobile": "13588889999",
+					"keyword": "阿里ALI13588889999"
+				},
+				{
+					"name": "安阳",
+					"mobile": "13588889999",
+					"keyword": "13588889999安阳ANYANG"
+				}
+			]
+		},
+		{
+			"letter": "B",
+			"data": [{
+					"name": "白城",
+					"mobile": "该主子没有留电话~",
+					"keyword": "白城BAICHENG"
+				},
+				{
+					"name": "白山",
+					"mobile": "13588889999",
+					"keyword": "白山BAISHAN13588889999"
+				},
+				{
+					"name": "白银",
+					"mobile": "13588889999",
+					"keyword": "白银BAIYIN13588889999"
+				},
+				{
+					"name": "保定",
+					"mobile": "13588889999",
+					"keyword": "保定BAODING13588889999"
+				}
+			]
+		},
+		{
+			"letter": "C",
+			"data": [{
+					"name": "沧州",
+					"mobile": "13588889999",
+					"keyword": "沧州CANGZHOU13588889999"
+				},
+				{
+					"name": "长春",
+					"mobile": "13588889999",
+					"keyword": "长春CHANGCHUN13588889999"
+				}
+			]
+		},
+		{
+			"letter": "D",
+			"data": [{
+					"name": "大理",
+					"mobile": "13588889999",
+					"keyword": "大理DALI13588889999"
+				},
+				{
+					"name": "大连",
+					"mobile": "13588889999",
+					"keyword": "大连DALIAN13588889999"
+				}
+			]
+		},
+		{
+			"letter": "E",
+			"data": [{
+					"name": "鄂尔多斯",
+					"mobile": "13588889999",
+					"keyword": "鄂尔多斯EERDUOSI13588889999"
+				},
+				{
+					"name": "恩施",
+					"mobile": "13588889999",
+					"keyword": "恩施ENSHI13588889999"
+				},
+				{
+					"name": "鄂州",
+					"mobile": "13588889999",
+					"keyword": "鄂州EZHOU13588889999"
+				}
+			]
+		},
+		{
+			"letter": "F",
+			"data": [{
+					"name": "防城港",
+					"mobile": "该主子没有留电话~",
+					"keyword": "防城港FANGCHENGGANG"
+				},
+				{
+					"name": "抚顺",
+					"mobile": "13588889999",
+					"keyword": "抚顺FUSHUN13588889999"
+				},
+				{
+					"name": "阜新",
+					"mobile": "13588889999",
+					"keyword": "阜新FUXIN13588889999"
+				},
+				{
+					"name": "阜阳",
+					"mobile": "13588889999",
+					"keyword": "阜阳FUYANG13588889999"
+				},
+				{
+					"name": "抚州",
+					"mobile": "13588889999",
+					"keyword": "抚州FUZHOU13588889999"
+				},
+				{
+					"name": "福州",
+					"mobile": "13588889999",
+					"keyword": "福州FUZHOU13588889999"
+				}
+			]
+		},
+		{
+			"letter": "G",
+			"data": [{
+					"name": "甘南",
+					"mobile": "13588889999",
+					"keyword": "甘南GANNAN13588889999"
+				},
+				{
+					"name": "赣州",
+					"mobile": "13588889999",
+					"keyword": "赣州GANZHOU13588889999"
+				},
+				{
+					"name": "甘孜",
+					"mobile": "13588889999",
+					"keyword": "甘孜GANZI13588889999"
+				}
+			]
+		},
+		{
+			"letter": "H",
+			"data": [{
+					"name": "哈尔滨",
+					"mobile": "13588889999",
+					"keyword": "哈尔滨HAERBIN13588889999"
+				},
+				{
+					"name": "海北",
+					"mobile": "13588889999",
+					"keyword": "海北HAIBEI13588889999"
+				},
+				{
+					"name": "海东",
+					"mobile": "13588889999",
+					"keyword": "海东HAIDONG13588889999"
+				},
+				{
+					"name": "海口",
+					"mobile": "13588889999",
+					"keyword": "海口HAIKOU13588889999"
+				}
+			]
+		},
+		{
+			"letter": "I",
+			"data": [{
+				"name": "ice",
+				"mobile": "13588889999",
+				"keyword": "佳木斯JIAMUSI13588889999"
+			}]
+		},
+		{
+			"letter": "J",
+			"data": [{
+					"name": "佳木斯",
+					"mobile": "13588889999",
+					"keyword": "佳木斯JIAMUSI13588889999"
+				},
+				{
+					"name": "吉安",
+					"mobile": "13588889999",
+					"keyword": "吉安JIAN13588889999"
+				},
+				{
+					"name": "江门",
+					"mobile": "13588889999",
+					"keyword": "江门JIANGMEN13588889999"
+				}
+			]
+		},
+		{
+			"letter": "K",
+			"data": [{
+					"name": "开封",
+					"mobile": "13588889999",
+					"keyword": "开封KAIFENG13588889999"
+				},
+				{
+					"name": "喀什",
+					"mobile": "13588889999",
+					"keyword": "喀什KASHI13588889999"
+				},
+				{
+					"name": "克拉玛依",
+					"mobile": "13588889999",
+					"keyword": "克拉玛依KELAMAYI13588889999"
+				}
+			]
+		},
+		{
+			"letter": "L",
+			"data": [{
+					"name": "来宾",
+					"mobile": "13588889999",
+					"keyword": "来宾LAIBIN13588889999"
+				},
+				{
+					"name": "兰州",
+					"mobile": "13588889999",
+					"keyword": "兰州LANZHOU13588889999"
+				},
+				{
+					"name": "拉萨",
+					"mobile": "13588889999",
+					"keyword": "拉萨LASA13588889999"
+				},
+				{
+					"name": "乐山",
+					"mobile": "13588889999",
+					"keyword": "乐山LESHAN13588889999"
+				},
+				{
+					"name": "凉山",
+					"mobile": "13588889999",
+					"keyword": "凉山LIANGSHAN13588889999"
+				},
+				{
+					"name": "连云港",
+					"mobile": "13588889999",
+					"keyword": "连云港LIANYUNGANG13588889999"
+				},
+				{
+					"name": "聊城",
+					"mobile": "18322223333",
+					"keyword": "聊城LIAOCHENG18322223333"
+				},
+				{
+					"name": "辽阳",
+					"mobile": "18322223333",
+					"keyword": "辽阳LIAOYANG18322223333"
+				},
+				{
+					"name": "辽源",
+					"mobile": "18322223333",
+					"keyword": "辽源LIAOYUAN18322223333"
+				},
+				{
+					"name": "丽江",
+					"mobile": "18322223333",
+					"keyword": "丽江LIJIANG18322223333"
+				},
+				{
+					"name": "临沧",
+					"mobile": "18322223333",
+					"keyword": "临沧LINCANG18322223333"
+				},
+				{
+					"name": "临汾",
+					"mobile": "18322223333",
+					"keyword": "临汾LINFEN18322223333"
+				},
+				{
+					"name": "临夏",
+					"mobile": "18322223333",
+					"keyword": "临夏LINXIA18322223333"
+				},
+				{
+					"name": "临沂",
+					"mobile": "18322223333",
+					"keyword": "临沂LINYI18322223333"
+				},
+				{
+					"name": "林芝",
+					"mobile": "18322223333",
+					"keyword": "林芝LINZHI18322223333"
+				},
+				{
+					"name": "丽水",
+					"mobile": "18322223333",
+					"keyword": "丽水LISHUI18322223333"
+				}
+			]
+		},
+		{
+			"letter": "M",
+			"data": [{
+					"name": "眉山",
+					"mobile": "15544448888",
+					"keyword": "眉山MEISHAN15544448888"
+				},
+				{
+					"name": "梅州",
+					"mobile": "15544448888",
+					"keyword": "梅州MEIZHOU15544448888"
+				},
+				{
+					"name": "绵阳",
+					"mobile": "15544448888",
+					"keyword": "绵阳MIANYANG15544448888"
+				},
+				{
+					"name": "牡丹江",
+					"mobile": "15544448888",
+					"keyword": "牡丹江MUDANJIANG15544448888"
+				}
+			]
+		},
+		{
+			"letter": "N",
+			"data": [{
+					"name": "南昌",
+					"mobile": "15544448888",
+					"keyword": "南昌NANCHANG15544448888"
+				},
+				{
+					"name": "南充",
+					"mobile": "15544448888",
+					"keyword": "南充NANCHONG15544448888"
+				},
+				{
+					"name": "南京",
+					"mobile": "15544448888",
+					"keyword": "南京NANJING15544448888"
+				},
+				{
+					"name": "南宁",
+					"mobile": "15544448888",
+					"keyword": "南宁NANNING15544448888"
+				},
+				{
+					"name": "南平",
+					"mobile": "15544448888",
+					"keyword": "南平NANPING15544448888"
+				}
+			]
+		},
+		{
+			"letter": "O",
+			"data": [{
+				"name": "欧阳",
+				"mobile": "15544448888",
+				"keyword": "欧阳ouyang15544448888"
+			}]
+		},
+		{
+			"letter": "P",
+			"data": [{
+					"name": "盘锦",
+					"mobile": "15544448888",
+					"keyword": "盘锦PANJIN15544448888"
+				},
+				{
+					"name": "攀枝花",
+					"mobile": "15544448888",
+					"keyword": "攀枝花PANZHIHUA15544448888"
+				},
+				{
+					"name": "平顶山",
+					"mobile": "15544448888",
+					"keyword": "平顶山PINGDINGSHAN15544448888"
+				},
+				{
+					"name": "平凉",
+					"mobile": "15544448888",
+					"keyword": "平凉PINGLIANG15544448888"
+				},
+				{
+					"name": "萍乡",
+					"mobile": "15544448888",
+					"keyword": "萍乡PINGXIANG15544448888"
+				},
+				{
+					"name": "普洱",
+					"mobile": "15544448888",
+					"keyword": "普洱PUER15544448888"
+				},
+				{
+					"name": "莆田",
+					"mobile": "15544448888",
+					"keyword": "莆田PUTIAN15544448888"
+				},
+				{
+					"name": "濮阳",
+					"mobile": "15544448888",
+					"keyword": "濮阳PUYANG15544448888"
+				}
+			]
+		},
+		{
+			"letter": "Q",
+			"data": [{
+					"name": "黔东南",
+					"mobile": "15544448888",
+					"keyword": "黔东南QIANDONGNAN15544448888"
+				},
+				{
+					"name": "黔南",
+					"mobile": "15544448888",
+					"keyword": "黔南QIANNAN15544448888"
+				},
+				{
+					"name": "黔西南",
+					"mobile": "15544448888",
+					"keyword": "黔西南QIANXINAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "R",
+			"data": [{
+					"name": "日喀则",
+					"mobile": "15544448888",
+					"keyword": "日喀则RIKAZE15544448888"
+				},
+				{
+					"name": "日照",
+					"mobile": "15544448888",
+					"keyword": "日照RIZHAO15544448888"
+				}
+			]
+		},
+		{
+			"letter": "S",
+			"data": [{
+					"name": "三门峡",
+					"mobile": "15544448888",
+					"keyword": "三门峡SANMENXIA15544448888"
+				},
+				{
+					"name": "三明",
+					"mobile": "15544448888",
+					"keyword": "三明SANMING15544448888"
+				},
+				{
+					"name": "三沙",
+					"mobile": "15544448888",
+					"keyword": "三沙SANSHA15544448888"
+				}
+			]
+		},
+		{
+			"letter": "T",
+			"data": [{
+					"name": "塔城",
+					"mobile": "15544448888",
+					"keyword": "塔城TACHENG15544448888"
+				},
+				{
+					"name": "漯河",
+					"mobile": "15544448888",
+					"keyword": "漯河TAHE15544448888"
+				},
+				{
+					"name": "泰安",
+					"mobile": "15544448888",
+					"keyword": "泰安TAIAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "W",
+			"data": [{
+					"name": "潍坊",
+					"mobile": "15544448888",
+					"keyword": "潍坊WEIFANG15544448888"
+				},
+				{
+					"name": "威海",
+					"mobile": "15544448888",
+					"keyword": "威海WEIHAI15544448888"
+				},
+				{
+					"name": "渭南",
+					"mobile": "15544448888",
+					"keyword": "渭南WEINAN15544448888"
+				},
+				{
+					"name": "文山",
+					"mobile": "15544448888",
+					"keyword": "文山WENSHAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "X",
+			"data": [{
+					"name": "厦门",
+					"mobile": "15544448888",
+					"keyword": "厦门XIAMEN15544448888"
+				},
+				{
+					"name": "西安",
+					"mobile": "15544448888",
+					"keyword": "西安XIAN15544448888"
+				},
+				{
+					"name": "湘潭",
+					"mobile": "15544448888",
+					"keyword": "湘潭XIANGTAN15544448888"
+				}
+			]
+		},
+		{
+			"letter": "Y",
+			"data": [{
+					"name": "雅安",
+					"mobile": "15544448888",
+					"keyword": "雅安YAAN15544448888"
+				},
+				{
+					"name": "延安",
+					"mobile": "15544448888",
+					"keyword": "延安YANAN15544448888"
+				},
+				{
+					"name": "延边",
+					"mobile": "15544448888",
+					"keyword": "延边YANBIAN15544448888"
+				},
+				{
+					"name": "盐城",
+					"mobile": "15544448888",
+					"keyword": "盐城YANCHENG15544448888"
+				}
+			]
+		},
+		{
+			"letter": "Z",
+			"data": [{
+					"name": "枣庄",
+					"mobile": "15544448888",
+					"keyword": "枣庄ZAOZHUANG15544448888"
+				},
+				{
+					"name": "张家界",
+					"mobile": "15544448888",
+					"keyword": "张家界ZHANGJIAJIE15544448888"
+				},
+				{
+					"name": "张家口",
+					"mobile": "15544448888",
+					"keyword": "张家口ZHANGJIAKOU15544448888"
+				}
+			]
+		},
+		{
+			"letter": "#",
+			"data": [{
+				"name": "其他.",
+				"mobile": "16666666666",
+				"keyword": "echo16666666666"
+			}]
+		}
+	]
+}
diff --git a/common/locales/en.js b/common/locales/en.js
new file mode 100644
index 0000000..5bd6f7a
--- /dev/null
+++ b/common/locales/en.js
@@ -0,0 +1,21 @@
+export default {
+	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
+	components: {
+		desc: 'Numerous components cover the various requirements of the development process, and the components are rich in functions and compatible with multiple terminals. Let you integrate quickly, out of the box'
+	},
+	js: {
+		desc: 'Numerous intimate gadgets are a weapon that you can call upon during the development process, allowing you to dart in your hand and pierce the Yang with a hundred steps'
+	},
+	template: {
+		desc: 'Collection of many commonly used pages and layouts, reducing the repetitive work of developers, allowing you to focus on logic and get twice the result with half the effort'
+	},
+	nav: {
+		components: 'Components',
+		js: 'JS',
+		template: 'Template'
+	},
+	common: {
+		intro: 'UI framework for rapid development of multiple platforms',
+		title: 'uView UI',
+	},
+}
\ No newline at end of file
diff --git a/common/locales/zh.js b/common/locales/zh.js
new file mode 100644
index 0000000..1c6b15c
--- /dev/null
+++ b/common/locales/zh.js
@@ -0,0 +1,21 @@
+export default {
+	// 可以以页面为单位来写，比如首页的内容，写在index字段，个人中心写在center，共同部分写在common部分
+	components: {
+		desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用'
+	},
+	js: {
+		desc: '众多的贴心小工具，是你开发过程中召之即来的利器，让你飞镖在手，百步穿杨'
+	},
+	template: {
+		desc: '收集众多的常用页面和布局，减少开发者的重复工作，让你专注逻辑，事半功倍'
+	},
+	nav: {
+		components: '组件',
+		js: '工具',
+		template: '模板'
+	},
+	common: {
+		intro: '多平台快速开发的UI框架',
+		title: 'uView UI',
+	},
+}
\ No newline at end of file
diff --git a/common/utils.js b/common/utils.js
new file mode 100644
index 0000000..6f5da6b
--- /dev/null
+++ b/common/utils.js
@@ -0,0 +1,16 @@
+export const Debounce = (fn, wait) => {
+    let delay = wait|| 500
+    let timer
+    return function () {
+        let args = arguments;
+        if (timer) {
+            clearTimeout(timer)
+        }
+       
+        let callNow = !timer
+        timer = setTimeout(() => {
+            timer = null
+        }, delay)
+        if (callNow) fn.apply(this, args)
+    }
+}
diff --git a/common/vue-i18n.min.js b/common/vue-i18n.min.js
new file mode 100644
index 0000000..8d0a5c0
--- /dev/null
+++ b/common/vue-i18n.min.js
@@ -0,0 +1,6 @@
+/*!
+ * vue-i18n v8.20.0 
+ * (c) 2020 kazuya kawaguchi
+ * Released under the MIT License.
+ */
+var t,e;t=this,e=function(){"use strict";var t=["style","currency","currencyDisplay","useGrouping","minimumIntegerDigits","minimumFractionDigits","maximumFractionDigits","minimumSignificantDigits","maximumSignificantDigits","localeMatcher","formatMatcher","unit"];function e(t,e){"undefined"!=typeof console&&(console.warn("[vue-i18n] "+t),e&&console.warn(e.stack))}var n=Array.isArray;function r(t){return null!==t&&"object"==typeof t}function a(t){return"string"==typeof t}var i=Object.prototype.toString,o="[object Object]";function s(t){return i.call(t)===o}function l(t){return null==t}function c(){for(var t=[],e=arguments.length;e--;)t[e]=arguments[e];var n=null,a=null;return 1===t.length?r(t[0])||Array.isArray(t[0])?a=t[0]:"string"==typeof t[0]&&(n=t[0]):2===t.length&&("string"==typeof t[0]&&(n=t[0]),(r(t[1])||Array.isArray(t[1]))&&(a=t[1])),{locale:n,params:a}}function u(t){return JSON.parse(JSON.stringify(t))}function h(t,e){return!!~t.indexOf(e)}var f=Object.prototype.hasOwnProperty;function p(t,e){return f.call(t,e)}function m(t){for(var e=arguments,n=Object(t),a=1;a<arguments.length;a++){var i=e[a];if(null!=i){var o=void 0;for(o in i)p(i,o)&&(r(i[o])?n[o]=m(n[o],i[o]):n[o]=i[o])}}return n}function _(t,e){if(t===e)return!0;var n=r(t),a=r(e);if(!n||!a)return!n&&!a&&String(t)===String(e);try{var i=Array.isArray(t),o=Array.isArray(e);if(i&&o)return t.length===e.length&&t.every(function(t,n){return _(t,e[n])});if(i||o)return!1;var s=Object.keys(t),l=Object.keys(e);return s.length===l.length&&s.every(function(n){return _(t[n],e[n])})}catch(t){return!1}}var g={beforeCreate:function(){var t=this.$options;if(t.i18n=t.i18n||(t.__i18n?{}:null),t.i18n){if(t.i18n instanceof et){if(t.__i18n)try{var e={};t.__i18n.forEach(function(t){e=m(e,JSON.parse(t))}),Object.keys(e).forEach(function(n){t.i18n.mergeLocaleMessage(n,e[n])})}catch(t){}this._i18n=t.i18n,this._i18nWatcher=this._i18n.watchI18nData()}else if(s(t.i18n)){var n=this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof et?this.$root.$i18n:null;if(n&&(t.i18n.root=this.$root,t.i18n.formatter=n.formatter,t.i18n.fallbackLocale=n.fallbackLocale,t.i18n.formatFallbackMessages=n.formatFallbackMessages,t.i18n.silentTranslationWarn=n.silentTranslationWarn,t.i18n.silentFallbackWarn=n.silentFallbackWarn,t.i18n.pluralizationRules=n.pluralizationRules,t.i18n.preserveDirectiveContent=n.preserveDirectiveContent),t.__i18n)try{var r={};t.__i18n.forEach(function(t){r=m(r,JSON.parse(t))}),t.i18n.messages=r}catch(t){}var a=t.i18n.sharedMessages;a&&s(a)&&(t.i18n.messages=m(t.i18n.messages,a)),this._i18n=new et(t.i18n),this._i18nWatcher=this._i18n.watchI18nData(),(void 0===t.i18n.sync||t.i18n.sync)&&(this._localeWatcher=this.$i18n.watchLocale()),n&&n.onComponentInstanceCreated(this._i18n)}}else this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof et?this._i18n=this.$root.$i18n:t.parent&&t.parent.$i18n&&t.parent.$i18n instanceof et&&(this._i18n=t.parent.$i18n)},beforeMount:function(){var t=this.$options;t.i18n=t.i18n||(t.__i18n?{}:null),t.i18n?t.i18n instanceof et?(this._i18n.subscribeDataChanging(this),this._subscribing=!0):s(t.i18n)&&(this._i18n.subscribeDataChanging(this),this._subscribing=!0):this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof et?(this._i18n.subscribeDataChanging(this),this._subscribing=!0):t.parent&&t.parent.$i18n&&t.parent.$i18n instanceof et&&(this._i18n.subscribeDataChanging(this),this._subscribing=!0)},beforeDestroy:function(){if(this._i18n){var t=this;this.$nextTick(function(){t._subscribing&&(t._i18n.unsubscribeDataChanging(t),delete t._subscribing),t._i18nWatcher&&(t._i18nWatcher(),t._i18n.destroyVM(),delete t._i18nWatcher),t._localeWatcher&&(t._localeWatcher(),delete t._localeWatcher)})}}},v={name:"i18n",functional:!0,props:{tag:{type:[String,Boolean,Object],default:"span"},path:{type:String,required:!0},locale:{type:String},places:{type:[Array,Object]}},render:function(t,e){var n=e.data,r=e.parent,a=e.props,i=e.slots,o=r.$i18n;if(o){var s=a.path,l=a.locale,c=a.places,u=i(),h=o.i(s,l,function(t){var e;for(e in t)if("default"!==e)return!1;return Boolean(e)}(u)||c?function(t,e){var n=e?function(t){return Array.isArray(t)?t.reduce(d,{}):Object.assign({},t)}(e):{};if(!t)return n;var r=(t=t.filter(function(t){return t.tag||""!==t.text.trim()})).every(y);return t.reduce(r?b:d,n)}(u.default,c):u),f=a.tag&&!0!==a.tag||!1===a.tag?a.tag:"span";return f?t(f,n,h):h}}};function b(t,e){return e.data&&e.data.attrs&&e.data.attrs.place&&(t[e.data.attrs.place]=e),t}function d(t,e,n){return t[n]=e,t}function y(t){return Boolean(t.data&&t.data.attrs&&t.data.attrs.place)}var F,k={name:"i18n-n",functional:!0,props:{tag:{type:[String,Boolean,Object],default:"span"},value:{type:Number,required:!0},format:{type:[String,Object]},locale:{type:String}},render:function(e,n){var i=n.props,o=n.parent,s=n.data,l=o.$i18n;if(!l)return null;var c=null,u=null;a(i.format)?c=i.format:r(i.format)&&(i.format.key&&(c=i.format.key),u=Object.keys(i.format).reduce(function(e,n){var r;return h(t,n)?Object.assign({},e,((r={})[n]=i.format[n],r)):e},null));var f=i.locale||l.locale,p=l._ntp(i.value,f,c,u),m=p.map(function(t,e){var n,r=s.scopedSlots&&s.scopedSlots[t.type];return r?r(((n={})[t.type]=t.value,n.index=e,n.parts=p,n)):t.value}),_=i.tag&&!0!==i.tag||!1===i.tag?i.tag:"span";return _?e(_,{attrs:s.attrs,class:s.class,staticClass:s.staticClass},m):m}};function w(t,e,n){C(t,n)&&T(t,e,n)}function $(t,e,n,r){if(C(t,n)){var a=n.context.$i18n;(function(t,e){var n=e.context;return t._locale===n.$i18n.locale})(t,n)&&_(e.value,e.oldValue)&&_(t._localeMessage,a.getLocaleMessage(a.locale))||T(t,e,n)}}function M(t,n,r,a){if(r.context){var i=r.context.$i18n||{};n.modifiers.preserve||i.preserveDirectiveContent||(t.textContent=""),t._vt=void 0,delete t._vt,t._locale=void 0,delete t._locale,t._localeMessage=void 0,delete t._localeMessage}else e("Vue instance does not exists in VNode context")}function C(t,n){var r=n.context;return r?!!r.$i18n||(e("VueI18n instance does not exists in Vue instance"),!1):(e("Vue instance does not exists in VNode context"),!1)}function T(t,n,r){var i,o,l=function(t){var e,n,r,i;a(t)?e=t:s(t)&&(e=t.path,n=t.locale,r=t.args,i=t.choice);return{path:e,locale:n,args:r,choice:i}}(n.value),c=l.path,u=l.locale,h=l.args,f=l.choice;if(c||u||h)if(c){var p=r.context;t._vt=t.textContent=null!=f?(i=p.$i18n).tc.apply(i,[c,f].concat(L(u,h))):(o=p.$i18n).t.apply(o,[c].concat(L(u,h))),t._locale=p.$i18n.locale,t._localeMessage=p.$i18n.getLocaleMessage(p.$i18n.locale)}else e("`path` is required in v-t directive");else e("value type not supported")}function L(t,e){var n=[];return t&&n.push(t),e&&(Array.isArray(e)||s(e))&&n.push(e),n}function I(t){I.installed=!0;(F=t).version&&Number(F.version.split(".")[0]);!function(t){t.prototype.hasOwnProperty("$i18n")||Object.defineProperty(t.prototype,"$i18n",{get:function(){return this._i18n}}),t.prototype.$t=function(t){for(var e=[],n=arguments.length-1;n-- >0;)e[n]=arguments[n+1];var r=this.$i18n;return r._t.apply(r,[t,r.locale,r._getMessages(),this].concat(e))},t.prototype.$tc=function(t,e){for(var n=[],r=arguments.length-2;r-- >0;)n[r]=arguments[r+2];var a=this.$i18n;return a._tc.apply(a,[t,a.locale,a._getMessages(),this,e].concat(n))},t.prototype.$te=function(t,e){var n=this.$i18n;return n._te(t,n.locale,n._getMessages(),e)},t.prototype.$d=function(t){for(var e,n=[],r=arguments.length-1;r-- >0;)n[r]=arguments[r+1];return(e=this.$i18n).d.apply(e,[t].concat(n))},t.prototype.$n=function(t){for(var e,n=[],r=arguments.length-1;r-- >0;)n[r]=arguments[r+1];return(e=this.$i18n).n.apply(e,[t].concat(n))}}(F),F.mixin(g),F.directive("t",{bind:w,update:$,unbind:M}),F.component(v.name,v),F.component(k.name,k),F.config.optionMergeStrategies.i18n=function(t,e){return void 0===e?t:e}}var D=function(){this._caches=Object.create(null)};D.prototype.interpolate=function(t,e){if(!e)return[t];var n=this._caches[t];return n||(n=function(t){var e=[],n=0,r="";for(;n<t.length;){var a=t[n++];if("{"===a){r&&e.push({type:"text",value:r}),r="";var i="";for(a=t[n++];void 0!==a&&"}"!==a;)i+=a,a=t[n++];var o="}"===a,s=O.test(i)?"list":o&&x.test(i)?"named":"unknown";e.push({value:i,type:s})}else"%"===a?"{"!==t[n]&&(r+=a):r+=a}return r&&e.push({type:"text",value:r}),e}(t),this._caches[t]=n),function(t,e){var n=[],a=0,i=Array.isArray(e)?"list":r(e)?"named":"unknown";if("unknown"===i)return n;for(;a<t.length;){var o=t[a];switch(o.type){case"text":n.push(o.value);break;case"list":n.push(e[parseInt(o.value,10)]);break;case"named":"named"===i&&n.push(e[o.value])}a++}return n}(n,e)};var O=/^(?:\d)+/,x=/^(?:\w)+/,W=0,j=1,N=2,A=3,S=0,R=4,H=5,P=6,V=7,E=8,z=[];z[S]={ws:[S],ident:[3,W],"[":[R],eof:[V]},z[1]={ws:[1],".":[2],"[":[R],eof:[V]},z[2]={ws:[2],ident:[3,W],0:[3,W],number:[3,W]},z[3]={ident:[3,W],0:[3,W],number:[3,W],ws:[1,j],".":[2,j],"[":[R,j],eof:[V,j]},z[R]={"'":[H,W],'"':[P,W],"[":[R,N],"]":[1,A],eof:E,else:[R,W]},z[H]={"'":[R,W],eof:E,else:[H,W]},z[P]={'"':[R,W],eof:E,else:[P,W]};var B=/^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/;function U(t){if(null==t)return"eof";switch(t.charCodeAt(0)){case 91:case 93:case 46:case 34:case 39:return t;case 95:case 36:case 45:return"ident";case 9:case 10:case 13:case 160:case 65279:case 8232:case 8233:return"ws"}return"ident"}function J(t){var e,n,r,a=t.trim();return("0"!==t.charAt(0)||!isNaN(t))&&(r=a,B.test(r)?(n=(e=a).charCodeAt(0))!==e.charCodeAt(e.length-1)||34!==n&&39!==n?e:e.slice(1,-1):"*"+a)}var q=function(){this._cache=Object.create(null)};q.prototype.parsePath=function(t){var e=this._cache[t];return e||(e=function(t){var e,n,r,a,i,o,s,l=[],c=-1,u=S,h=0,f=[];function p(){var e=t[c+1];if(u===H&&"'"===e||u===P&&'"'===e)return c++,r="\\"+e,f[W](),!0}for(f[j]=function(){void 0!==n&&(l.push(n),n=void 0)},f[W]=function(){void 0===n?n=r:n+=r},f[N]=function(){f[W](),h++},f[A]=function(){if(h>0)h--,u=R,f[W]();else{if(h=0,void 0===n)return!1;if(!1===(n=J(n)))return!1;f[j]()}};null!==u;)if("\\"!==(e=t[++c])||!p()){if(a=U(e),(i=(s=z[u])[a]||s.else||E)===E)return;if(u=i[0],(o=f[i[1]])&&(r=void 0===(r=i[2])?e:r,!1===o()))return;if(u===V)return l}}(t))&&(this._cache[t]=e),e||[]},q.prototype.getPathValue=function(t,e){if(!r(t))return null;var n=this.parsePath(e);if(0===n.length)return null;for(var a=n.length,i=t,o=0;o<a;){var s=i[n[o]];if(void 0===s)return null;i=s,o++}return i};var G,X=/<\/?[\w\s="/.':;#-\/]+>/,Z=/(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g,K=/^@(?:\.([a-z]+))?:/,Q=/[()]/g,Y={upper:function(t){return t.toLocaleUpperCase()},lower:function(t){return t.toLocaleLowerCase()},capitalize:function(t){return""+t.charAt(0).toLocaleUpperCase()+t.substr(1)}},tt=new D,et=function(t){var e=this;void 0===t&&(t={}),!F&&"undefined"!=typeof window&&window.Vue&&I(window.Vue);var n=t.locale||"en-US",r=!1!==t.fallbackLocale&&(t.fallbackLocale||"en-US"),a=t.messages||{},i=t.dateTimeFormats||{},o=t.numberFormats||{};this._vm=null,this._formatter=t.formatter||tt,this._modifiers=t.modifiers||{},this._missing=t.missing||null,this._root=t.root||null,this._sync=void 0===t.sync||!!t.sync,this._fallbackRoot=void 0===t.fallbackRoot||!!t.fallbackRoot,this._formatFallbackMessages=void 0!==t.formatFallbackMessages&&!!t.formatFallbackMessages,this._silentTranslationWarn=void 0!==t.silentTranslationWarn&&t.silentTranslationWarn,this._silentFallbackWarn=void 0!==t.silentFallbackWarn&&!!t.silentFallbackWarn,this._dateTimeFormatters={},this._numberFormatters={},this._path=new q,this._dataListeners=[],this._componentInstanceCreatedListener=t.componentInstanceCreatedListener||null,this._preserveDirectiveContent=void 0!==t.preserveDirectiveContent&&!!t.preserveDirectiveContent,this.pluralizationRules=t.pluralizationRules||{},this._warnHtmlInMessage=t.warnHtmlInMessage||"off",this._postTranslation=t.postTranslation||null,this.getChoiceIndex=function(t,n){var r=Object.getPrototypeOf(e);if(r&&r.getChoiceIndex)return r.getChoiceIndex.call(e,t,n);var a,i;return e.locale in e.pluralizationRules?e.pluralizationRules[e.locale].apply(e,[t,n]):(a=t,i=n,a=Math.abs(a),2===i?a?a>1?1:0:1:a?Math.min(a,2):0)},this._exist=function(t,n){return!(!t||!n)&&(!l(e._path.getPathValue(t,n))||!!t[n])},"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||Object.keys(a).forEach(function(t){e._checkLocaleMessage(t,e._warnHtmlInMessage,a[t])}),this._initVM({locale:n,fallbackLocale:r,messages:a,dateTimeFormats:i,numberFormats:o})},nt={vm:{configurable:!0},messages:{configurable:!0},dateTimeFormats:{configurable:!0},numberFormats:{configurable:!0},availableLocales:{configurable:!0},locale:{configurable:!0},fallbackLocale:{configurable:!0},formatFallbackMessages:{configurable:!0},missing:{configurable:!0},formatter:{configurable:!0},silentTranslationWarn:{configurable:!0},silentFallbackWarn:{configurable:!0},preserveDirectiveContent:{configurable:!0},warnHtmlInMessage:{configurable:!0},postTranslation:{configurable:!0}};return et.prototype._checkLocaleMessage=function(t,n,r){var i=function(t,n,r,o){if(s(r))Object.keys(r).forEach(function(e){var a=r[e];s(a)?(o.push(e),o.push("."),i(t,n,a,o),o.pop(),o.pop()):(o.push(e),i(t,n,a,o),o.pop())});else if(Array.isArray(r))r.forEach(function(e,r){s(e)?(o.push("["+r+"]"),o.push("."),i(t,n,e,o),o.pop(),o.pop()):(o.push("["+r+"]"),i(t,n,e,o),o.pop())});else if(a(r)){if(X.test(r)){var l="Detected HTML in message '"+r+"' of keypath '"+o.join("")+"' at '"+n+"'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp";"warn"===t?e(l):"error"===t&&function(t,e){"undefined"!=typeof console&&(console.error("[vue-i18n] "+t),e&&console.error(e.stack))}(l)}}};i(n,t,r,[])},et.prototype._initVM=function(t){var e=F.config.silent;F.config.silent=!0,this._vm=new F({data:t}),F.config.silent=e},et.prototype.destroyVM=function(){this._vm.$destroy()},et.prototype.subscribeDataChanging=function(t){this._dataListeners.push(t)},et.prototype.unsubscribeDataChanging=function(t){!function(t,e){if(t.length){var n=t.indexOf(e);if(n>-1)t.splice(n,1)}}(this._dataListeners,t)},et.prototype.watchI18nData=function(){var t=this;return this._vm.$watch("$data",function(){for(var e=t._dataListeners.length;e--;)F.nextTick(function(){t._dataListeners[e]&&t._dataListeners[e].$forceUpdate()})},{deep:!0})},et.prototype.watchLocale=function(){if(!this._sync||!this._root)return null;var t=this._vm;return this._root.$i18n.vm.$watch("locale",function(e){t.$set(t,"locale",e),t.$forceUpdate()},{immediate:!0})},et.prototype.onComponentInstanceCreated=function(t){this._componentInstanceCreatedListener&&this._componentInstanceCreatedListener(t,this)},nt.vm.get=function(){return this._vm},nt.messages.get=function(){return u(this._getMessages())},nt.dateTimeFormats.get=function(){return u(this._getDateTimeFormats())},nt.numberFormats.get=function(){return u(this._getNumberFormats())},nt.availableLocales.get=function(){return Object.keys(this.messages).sort()},nt.locale.get=function(){return this._vm.locale},nt.locale.set=function(t){this._vm.$set(this._vm,"locale",t)},nt.fallbackLocale.get=function(){return this._vm.fallbackLocale},nt.fallbackLocale.set=function(t){this._localeChainCache={},this._vm.$set(this._vm,"fallbackLocale",t)},nt.formatFallbackMessages.get=function(){return this._formatFallbackMessages},nt.formatFallbackMessages.set=function(t){this._formatFallbackMessages=t},nt.missing.get=function(){return this._missing},nt.missing.set=function(t){this._missing=t},nt.formatter.get=function(){return this._formatter},nt.formatter.set=function(t){this._formatter=t},nt.silentTranslationWarn.get=function(){return this._silentTranslationWarn},nt.silentTranslationWarn.set=function(t){this._silentTranslationWarn=t},nt.silentFallbackWarn.get=function(){return this._silentFallbackWarn},nt.silentFallbackWarn.set=function(t){this._silentFallbackWarn=t},nt.preserveDirectiveContent.get=function(){return this._preserveDirectiveContent},nt.preserveDirectiveContent.set=function(t){this._preserveDirectiveContent=t},nt.warnHtmlInMessage.get=function(){return this._warnHtmlInMessage},nt.warnHtmlInMessage.set=function(t){var e=this,n=this._warnHtmlInMessage;if(this._warnHtmlInMessage=t,n!==t&&("warn"===t||"error"===t)){var r=this._getMessages();Object.keys(r).forEach(function(t){e._checkLocaleMessage(t,e._warnHtmlInMessage,r[t])})}},nt.postTranslation.get=function(){return this._postTranslation},nt.postTranslation.set=function(t){this._postTranslation=t},et.prototype._getMessages=function(){return this._vm.messages},et.prototype._getDateTimeFormats=function(){return this._vm.dateTimeFormats},et.prototype._getNumberFormats=function(){return this._vm.numberFormats},et.prototype._warnDefault=function(t,e,n,r,i,o){if(!l(n))return n;if(this._missing){var s=this._missing.apply(null,[t,e,r,i]);if(a(s))return s}if(this._formatFallbackMessages){var u=c.apply(void 0,i);return this._render(e,o,u.params,e)}return e},et.prototype._isFallbackRoot=function(t){return!t&&!l(this._root)&&this._fallbackRoot},et.prototype._isSilentFallbackWarn=function(t){return this._silentFallbackWarn instanceof RegExp?this._silentFallbackWarn.test(t):this._silentFallbackWarn},et.prototype._isSilentFallback=function(t,e){return this._isSilentFallbackWarn(e)&&(this._isFallbackRoot()||t!==this.fallbackLocale)},et.prototype._isSilentTranslationWarn=function(t){return this._silentTranslationWarn instanceof RegExp?this._silentTranslationWarn.test(t):this._silentTranslationWarn},et.prototype._interpolate=function(t,e,n,r,i,o,c){if(!e)return null;var u,h=this._path.getPathValue(e,n);if(Array.isArray(h)||s(h))return h;if(l(h)){if(!s(e))return null;if(!a(u=e[n]))return null}else{if(!a(h))return null;u=h}return(u.indexOf("@:")>=0||u.indexOf("@.")>=0)&&(u=this._link(t,e,u,r,"raw",o,c)),this._render(u,i,o,n)},et.prototype._link=function(t,e,n,r,a,i,o){var s=n,l=s.match(Z);for(var c in l)if(l.hasOwnProperty(c)){var u=l[c],f=u.match(K),p=f[0],m=f[1],_=u.replace(p,"").replace(Q,"");if(h(o,_))return s;o.push(_);var g=this._interpolate(t,e,_,r,"raw"===a?"string":a,"raw"===a?void 0:i,o);if(this._isFallbackRoot(g)){if(!this._root)throw Error("unexpected error");var v=this._root.$i18n;g=v._translate(v._getMessages(),v.locale,v.fallbackLocale,_,r,a,i)}g=this._warnDefault(t,_,g,r,Array.isArray(i)?i:[i],a),this._modifiers.hasOwnProperty(m)?g=this._modifiers[m](g):Y.hasOwnProperty(m)&&(g=Y[m](g)),o.pop(),s=g?s.replace(u,g):s}return s},et.prototype._render=function(t,e,n,r){var i=this._formatter.interpolate(t,n,r);return i||(i=tt.interpolate(t,n,r)),"string"!==e||a(i)?i:i.join("")},et.prototype._appendItemToChain=function(t,e,n){var r=!1;return h(t,e)||(r=!0,e&&(r="!"!==e[e.length-1],e=e.replace(/!/g,""),t.push(e),n&&n[e]&&(r=n[e]))),r},et.prototype._appendLocaleToChain=function(t,e,n){var r,a=e.split("-");do{var i=a.join("-");r=this._appendItemToChain(t,i,n),a.splice(-1,1)}while(a.length&&!0===r);return r},et.prototype._appendBlockToChain=function(t,e,n){for(var r=!0,i=0;i<e.length&&"boolean"==typeof r;i++){var o=e[i];a(o)&&(r=this._appendLocaleToChain(t,o,n))}return r},et.prototype._getLocaleChain=function(t,e){if(""===t)return[];this._localeChainCache||(this._localeChainCache={});var i=this._localeChainCache[t];if(!i){e||(e=this.fallbackLocale),i=[];for(var o,s=[t];n(s);)s=this._appendBlockToChain(i,s,e);(s=a(o=n(e)?e:r(e)?e.default?e.default:null:e)?[o]:o)&&this._appendBlockToChain(i,s,null),this._localeChainCache[t]=i}return i},et.prototype._translate=function(t,e,n,r,a,i,o){for(var s,c=this._getLocaleChain(e,n),u=0;u<c.length;u++){var h=c[u];if(!l(s=this._interpolate(h,t[h],r,a,i,o,[r])))return s}return null},et.prototype._t=function(t,e,n,r){for(var a,i=[],o=arguments.length-4;o-- >0;)i[o]=arguments[o+4];if(!t)return"";var s=c.apply(void 0,i),l=s.locale||e,u=this._translate(n,l,this.fallbackLocale,t,r,"string",s.params);if(this._isFallbackRoot(u)){if(!this._root)throw Error("unexpected error");return(a=this._root).$t.apply(a,[t].concat(i))}return u=this._warnDefault(l,t,u,r,i,"string"),this._postTranslation&&null!=u&&(u=this._postTranslation(u,t)),u},et.prototype.t=function(t){for(var e,n=[],r=arguments.length-1;r-- >0;)n[r]=arguments[r+1];return(e=this)._t.apply(e,[t,this.locale,this._getMessages(),null].concat(n))},et.prototype._i=function(t,e,n,r,a){var i=this._translate(n,e,this.fallbackLocale,t,r,"raw",a);if(this._isFallbackRoot(i)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.i(t,e,a)}return this._warnDefault(e,t,i,r,[a],"raw")},et.prototype.i=function(t,e,n){return t?(a(e)||(e=this.locale),this._i(t,e,this._getMessages(),null,n)):""},et.prototype._tc=function(t,e,n,r,a){for(var i,o=[],s=arguments.length-5;s-- >0;)o[s]=arguments[s+5];if(!t)return"";void 0===a&&(a=1);var l={count:a,n:a},u=c.apply(void 0,o);return u.params=Object.assign(l,u.params),o=null===u.locale?[u.params]:[u.locale,u.params],this.fetchChoice((i=this)._t.apply(i,[t,e,n,r].concat(o)),a)},et.prototype.fetchChoice=function(t,e){if(!t&&!a(t))return null;var n=t.split("|");return n[e=this.getChoiceIndex(e,n.length)]?n[e].trim():t},et.prototype.tc=function(t,e){for(var n,r=[],a=arguments.length-2;a-- >0;)r[a]=arguments[a+2];return(n=this)._tc.apply(n,[t,this.locale,this._getMessages(),null,e].concat(r))},et.prototype._te=function(t,e,n){for(var r=[],a=arguments.length-3;a-- >0;)r[a]=arguments[a+3];var i=c.apply(void 0,r).locale||e;return this._exist(n[i],t)},et.prototype.te=function(t,e){return this._te(t,this.locale,this._getMessages(),e)},et.prototype.getLocaleMessage=function(t){return u(this._vm.messages[t]||{})},et.prototype.setLocaleMessage=function(t,e){"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||this._checkLocaleMessage(t,this._warnHtmlInMessage,e),this._vm.$set(this._vm.messages,t,e)},et.prototype.mergeLocaleMessage=function(t,e){"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||this._checkLocaleMessage(t,this._warnHtmlInMessage,e),this._vm.$set(this._vm.messages,t,m({},this._vm.messages[t]||{},e))},et.prototype.getDateTimeFormat=function(t){return u(this._vm.dateTimeFormats[t]||{})},et.prototype.setDateTimeFormat=function(t,e){this._vm.$set(this._vm.dateTimeFormats,t,e),this._clearDateTimeFormat(t,e)},et.prototype.mergeDateTimeFormat=function(t,e){this._vm.$set(this._vm.dateTimeFormats,t,m(this._vm.dateTimeFormats[t]||{},e)),this._clearDateTimeFormat(t,e)},et.prototype._clearDateTimeFormat=function(t,e){for(var n in e){var r=t+"__"+n;this._dateTimeFormatters.hasOwnProperty(r)&&delete this._dateTimeFormatters[r]}},et.prototype._localizeDateTime=function(t,e,n,r,a){for(var i=e,o=r[i],s=this._getLocaleChain(e,n),c=0;c<s.length;c++){var u=s[c];if(i=u,!l(o=r[u])&&!l(o[a]))break}if(l(o)||l(o[a]))return null;var h=o[a],f=i+"__"+a,p=this._dateTimeFormatters[f];return p||(p=this._dateTimeFormatters[f]=new Intl.DateTimeFormat(i,h)),p.format(t)},et.prototype._d=function(t,e,n){if(!n)return new Intl.DateTimeFormat(e).format(t);var r=this._localizeDateTime(t,e,this.fallbackLocale,this._getDateTimeFormats(),n);if(this._isFallbackRoot(r)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.d(t,n,e)}return r||""},et.prototype.d=function(t){for(var e=[],n=arguments.length-1;n-- >0;)e[n]=arguments[n+1];var i=this.locale,o=null;return 1===e.length?a(e[0])?o=e[0]:r(e[0])&&(e[0].locale&&(i=e[0].locale),e[0].key&&(o=e[0].key)):2===e.length&&(a(e[0])&&(o=e[0]),a(e[1])&&(i=e[1])),this._d(t,i,o)},et.prototype.getNumberFormat=function(t){return u(this._vm.numberFormats[t]||{})},et.prototype.setNumberFormat=function(t,e){this._vm.$set(this._vm.numberFormats,t,e),this._clearNumberFormat(t,e)},et.prototype.mergeNumberFormat=function(t,e){this._vm.$set(this._vm.numberFormats,t,m(this._vm.numberFormats[t]||{},e)),this._clearNumberFormat(t,e)},et.prototype._clearNumberFormat=function(t,e){for(var n in e){var r=t+"__"+n;this._numberFormatters.hasOwnProperty(r)&&delete this._numberFormatters[r]}},et.prototype._getNumberFormatter=function(t,e,n,r,a,i){for(var o=e,s=r[o],c=this._getLocaleChain(e,n),u=0;u<c.length;u++){var h=c[u];if(o=h,!l(s=r[h])&&!l(s[a]))break}if(l(s)||l(s[a]))return null;var f,p=s[a];if(i)f=new Intl.NumberFormat(o,Object.assign({},p,i));else{var m=o+"__"+a;(f=this._numberFormatters[m])||(f=this._numberFormatters[m]=new Intl.NumberFormat(o,p))}return f},et.prototype._n=function(t,e,n,r){if(!et.availabilities.numberFormat)return"";if(!n)return(r?new Intl.NumberFormat(e,r):new Intl.NumberFormat(e)).format(t);var a=this._getNumberFormatter(t,e,this.fallbackLocale,this._getNumberFormats(),n,r),i=a&&a.format(t);if(this._isFallbackRoot(i)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.n(t,Object.assign({},{key:n,locale:e},r))}return i||""},et.prototype.n=function(e){for(var n=[],i=arguments.length-1;i-- >0;)n[i]=arguments[i+1];var o=this.locale,s=null,l=null;return 1===n.length?a(n[0])?s=n[0]:r(n[0])&&(n[0].locale&&(o=n[0].locale),n[0].key&&(s=n[0].key),l=Object.keys(n[0]).reduce(function(e,r){var a;return h(t,r)?Object.assign({},e,((a={})[r]=n[0][r],a)):e},null)):2===n.length&&(a(n[0])&&(s=n[0]),a(n[1])&&(o=n[1])),this._n(e,o,s,l)},et.prototype._ntp=function(t,e,n,r){if(!et.availabilities.numberFormat)return[];if(!n)return(r?new Intl.NumberFormat(e,r):new Intl.NumberFormat(e)).formatToParts(t);var a=this._getNumberFormatter(t,e,this.fallbackLocale,this._getNumberFormats(),n,r),i=a&&a.formatToParts(t);if(this._isFallbackRoot(i)){if(!this._root)throw Error("unexpected error");return this._root.$i18n._ntp(t,e,n,r)}return i||[]},Object.defineProperties(et.prototype,nt),Object.defineProperty(et,"availabilities",{get:function(){if(!G){var t="undefined"!=typeof Intl;G={dateTimeFormat:t&&void 0!==Intl.DateTimeFormat,numberFormat:t&&void 0!==Intl.NumberFormat}}return G}}),et.install=I,et.version="8.20.0",et},"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.VueI18n=e();
\ No newline at end of file
diff --git a/components/ContentCard.vue b/components/ContentCard.vue
new file mode 100644
index 0000000..ffb4b3b
--- /dev/null
+++ b/components/ContentCard.vue
@@ -0,0 +1,722 @@
+<template>
+  <!-- 视频、图片 动态卡片 -->
+  <view class="content-card">
+    <!-- 用户信息 -->
+    <view class="user-info">
+      <image
+        class="avatar"
+        :src="cardData.user.avatar"
+        mode="aspectFill"
+      ></image>
+      <view class="user-detail">
+        <text class="username">{{ cardData.user.name }}</text>
+        <text class="user-meta">{{ cardData.user.meta }}</text>
+      </view>
+      <view class="follow-btn" @click="onFollow">
+        <u-icon name="plus" color="#666" size="14"></u-icon>
+        <text>关注</text>
+      </view>
+    </view>
+
+    <!-- 内容文本 -->
+    <view class="content-text" @click="goContentDetail">
+      {{ cardData.content }}
+    </view>
+
+    <!-- 媒体内容 - 内部处理交互 -->
+    <view class="media-content">
+      <!-- 视频内容 -->
+      <view v-if="isVideo" class="video-container" @click="handleVideoPlay">
+        <image
+          class="video-cover"
+          :src="cardData.cover"
+          mode="aspectFill"
+        ></image>
+        <view class="video-overlay">
+          <u-icon name="play-right" color="#fff" size="40"></u-icon>
+          <text v-if="cardData.duration" class="video-duration">{{
+            formatDuration(cardData.duration)
+          }}</text>
+        </view>
+      </view>
+
+      <!-- 图片内容 -->
+      <view v-else class="image-grid" :class="getImageLayoutClass()">
+        <image
+          v-for="(img, index) in cardData.images"
+          :key="index"
+          class="grid-image"
+          :src="img"
+          mode="aspectFill"
+          @click="handleImagePreview(index)"
+        ></image>
+      </view>
+    </view>
+
+    <!-- 互动栏 - 内部处理交互 -->
+    <view class="interaction-bar">
+      <view 
+        class="action-item" 
+        v-for="(item, index) in actionButtons" 
+        :key="index"
+        @click="handleAction(item.action)"
+      >
+        <image
+          :src="item.icon"
+          mode="aspectFill"
+          style="width: 40rpx; height: 40rpx"
+        ></image>
+        <text>{{ cardData.stats[item.stat] }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "ContentCard",
+  props: {
+    cardData: {
+      type: Object,
+      required: true,
+      default: () => ({
+        user: {
+          avatar: "",
+          name: "",
+          meta: "",
+        },
+        content: "",
+        // 可以是视频或图片
+        type: "image", // 'image' 或 'video'
+        images: [], // 图片数组
+        cover: "", // 视频封面
+        videoUrl: "", // 视频地址
+        duration: 0, // 视频时长(秒)
+        stats: {
+          forward: 0,
+          comment: 0,
+          like: 0,
+          favorite: 0,
+        },
+      }),
+    },
+  },
+  data() {
+    return {
+      // 添加内部状态跟踪互动状态
+      isLiked: false,
+      isFavorited: false,
+      isForwarded: false,
+      videoContext: null,
+      // 添加操作按钮配置
+      actionButtons: [
+        {
+          icon: "/static/common/img/homepage/reply.png",
+          action: "forward",
+          stat: "forward"
+        },
+        {
+          icon: "/static/common/img/homepage/comment.png",
+          action: "comment",
+          stat: "comment"
+        },
+        {
+          icon: "/static/common/img/homepage/like.png",
+          action: "like",
+          stat: "like"
+        },
+        {
+          icon: "/static/common/img/homepage/star.png",
+          action: "favorite",
+          stat: "favorite"
+        }
+      ]
+    };
+  },
+  computed: {
+    isVideo() {
+      return this.cardData.type === "video";
+    },
+    // 根据状态动态改变图标和颜色
+    likeIcon() {
+      return this.isLiked ? "heart-fill" : "heart";
+    },
+    likeColor() {
+      return this.isLiked ? "#ff5252" : "#999";
+    },
+    favoriteIcon() {
+      return this.isFavorited ? "star-fill" : "star";
+    },
+    favoriteColor() {
+      return this.isFavorited ? "#ffb700" : "#999";
+    },
+    forwardIcon() {
+      return this.isForwarded ? "arrow-right-fill" : "arrow-right";
+    },
+    forwardColor() {
+      return this.isForwarded ? "#2979ff" : "#999";
+    },
+    commentColor() {
+      return "#999"; // 评论按钮颜色无变化
+    },
+  },
+  methods: {
+    // 处理关注点击
+    onFollow() {
+      this.$emit("follow", this.cardData.user);
+    },
+
+    // 跳转详情页
+    goContentDetail() {
+      console.log("this.cardData", this.cardData);
+      this.$u.route({
+        url: "/pages/home/home/components/contentDetail/index",
+        // params: {
+        //   card,
+        // },
+      });
+    },
+
+    // 格式化视频时长
+    formatDuration(seconds) {
+      const minutes = Math.floor(seconds / 60);
+      const remainingSeconds = Math.floor(seconds % 60);
+      return `${minutes.toString().padStart(2, "0")}:${remainingSeconds
+        .toString()
+        .padStart(2, "0")}`;
+    },
+
+    // 处理视频播放
+    handleVideoPlay() {
+      if (this.cardData.videoUrl) {
+        // 记录播放历史
+        this.savePlayHistory();
+
+        // 使用内置视频播放器播放
+        try {
+          // 先尝试使用内部视频播放器
+          if (this.useInternalPlayer) {
+            this.showVideoPlayer = true;
+            this.$nextTick(() => {
+              this.videoContext = uni.createVideoContext("video-player", this);
+              this.videoContext.requestFullScreen();
+              this.videoContext.play();
+            });
+          } else {
+            // 否则跳转到专门的播放页面
+            uni.navigateTo({
+              url: `/pages/video/player?videoUrl=${encodeURIComponent(
+                this.cardData.videoUrl
+              )}&title=${encodeURIComponent(this.cardData.content)}`,
+            });
+          }
+
+          // 触发播放事件，让父组件可以进行额外处理
+          this.$emit("video-play", {
+            videoUrl: this.cardData.videoUrl,
+            title: this.cardData.content,
+            cover: this.cardData.cover,
+            cardId: this.cardData.id,
+          });
+
+          // 更新播放统计
+          this.updateVideoStats();
+        } catch (error) {
+          console.error("视频播放失败:", error);
+          uni.showToast({
+            title: "视频播放失败，请稍后再试",
+            icon: "none",
+          });
+        }
+      }
+    },
+
+    // 处理图片预览
+    handleImagePreview(index) {
+      try {
+        // 使用uni-app的图片预览API
+        uni.previewImage({
+          current: index,
+          urls: this.cardData.images,
+          longPressActions: {
+            itemList: ["保存图片", "分享图片"],
+            success: (res) => {
+              const { tapIndex } = res;
+              if (tapIndex === 0) {
+                // 保存图片
+                this.saveImage(this.cardData.images[index]);
+              } else if (tapIndex === 1) {
+                // 分享图片
+                this.shareImage(this.cardData.images[index]);
+              }
+            },
+          },
+        });
+
+        // 触发图片预览事件
+        this.$emit("image-preview", {
+          index,
+          images: this.cardData.images,
+          cardId: this.cardData.id,
+        });
+      } catch (error) {
+        console.error("图片预览失败:", error);
+      }
+    },
+
+    // 保存图片
+    saveImage(url) {
+      uni.showLoading({ title: "正在保存..." });
+      uni.downloadFile({
+        url,
+        success: (res) => {
+          if (res.statusCode === 200) {
+            uni.saveImageToPhotosAlbum({
+              filePath: res.tempFilePath,
+              success: () => {
+                uni.showToast({ title: "保存成功" });
+              },
+              fail: (err) => {
+                console.error("保存失败:", err);
+                uni.showToast({ title: "保存失败", icon: "none" });
+              },
+            });
+          }
+        },
+        fail: () => {
+          uni.showToast({ title: "下载图片失败", icon: "none" });
+        },
+        complete: () => {
+          uni.hideLoading();
+        },
+      });
+    },
+
+    // 分享图片
+    shareImage(url) {
+      // 根据平台实现不同的分享逻辑
+      // #ifdef APP-PLUS
+      plus.share.sendWithSystem({
+        type: "image",
+        pictures: [url],
+      });
+      // #endif
+
+      // #ifdef H5
+      // H5环境可能需要调用其他API
+      // #endif
+
+      // #ifdef MP
+      // 小程序环境使用小程序分享API
+      uni.showToast({ title: "请使用右上角分享", icon: "none" });
+      // #endif
+    },
+
+    // 根据图片数量确定布局样式
+    getImageLayoutClass() {
+      const count = this.cardData.images.length;
+      if (count === 1) return "single-image";
+      if (count === 2) return "double-image";
+      if (count === 3) return "triple-image";
+      if (count === 4) return "four-image";
+      if (count > 4) return "multi-image";
+      return "";
+    },
+
+    // 处理转发
+    handleForward() {
+      this.isForwarded = !this.isForwarded;
+
+      // 显示分享菜单
+      uni.showShareMenu({
+        withShareTicket: true,
+        menus: ["shareAppMessage", "shareTimeline"],
+      });
+
+      // 触发转发事件
+      this.$emit("forward", {
+        cardData: this.cardData,
+        isForwarded: this.isForwarded,
+      });
+
+      // 如果在APP中，可以调用原生分享
+      // #ifdef APP-PLUS
+      uni.share({
+        provider: "weixin",
+        scene: "WXSceneSession",
+        type: 0,
+        title: this.cardData.content,
+        summary: this.cardData.content,
+        imageUrl: this.isVideo ? this.cardData.cover : this.cardData.images[0],
+        success: function (res) {
+          console.log("分享成功：" + JSON.stringify(res));
+        },
+        fail: function (err) {
+          console.log("分享失败：" + JSON.stringify(err));
+        },
+      });
+      // #endif
+    },
+
+    // 处理评论
+    handleComment() {
+      // 跳转到评论页面或打开评论弹窗
+      this.$emit("comment", {
+        cardData: this.cardData,
+      });
+
+      // 这里可以实现自定义的评论交互
+      uni.navigateTo({
+        url: `/pages/comment/index?id=${this.cardData.id}&type=${this.cardData.type}`,
+      });
+    },
+
+    // 处理点赞
+    handleLike() {
+      // 切换点赞状态
+      this.isLiked = !this.isLiked;
+
+      // 更新点赞数据
+      const newStats = { ...this.cardData.stats };
+      if (this.isLiked) {
+        newStats.like += 1;
+      } else {
+        newStats.like = Math.max(0, newStats.like - 1);
+      }
+
+      // 更新数据并触发事件
+      this.$emit("like", {
+        cardData: this.cardData,
+        isLiked: this.isLiked,
+        newStats,
+      });
+
+      // 发送点赞请求到服务器
+      this.updateLikeStatus();
+    },
+
+    // 处理收藏
+    handleFavorite() {
+      // 切换收藏状态
+      this.isFavorited = !this.isFavorited;
+
+      // 更新收藏数据
+      const newStats = { ...this.cardData.stats };
+      if (this.isFavorited) {
+        newStats.favorite += 1;
+      } else {
+        newStats.favorite = Math.max(0, newStats.favorite - 1);
+      }
+
+      // 更新数据并触发事件
+      this.$emit("favorite", {
+        cardData: this.cardData,
+        isFavorited: this.isFavorited,
+        newStats,
+      });
+
+      // 发送收藏请求到服务器
+      this.updateFavoriteStatus();
+    },
+
+    // 更新点赞状态到服务器
+    updateLikeStatus() {
+      // 调用API更新点赞状态
+      // 示例代码，根据实际API调整
+      const url = this.isLiked ? "/api/like/add" : "/api/like/cancel";
+      uni.request({
+        url,
+        method: "POST",
+        data: {
+          contentId: this.cardData.id,
+          contentType: this.cardData.type,
+        },
+        success: (res) => {
+          console.log("点赞状态更新成功", res);
+        },
+        fail: (err) => {
+          console.error("点赞状态更新失败", err);
+          // 恢复原状态
+          this.isLiked = !this.isLiked;
+        },
+      });
+    },
+
+    // 更新收藏状态到服务器
+    updateFavoriteStatus() {
+      // 调用API更新收藏状态
+      // 示例代码，根据实际API调整
+      const url = this.isFavorited
+        ? "/api/favorite/add"
+        : "/api/favorite/cancel";
+      uni.request({
+        url,
+        method: "POST",
+        data: {
+          contentId: this.cardData.id,
+          contentType: this.cardData.type,
+        },
+        success: (res) => {
+          console.log("收藏状态更新成功", res);
+        },
+        fail: (err) => {
+          console.error("收藏状态更新失败", err);
+          // 恢复原状态
+          this.isFavorited = !this.isFavorited;
+        },
+      });
+    },
+
+    // 记录视频播放历史
+    savePlayHistory() {
+      // 保存播放历史到本地存储或服务器
+      try {
+        const historyList = uni.getStorageSync("videoPlayHistory") || [];
+        const now = new Date().getTime();
+
+        // 查找是否已有该视频记录
+        const index = historyList.findIndex(
+          (item) => item.id === this.cardData.id
+        );
+
+        if (index > -1) {
+          // 更新已有记录
+          historyList[index].lastPlayTime = now;
+          historyList[index].playCount += 1;
+        } else {
+          // 添加新记录
+          historyList.push({
+            id: this.cardData.id,
+            title: this.cardData.content,
+            cover: this.cardData.cover,
+            lastPlayTime: now,
+            playCount: 1,
+          });
+        }
+
+        // 保存回本地存储
+        uni.setStorageSync("videoPlayHistory", historyList);
+      } catch (e) {
+        console.error("保存播放历史失败", e);
+      }
+    },
+
+    // 更新视频播放统计
+    updateVideoStats() {
+      // 调用API更新视频播放次数
+      uni.request({
+        url: "/api/video/view",
+        method: "POST",
+        data: {
+          videoId: this.cardData.id,
+        },
+        success: (res) => {
+          console.log("视频播放统计更新成功", res);
+        },
+        fail: (err) => {
+          console.error("视频播放统计更新失败", err);
+        },
+      });
+    },
+
+    // 添加统一的操作处理方法
+    handleAction(action) {
+      switch(action) {
+        case "forward":
+          this.handleForward();
+          break;
+        case "comment":
+          this.handleComment();
+          break;
+        case "like":
+          this.handleLike();
+          break;
+        case "favorite":
+          this.handleFavorite();
+          break;
+      }
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.content-card {
+  background-color: #fff;
+  border-radius: 24rpx;
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+  .user-info {
+    display: flex;
+    align-items: center;
+    margin-bottom: 24rpx;
+
+    .avatar {
+      width: 80rpx;
+      height: 80rpx;
+      border-radius: 50%;
+      margin-right: 16rpx;
+    }
+
+    .user-detail {
+      flex: 1;
+
+      .username {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #333;
+        display: block;
+        line-height: 1.2;
+      }
+
+      .user-meta {
+        font-size: 24rpx;
+        color: #999;
+        display: block;
+        line-height: 1.2;
+        margin-top: 6rpx;
+      }
+    }
+
+    .follow-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: #f5f5f5;
+      border-radius: 30rpx;
+      padding: 8rpx 16rpx;
+
+      text {
+        font-size: 24rpx;
+        color: #666;
+        margin-left: 4rpx;
+      }
+    }
+  }
+
+  .content-text {
+    font-size: 28rpx;
+    color: #333;
+    line-height: 1.5;
+    margin-bottom: 24rpx;
+  }
+
+  .media-content {
+    margin-bottom: 24rpx;
+    width: 100%;
+
+    // 视频容器样式
+    .video-container {
+      position: relative;
+      width: 100%;
+      border-radius: 8rpx;
+      overflow: hidden;
+
+      .video-cover {
+        width: 100%;
+        height: 400rpx;
+        display: block;
+      }
+
+      .video-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: rgba(0, 0, 0, 0.2);
+
+        .video-duration {
+          position: absolute;
+          right: 16rpx;
+          bottom: 16rpx;
+          color: #fff;
+          font-size: 24rpx;
+          background-color: rgba(0, 0, 0, 0.5);
+          padding: 4rpx 8rpx;
+          border-radius: 4rpx;
+        }
+      }
+    }
+
+    // 图片网格样式
+    .image-grid {
+      display: flex;
+      flex-wrap: wrap;
+
+      .grid-image {
+        border-radius: 8rpx;
+        background-color: #f5f5f5;
+      }
+
+      &.single-image {
+        .grid-image {
+          width: 100%;
+          max-height: 400rpx;
+        }
+      }
+
+      &.double-image {
+        justify-content: space-between;
+
+        .grid-image {
+          width: 49%;
+          height: 240rpx;
+        }
+      }
+
+      &.triple-image {
+        justify-content: space-between;
+
+        .grid-image {
+          width: 31%;
+          height: 180rpx;
+        }
+      }
+
+      &.four-image {
+        justify-content: space-between;
+
+        .grid-image {
+          width: 49%;
+          height: 180rpx;
+          margin-bottom: 10rpx;
+        }
+      }
+
+      &.multi-image {
+        justify-content: space-between;
+
+        .grid-image {
+          width: 31%;
+          height: 180rpx;
+          margin-bottom: 10rpx;
+        }
+      }
+    }
+  }
+
+  .interaction-bar {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 16rpx;
+    padding: 0 20rpx;
+
+    .action-item {
+      display: flex;
+      align-items: center;
+
+      text {
+        font-size: 24rpx;
+        color: #999;
+        margin-left: 8rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/components/Information.vue b/components/Information.vue
new file mode 100644
index 0000000..04a9065
--- /dev/null
+++ b/components/Information.vue
@@ -0,0 +1,698 @@
+<template>
+  <view>
+    <view
+      class="flex-col Information"
+      style="position: relative; height: 100%"
+      @tap="btnShow = false"
+    >
+      <view class="flex-col">
+        <template v-if="list.length <= 0">
+          <view
+            v-if="type != 2 && type != 3 && !noShowEmpty"
+            style="height: 1rem"
+          ></view>
+          <!-- <u-empty v-if="type != 2 && type != 3" text="暂无数据" mode="list"></u-empty> -->
+          <no-data v-if="type != 2 && type != 3" text="暂无数据"></no-data>
+        </template>
+        <template v-else v-for="(item, index) in list">
+          <view
+            class="flex-col list-item"
+            :class="{
+              'border-radius': borderRadius,
+              'border-noPadding': borderNoPadding,
+            }"
+            :key="index"
+          >
+            <view style="height: 0.1rem" v-if="item.isState"></view>
+            <text class="shield" v-if="item.isState">
+              <u-icon size="30" name="error-circle-fill"></u-icon
+              >该信息已被管理员屏蔽
+            </text>
+            <view class="flex-row group_8 view">
+              <u-avatar
+                @click="toDetil(item.userId)"
+                size="0.3rem"
+                :src="$u.http.config.imgUrl + item.userHead"
+                class="image_3"
+              ></u-avatar>
+              <text class="text_8 text_43">{{ item.userName }}</text>
+              <text class="text_9">{{ item.creationTime }}</text>
+              <text class="text_11">{{ item.schoolName }}</text>
+              <u-icon
+                v-if="isDel"
+                name="more-dot-fill"
+                color="#ccc"
+                size="40"
+                style="position: absolute; right: 0"
+                @click="showDelFn(item)"
+              ></u-icon>
+            </view>
+            <view class="flex-col group_9" @click="onDetails(item)">
+              <text class="text_14" v-if="type != 2">{{
+                item.title.length > 15
+                  ? item.title.slice(0, 15) + "..."
+                  : item.title
+              }}</text>
+              <text class="text_14" v-else>{{ item.title }}</text>
+              <template v-if="!item.isForward">
+                <view v-if="!item.isDelete">
+                  <text class="text_15" v-if="type != 2">
+                    {{
+                      item.content.length > 50
+                        ? item.content.slice(0, 50) + "..."
+                        : item.content
+                    }}
+                  </text>
+                  <text class="text_15" v-else>
+                    {{ item.content }}
+                  </text>
+                  <view
+                    class="imgList flex-col"
+                    v-if="item.imageUrl.indexOf('.') > 0"
+                  >
+                    <view class="flex-row">
+                      <image
+                        @click.stop="clickImg(v)"
+                        v-for="(v, i) in item.imageUrl.split(',')"
+                        :key="i"
+                        :src="v ? $u.http.config.imgUrl + v : ''"
+                        class="image_10"
+                      />
+                    </view>
+                  </view>
+                  <view class="flex-row" v-if="item.sysSignStr">
+                    <text
+                      class="text_16"
+                      v-for="(v, i) in item.sysSignStr.split(',')"
+                      @click.stop="onSign(v)"
+                      :key="i"
+                      >{{ v ? "#" + v : "" }}</text
+                    >
+                  </view>
+                </view>
+                <view
+                  v-else
+                  class="flex-row justify-between items-center delete-item"
+                >
+                  <text class="item-text">哎呀，此页面已被发布者删除。</text>
+                  <u-icon
+                    class="icon-1"
+                    name="trash"
+                    color="black"
+                    size="50"
+                    @click="onDelCollet(item)"
+                  ></u-icon>
+                </view>
+              </template>
+              <template v-else>
+                <view
+                  style="
+                    background: #f8f8f8;
+                    padding: 0.1rem;
+                    margin-top: 0.1rem;
+                  "
+                  class="flex-col group_9"
+                >
+                  <text class="text_14" v-if="type != 2">{{
+                    item.forwardModel.forwardTitle.length > 15
+                      ? item.forwardModel.forwardTitle.slice(0, 15) + "..."
+                      : item.forwardModel.forwardTitle
+                  }}</text>
+                  <text class="text_14" v-else>{{
+                    item.forwardModel.forwardTitle
+                  }}</text>
+                  <text class="text_15" v-if="type != 2">
+                    {{
+                      item.content.length > 50
+                        ? item.content.slice(0, 50) + "..."
+                        : item.content
+                    }}
+                  </text>
+                  <text class="text_15" v-else>
+                    {{ item.content }}
+                  </text>
+                  <view
+                    class="imgList flex-col"
+                    v-if="item.forwardModel.forwardImageUrl.indexOf('.') > 0"
+                  >
+                    <view class="flex-row">
+                      <image
+                        style="width: 32%; height: 0auto"
+                        @click.stop="clickImg(v)"
+                        v-for="(
+                          v, i
+                        ) in item.forwardModel.forwardImageUrl.split(',')"
+                        v-if="i < 9"
+                        :key="i"
+                        :src="v ? $u.http.config.imgUrl + v : ''"
+                        class="image_10"
+                      />
+                    </view>
+                  </view>
+                  <view class="flex-row" v-if="item.sysSignStr">
+                    <text
+                      @click.stop="onSign(v)"
+                      class="text_16"
+                      v-for="(v, i) in item.sysSignStr.split(',')"
+                      :key="i"
+                      >{{ v ? "#" + v : "" }}</text
+                    >
+                  </view>
+                </view>
+              </template>
+            </view>
+            <view class="flex-row">
+              <view class="flex-row group_21" v-if="type != 2 && type != 3">
+                <view
+                  class="flex-row equal-division-item_1"
+                  @click="onForward(item)"
+                  v-if="!item.isForward && type != 0"
+                >
+                  <image
+                    src="/static/common/img/homepage/reply.png"
+                    class="image_8"
+                  />
+                  <text class="text_19">{{ item.forwardCount }}</text>
+                </view>
+                <view class="flex-row group_10" @click="onDetails(item)">
+                  <image
+                    src="/static/common/img/homepage/comment.png"
+                    class="image_7"
+                  />
+                  <text class="text_18">{{ item.commentCount }}</text>
+                </view>
+
+                <view class="flex-row group_20">
+                  <!-- <u-icon style="font-size:0.22rem;color:#b4b6bd" v-if="item.isCllect == false"
+										name="star" @click="onStar(item)"></u-icon> -->
+                  <image
+                    style="width: 42rpx; height: 42rpx"
+                    src="/static/common/img/homepage/star.png"
+                    v-if="item.isCllect == false"
+                    name="star"
+                    @click="onStar(item)"
+                  ></image>
+                  <u-icon
+                    style="font-size: 40rpx; color: #ffc300"
+                    v-else
+                    name="star-fill"
+                    @click="onStar(item)"
+                  ></u-icon>
+                  <text class="text_17">{{ item.collectCount }}</text>
+                </view>
+             <!--
+				<view
+				class="flex-row group_20"
+				v-if="isDel"
+				@tap="onDelete(item)"
+                >
+				<image
+				src="/static/common/img/homepage/trash.png"
+				style="width: 42rpx; height: 42rpx"
+				/>
+                </view>
+				-->
+              </view>
+            </view>
+          </view>
+        </template>
+      </view>
+      <template v-if="bottom && list.length > 0">
+        <view style="height: 0.46rem"></view>
+        <u-divider
+          style="bottom: 0.2rem; position: absolute; background: transparent"
+          color="#6d6d6d"
+          half-width="200"
+          border-color="#6d6d6d"
+        >
+          {{ text ? text : "已经到底了" }}
+        </u-divider>
+      </template>
+      <u-popup v-model="showDel" mode="bottom" :border-radius="40">
+        <view class="popup-box">
+          <view class="popup-btn" @click="delItem">删除</view>
+          <view class="popup-line"></view>
+          <view class="popup-btn" @click="showDel = false">取消</view>
+        </view>
+      </u-popup>
+      <u-toast ref="uToast" />
+      <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    </view>
+  </view>
+</template>
+
+<script>
+import NoData from "components/NoData.vue";
+export default {
+  name: "information",
+  components: {
+    NoData,
+  },
+  // list（array） 数据集 type（number）数据类型  bottom 是否显示 nolink控制是否进行转挑
+  props: [
+    "list",
+    "type",
+    "bottom",
+    "text",
+    "schoolId",
+    "nolink",
+    "route",
+    "flag",
+    "id",
+    "isEllipsis",
+    "isDel",
+    "borderRadius",
+    "borderNoPadding",
+    "noShowEmpty",
+  ],
+  data() {
+    return {
+      isindex: -1,
+      btnShow: false,
+      state: false,
+      currentRow: {},
+      showDel: false,
+      delRow: {},
+    };
+  },
+  mounted() {},
+  onLoad() {
+    this.state = true;
+  },
+  methods: {
+    showDelFn(item) {
+      this.delRow = item;
+      this.showDel = true;
+    },
+    delItem() {
+	  this.showDel = false;
+      this.$emit("onDelete", {
+        type: this.delRow.type,
+        id: this.delRow.id,
+      });
+    },
+    //详情
+    onDetails(item) {
+      console.log(JSON.parse(JSON.stringify(item)), "item-JSON-");
+      this.currentRow = item;
+      uni.$off("echoList");
+      uni.$on("echoList", (result) => {
+        // console.log('echoList----')
+        // 收藏
+        if (result.type === "star") {
+          console.log("%c%s", "color:red", "收藏回显");
+          console.log(result, "result");
+          this.currentRow.isCllect = result.data.isCllect;
+          console.log(result.isCllect, "result.isCllect");
+          if (result.data.isCllect === true) {
+            this.currentRow.collectCount++;
+          }
+          if (result.data.isCllect === false) {
+            this.currentRow.collectCount && this.currentRow.collectCount--;
+          }
+        }
+        // 评价
+        if (result.type === "evaluate") {
+          console.log("%c%s", "color:red", "评价回显");
+          console.log(result, "result");
+          this.currentRow.commentCount = result.data.commentCount;
+        }
+      });
+      // return
+      if (this.nolink) {
+        return;
+      }
+      if (item.isDelete) {
+        return;
+      }
+      item.flag = this.flag;
+      item.route = this.route;
+      item.mytype = this.type;
+      item.myschoolId = this.id;
+      if (this.type == 3) {
+        item.mytype = item.type;
+      }
+      // return
+      this.$u.route({
+        url: "pages/AlumniCircle/ArticleDetails/ArticleDetails",
+        params: {
+          data: JSON.stringify(item),
+          isDel:this.isDel
+        },
+      });
+    },
+    toDetil(id) {
+      this.$u.route({
+        url: "/pages/AlumniCircle/userDetail/userDetail?id=" + id + "&type=4",
+      });
+    },
+    //收藏
+    onStar(item) {
+      item.type = this.type;
+      this.$emit("onStar", item);
+    },
+    //转发
+    async onForward(item) {
+      console.log(JSON.parse(JSON.stringify(item)), "item-JSON-");
+      // return
+      this.currentRow = item;
+      uni.$off("echoList");
+      uni.$on("echoList", (result) => {
+        console.log("%c%s", "color:red", "echoList----");
+        // 转发
+        if (result.type === "forward") {
+          console.log("%c%s", "color:red", "转发回显");
+          console.log(result, "result");
+          this.currentRow.forwardCount++;
+        }
+      });
+      // 判断当前学校是否认证，未认证不可转发
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(res)), "res");
+      const edcationList = res.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行转发操作",
+          type: "none",
+        });
+      }
+      const findRow = edcationList.find((x) => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行转发操作",
+          type: "none",
+        });
+      }
+      if (this.schoolId) {
+        item.schoolId = this.schoolId;
+      }
+      item.route = this.route;
+      if (item.isForward) return;
+      this.$u.route({
+        url: "pages/AlumniCircle/forward/forward",
+        params: {
+          data: JSON.stringify(item),
+        },
+      });
+    },
+    //图片预览
+    clickImg(item) {
+      if (this.route == 3 || this.nolink) {
+        item = this.$u.http.config.imgUrl + item;
+        var images = [];
+        images.push(item);
+        uni.previewImage({
+          // 图片路径必须是一个数组 => ['']
+          current: 0,
+          urls: images,
+        });
+      }
+      this.$emit("clickImg", item);
+    },
+    onSign(v) {
+      this.$emit("onSign", v);
+    },
+    //删除
+    onDelete(item) {
+      this.$emit("onDelete", {
+        type: item.type,
+        id: item.id,
+      });
+    },
+    //删除收藏
+    onDelCollet(item) {
+      this.$emit("onDelCollet", item.collectId);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.btns {
+  background-color: #fff;
+  box-shadow: 0 0 0.05rem #ccc;
+  border-radius: 0.05rem;
+  position: absolute;
+  bottom: 100%;
+  white-space: nowrap;
+
+  .item {
+    line-height: 2;
+    padding: 0 0.1rem;
+  }
+}
+
+::v-deep .u-divider-text {
+  line-height: 2;
+}
+
+.Information {
+  background-color: rgb(246, 247, 250);
+  // margin-top: 0.1rem;
+
+  .list-item {
+    padding: 0.18rem 0.2rem;
+    background-color: rgb(255, 255, 255);
+    margin-bottom: 0.1rem;
+    position: relative;
+    width: 100%;
+    // width: calc(100% - 50rpx);
+    // margin: 0.1rem auto 0;
+    // border-radius: 24rpx 24rpx 24rpx 24rpx;
+    // border: 2rpx solid #F7F6F9;
+    overflow: hidden;
+
+    .shield {
+      position: absolute;
+      top: 0.05rem;
+      width: 100%;
+      color: #ff9b00;
+      left: 0.1rem;
+    }
+
+    .view {
+      margin-right: 0.051rem;
+    }
+
+    .group_9 {
+      // margin-right: 0.13rem;
+      margin-top: 0.1rem;
+      width: 100%;
+
+      .text_14 {
+        align-self: flex-start;
+        color: rgb(2, 2, 2);
+        font-size: 0.16rem;
+        font-family: Adobe Heiti Std;
+        line-height: 2;
+        width: 100%;
+        word-wrap: break-word;
+      }
+
+      .text_15 {
+        // margin-top: 0.11rem;
+        color: rgb(73, 76, 87);
+        font-size: 0.14rem;
+        font-family: Adobe Heiti Std;
+        line-height: 0.24rem;
+        text-indent: 0.2rem;
+        word-wrap: break-word;
+      }
+
+      .text_16 {
+        margin-left: 0.04rem;
+        margin-top: 0.12rem;
+        align-self: flex-start;
+        // color: rgb(44, 109, 255);
+        color: #298bc3;
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.13rem;
+      }
+    }
+
+    .group_21 {
+      margin-top: 0.1rem;
+      justify-content: space-between;
+      width: 90%;
+      margin: 0.1rem auto 0;
+
+      .group_20 {
+        justify-content: center;
+        flex: 1;
+        // margin: 0.025rem 0;
+
+        .image_6 {
+          flex-shrink: 0;
+          width: 42rpx;
+          height: 42rpx;
+        }
+
+        .text_17 {
+          margin-left: 5rpx;
+          margin-top: 8rpx;
+          color: rgb(180, 182, 189);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.11rem;
+        }
+      }
+
+      .group_10 {
+        justify-content: center;
+        flex: 1;
+        align-self: center;
+
+        .image_7 {
+          flex-shrink: 0;
+          width: 42rpx;
+          height: 42rpx;
+        }
+
+        .text_18 {
+          margin-left: 5rpx;
+          margin-top: 8rpx;
+          color: rgb(180, 182, 189);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.11rem;
+        }
+      }
+
+      .equal-division-item_1 {
+        flex: 1;
+        justify-content: center;
+        align-self: center;
+
+        .image_8 {
+          width: 42rpx;
+          height: 42rpx;
+        }
+
+        .text_19 {
+          margin-left: 5rpx;
+          margin-top: 8rpx;
+          color: rgb(180, 182, 189);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.11rem;
+        }
+      }
+    }
+  }
+
+  .border-radius {
+    border-radius: 24rpx;
+    width: calc(100% - 48rpx);
+    margin: 0.1rem auto 0;
+  }
+
+  .border-noPadding {
+    border-radius: 24rpx;
+    margin: 0.1rem auto 0;
+  }
+
+  .list-item:last-child {
+    margin-bottom: 0;
+  }
+
+  .imgList {
+    padding-top: 0.1rem;
+
+    .flex-row {
+      flex-wrap: wrap;
+    }
+
+    image {
+      width: 33%;
+      height: 1rem;
+      margin: 0 0.5% 0.5% 0;
+    }
+
+    image:nth-child(3n) {
+      margin-right: 0;
+    }
+  }
+
+  .delete-item {
+    box-sizing: border-box;
+
+    .item-text {
+      padding-top: 0.05rem;
+      color: #000000;
+    }
+
+    .icon-1 {
+    }
+  }
+
+  .group_8 {
+    height: 0.32rem;
+    position: relative;
+
+    .image_3 {
+      width: 0.3rem !important;
+      height: 0.3rem !important;
+      position: absolute;
+      left: 0;
+      top: 50%;
+      transform: translateY(-50%);
+      border-radius: 50%;
+    }
+
+    .text_8 {
+      color: rgb(2, 2, 2);
+      font-size: 0.14rem;
+      font-family: PingFang;
+      line-height: 0.13rem;
+    }
+
+    .text_43 {
+      position: absolute;
+      left: 0.37rem;
+      top: 0.02rem;
+    }
+
+    .text_9 {
+      color: rgb(184, 184, 184);
+      font-size: 0.12rem;
+      font-family: PingFang;
+      line-height: 0.12rem;
+      position: absolute;
+      left: 0.37rem;
+      bottom: 0;
+    }
+
+    .text_11 {
+      color: rgb(184, 184, 184);
+      font-size: 0.12rem;
+      font-family: PingFang;
+      line-height: 0.12rem;
+      position: absolute;
+      left: 0.97rem;
+      bottom: 0;
+    }
+
+    .text_20 {
+      position: absolute;
+      left: 0.36rem;
+      top: 0.02rem;
+    }
+  }
+}
+.popup-box {
+  padding: 10rpx 0;
+  .popup-btn {
+    font-size: 34rpx;
+    text-align: center;
+    padding: 30rpx;
+  }
+  .popup-line {
+    height: 20rpx;
+    background: #f7f7f8;
+  }
+}
+</style>
diff --git a/components/NoData copy.vue b/components/NoData copy.vue
new file mode 100644
index 0000000..fc58b1c
--- /dev/null
+++ b/components/NoData copy.vue	
@@ -0,0 +1,117 @@
+<template>
+  <view class="empty-container">
+    <image :src="getImage" class="empty-image" mode="widthFix"></image>
+    <text class="empty-text">{{ text }}</text>
+  </view>
+</template>
+
+<script>
+// 暂无数据
+import noDataDefault from "@/static/common/img/noData/no-data.png";
+// 暂无搜索
+import noDataSearch from "@/static/common/img/noData/no-search.png";
+// 暂无消息
+import noDataMessage from "@/static/common/img/noData/no-message.png";
+// 网络异常
+import errorNet from "@/static/common/img/noData/error-net.png";
+// 数据加载失败
+import errorData from "@/static/common/img/noData/error-data.png";
+// 维护中
+import maintenance from "@/static/common/img/noData/maintenance.png";
+// 暂无附件简历
+import noAttachmentResume from "@/static/common/img/noData/no-attachment-resume.png";
+// 暂无收藏
+import noCollection from "@/static/common/img/noData/no-collection.png";
+// 暂无评论
+import noComments from "@/static/common/img/noData/no-comments.png";
+// 暂无内容
+import noContent from "@/static/common/img/noData/no-content.png";
+// 暂无文件
+import noFile from "@/static/common/img/noData/no-file.png";
+// 暂无好友
+import noFriends from "@/static/common/img/noData/no-friends.png";
+// 暂无网络
+import noInternet from "@/static/common/img/noData/no-internet.png";
+// 暂无权限
+import noPermissions from "@/static/common/img/noData/no-permissions.png";
+// 暂无图片
+import noPicture from "@/static/common/img/noData/no-picture.png";
+
+export default {
+  name: "NoData",
+  props: {
+    // 图片类型
+    type: {
+      type: String,
+      default: "default",
+    },
+    // 描述文字，默认值为"暂无数据"
+    text: {
+      type: String,
+      default: "暂无数据",
+    },
+  },
+  computed: {
+    getImage() {
+      const imageMap = {
+        default: noDataDefault,
+        search: noDataSearch,
+        message: noDataMessage,
+        errorNet: errorNet,
+        errorData: errorData,
+        maintenance: maintenance,
+        resume: noAttachmentResume,
+        collection: noCollection,
+        comments: noComments,
+        content: noContent,
+        file: noFile,
+        friends: noFriends,
+        internet: noInternet,
+        permissions: noPermissions,
+        picture: noPicture,
+      };
+      return imageMap[this.type] || imageMap.default;
+    },
+  },
+  data: {
+    /*  
+    <no-data type="default" text="暂无数据" />
+    <no-data type="errorNet" text="网络错误" />
+    <no-data type="search" text="暂无搜索内容" />
+    <no-data type="errorData" text="数据加载失败" />
+    <no-data type="message" text="暂无消息" />
+        <no-data type="maintenance" text="系统维护中" />
+        <no-data type="resume" text="暂无简历附件" />
+        <no-data type="collection" text="暂无收藏" />
+        <no-data type="comments" text="暂无评论" />
+        <no-data type="content" text="暂无内容" />
+        <no-data type="file" text="暂无文件" />
+        <no-data type="friends" text="暂无好友" />
+        <no-data type="internet" text="无网络连接" />
+        <no-data type="permissions" text="暂无权限" />
+        <no-data type="picture" text="暂无图片" /> */
+  },
+};
+</script>
+
+<style scoped>
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 20rpx;
+  text-align: center;
+}
+
+.empty-image {
+  width: 400rpx;
+  height: 400rpx;
+  margin-bottom: 20rpx;
+}
+
+.empty-text {
+  font-size: 32rpx;
+  color: #000;
+}
+</style>
\ No newline at end of file
diff --git a/components/NoData.vue b/components/NoData.vue
new file mode 100644
index 0000000..e1887d7
--- /dev/null
+++ b/components/NoData.vue
@@ -0,0 +1,117 @@
+<template>
+  <view class="empty-container">
+    <image :src="getImage" class="empty-image" mode="widthFix"></image>
+    <!-- <text class="empty-text">{{ text }}</text> -->
+  </view>
+</template>
+
+<script>
+// 暂无数据
+import noDataDefault from "@/static/common/img/noDataNew/no-data.png";
+// 暂无搜索
+import noDataSearch from "@/static/common/img/noDataNew/no-search.png";
+// 暂无消息
+import noDataMessage from "@/static/common/img/noDataNew/no-message.png";
+// 网络异常
+import errorNet from "@/static/common/img/noDataNew/error-net.png";
+// 数据加载失败
+import errorData from "@/static/common/img/noDataNew/error-data.png";
+// 维护中
+import maintenance from "@/static/common/img/noDataNew/maintenance.png";
+// 暂无附件简历
+import noAttachmentResume from "@/static/common/img/noDataNew/no-attachment-resume.png";
+// 暂无收藏
+import noCollection from "@/static/common/img/noDataNew/no-collection.png";
+// 暂无评论
+import noComments from "@/static/common/img/noDataNew/no-comments.png";
+// 暂无内容
+import noContent from "@/static/common/img/noDataNew/no-content.png";
+// 暂无文件
+import noFile from "@/static/common/img/noDataNew/no-file.png";
+// 暂无好友
+import noFriends from "@/static/common/img/noDataNew/no-friends.png";
+// 暂无网络
+import noInternet from "@/static/common/img/noDataNew/no-internet.png";
+// 暂无权限
+import noPermissions from "@/static/common/img/noDataNew/no-permissions.png";
+// 暂无图片
+import noPicture from "@/static/common/img/noDataNew/no-picture.png";
+
+export default {
+  name: "NoData",
+  props: {
+    // 图片类型
+    type: {
+      type: String,
+      default: "default",
+    },
+    // 描述文字，默认值为"暂无数据"
+    text: {
+      type: String,
+      default: "暂无数据",
+    },
+  },
+  computed: {
+    getImage() {
+      const imageMap = {
+        default: noDataDefault,
+        search: noDataSearch,
+        message: noDataMessage,
+        errorNet: errorNet,
+        errorData: errorData,
+        maintenance: maintenance,
+        resume: noAttachmentResume,
+        collection: noCollection,
+        comments: noComments,
+        content: noContent,
+        file: noFile,
+        friends: noFriends,
+        internet: noInternet,
+        permissions: noPermissions,
+        picture: noPicture,
+      };
+      return imageMap[this.type] || imageMap.default;
+    },
+  },
+  data: {
+    /*  
+    <no-data type="default" text="暂无数据" />
+    <no-data type="errorNet" text="网络错误" />
+    <no-data type="search" text="暂无搜索内容" />
+    <no-data type="errorData" text="数据加载失败" />
+    <no-data type="message" text="暂无消息" />
+        <no-data type="maintenance" text="系统维护中" />
+        <no-data type="resume" text="暂无简历附件" />
+        <no-data type="collection" text="暂无收藏" />
+        <no-data type="comments" text="暂无评论" />
+        <no-data type="content" text="暂无内容" />
+        <no-data type="file" text="暂无文件" />
+        <no-data type="friends" text="暂无好友" />
+        <no-data type="internet" text="无网络连接" />
+        <no-data type="permissions" text="暂无权限" />
+        <no-data type="picture" text="暂无图片" /> */
+  },
+};
+</script>
+
+<style scoped>
+.empty-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  /* padding: 20rpx; */
+  text-align: center;
+}
+
+.empty-image {
+  width: 400rpx;
+  height: 300rpx;
+  margin-bottom: 20rpx;
+}
+
+.empty-text {
+  font-size: 32rpx;
+  color: #000;
+}
+</style>
\ No newline at end of file
diff --git a/components/drag-button.vue b/components/drag-button.vue
new file mode 100644
index 0000000..c098665
--- /dev/null
+++ b/components/drag-button.vue
@@ -0,0 +1,164 @@
+<template>
+	<view>
+		<!-- v-if="current==0&&vuex_user.isAttestationGLY&&vuex_user.isAttestationJZG&&(vuex_user.isAttestationXY||true) || current==1&&(vuex_user.isAttestationXY||true)" -->
+		<view
+		v-if="false"
+			id="_drag_button"
+			class="drag"
+			:style="'left: ' + left + 'px; top:' + top + 'px;transform: translateY(-60%);'"
+			@touchstart="touchstart"
+			@touchmove.stop.prevent="touchmove"
+			@touchend.stop="touchend"
+			@click.stop.prevent="click"
+			:class="{ transition: isDock && !isMove }"
+		>
+		<u-icon name="plus" size="50" color="#ccc"></u-icon>
+			<!-- <text>{{ text }}</text> -->
+		</view>
+		<view
+			id="_drag_button"
+			class="drag"
+			:style="'left: ' + left + 'px; top:' + (top + 0)+ 'px;transform: translateY(60%);'"
+			@touchstart="touchstart"
+			@touchmove.stop.prevent="touchmove"
+			@touchend.stop="touchend"
+			@click.stop.prevent="reload"
+			:class="{ transition: isDock && !isMove }"
+		>
+		<u-icon name="reload" size="50" color="#ccc"></u-icon>
+			<!-- <text>{{ text }}</text> -->
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'drag-button',
+	props: {
+		current:{
+			type: Number,
+			default: 0
+		},
+		isDock: {
+			type: Boolean,
+			default: false
+		},
+		existTabBar: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			top: 0,
+			left: 0,
+			width: 0,
+			height: 0,
+			offsetWidth: 0,
+			offsetHeight: 0,
+			windowWidth: 0,
+			windowHeight: 0,
+			isMove: true,
+			edge: 70,
+			wrap:10,
+			text: '公告' //此处自定义按钮文字(1-3个汉字)
+		};
+	},
+	mounted() {
+		const sys = uni.getSystemInfoSync();
+
+		this.windowWidth = sys.windowWidth;
+		this.windowHeight = sys.windowHeight;
+
+		// #ifdef APP-PLUS
+		this.existTabBar && (this.windowHeight -= 50);
+		// #endif
+		if (sys.windowTop) {
+			this.windowHeight += sys.windowTop;
+		}
+		const query = uni.createSelectorQuery().in(this);
+		query
+			.select('#_drag_button')
+			.boundingClientRect(data => {
+				this.width = data.width;
+				this.height = data.height;
+				this.offsetWidth = data.width / 2;
+				this.offsetHeight = data.height / 2;
+				this.left = this.windowWidth - this.width - this.wrap;
+				this.top = ((this.windowHeight - this.height - this.edge) * 3) / 4;
+			})
+			.exec();
+	},
+	methods: {
+		click() {
+			this.$emit('btnClick');
+		},
+		reload(){
+			this.$emit('reload');
+		},
+		touchstart(e) {
+			this.$emit('btnTouchstart');
+		},
+		touchmove(e) {
+			// 单指触摸
+			if (e.touches.length !== 1) {
+				return false;
+			}
+
+			this.isMove = true;
+			this.left = e.touches[0].clientX - this.offsetWidth ;
+
+			let clientY = e.touches[0].clientY - this.offsetHeight -(this.height);
+			// #ifdef H5
+			clientY += this.height;
+			// #endif
+			let edgeBottom = this.windowHeight - this.height - this.edge;
+			// 上下触及边界
+			if (clientY < this.edge) {
+				this.top = this.edge;
+			} else if (clientY > edgeBottom) {
+				this.top = edgeBottom;
+			} else {
+				this.top = clientY;
+			}
+		},
+		touchend(e) {
+			if (this.isDock) {
+				let edgeRigth = this.windowWidth - this.width - this.wrap;
+
+				if (this.left < this.windowWidth / 2 - this.offsetWidth) {
+					this.left = this.wrap;
+				} else {
+					this.left = edgeRigth;
+				}
+			}
+
+			this.isMove = false;
+
+			this.$emit('btnTouchend');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.drag {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	// background-color: rgba(0, 0, 0, 0.5);
+	background-color: #FFFFFF;
+	box-shadow: 0 0 6upx rgba(0, 0, 0, 0.4);
+	color: $uni-text-color-inverse;
+	width: 80upx;
+	height: 80upx;
+	border-radius: 50%;
+	font-size: $uni-font-size-sm;
+	position: fixed;
+	z-index: 99;
+
+	&.transition {
+		transition: left 0.3s ease, top 0.3s ease;
+	}
+}
+</style>
diff --git a/components/dyw-html2image/canvas2image.js b/components/dyw-html2image/canvas2image.js
new file mode 100644
index 0000000..0182910
--- /dev/null
+++ b/components/dyw-html2image/canvas2image.js
@@ -0,0 +1,277 @@
+/**
+ * covert canvas to image
+ * and save the image file
+ */
+
+var Canvas2Image = function () {
+
+	// check if support sth.
+	var $support = function () {
+		var canvas = document.createElement('canvas'),
+			ctx = canvas.getContext('2d');
+
+		return {
+			canvas: !!ctx,
+			imageData: !!ctx.getImageData,
+			dataURL: !!canvas.toDataURL,
+			btoa: !!window.btoa
+		};
+	}();
+
+	var downloadMime = 'image/octet-stream';
+
+	function scaleCanvas (canvas, width, height) {
+		var w = canvas.width,
+			h = canvas.height;
+		if (width == undefined) {
+			width = w;
+		}
+		if (height == undefined) {
+			height = h;
+		}
+
+		var retCanvas = document.createElement('canvas');
+		var retCtx = retCanvas.getContext('2d');
+		retCanvas.width = width;
+		retCanvas.height = height;
+		retCtx.drawImage(canvas, 0, 0, w, h, 0, 0, width, height);
+		return retCanvas;
+	}
+
+	function getDataURL (canvas, type, width, height) {
+		canvas = scaleCanvas(canvas, width, height);
+		return canvas.toDataURL(type);
+	}
+
+	function saveFile (strData,filename) {
+		var save_link = document.createElement('a');
+		save_link.href = strData;
+		save_link.download = filename;
+		var event = new MouseEvent('click',{"bubbles":false, "cancelable":false});
+		save_link.dispatchEvent(event);
+
+	}
+
+	function genImage(strData) {
+		var img = document.createElement('img');
+		img.src = strData;
+		return img;
+	}
+	function fixType (type) {
+		type = type.toLowerCase().replace(/jpg/i, 'jpeg');
+		var r = type.match(/png|jpeg|bmp|gif/)[0];
+		return 'image/' + r;
+	}
+	function encodeData (data) {
+		if (!window.btoa) { throw 'btoa undefined' }
+		var str = '';
+		if (typeof data == 'string') {
+			str = data;
+		} else {
+			for (var i = 0; i < data.length; i ++) {
+				str += String.fromCharCode(data[i]);
+			}
+		}
+
+		return btoa(str);
+	}
+	function getImageData (canvas) {
+		var w = canvas.width,
+			h = canvas.height;
+		return canvas.getContext('2d').getImageData(0, 0, w, h);
+	}
+	function makeURI (strData, type) {
+		return 'data:' + type + ';base64,' + strData;
+	}
+
+
+	/**
+	 * create bitmap image
+	 * 按照规则生成图片响应头和响应体
+	 */
+	var genBitmapImage = function (oData) {
+
+		//
+		// BITMAPFILEHEADER: http://msdn.microsoft.com/en-us/library/windows/desktop/dd183374(v=vs.85).aspx
+		// BITMAPINFOHEADER: http://msdn.microsoft.com/en-us/library/dd183376.aspx
+		//
+
+		var biWidth  = oData.width;
+		var biHeight	= oData.height;
+		var biSizeImage = biWidth * biHeight * 3;
+		var bfSize  = biSizeImage + 54; // total header size = 54 bytes
+
+		//
+		//  typedef struct tagBITMAPFILEHEADER {
+		//  	WORD bfType;
+		//  	DWORD bfSize;
+		//  	WORD bfReserved1;
+		//  	WORD bfReserved2;
+		//  	DWORD bfOffBits;
+		//  } BITMAPFILEHEADER;
+		//
+		var BITMAPFILEHEADER = [
+			// WORD bfType -- The file type signature; must be "BM"
+			0x42, 0x4D,
+			// DWORD bfSize -- The size, in bytes, of the bitmap file
+			bfSize & 0xff, bfSize >> 8 & 0xff, bfSize >> 16 & 0xff, bfSize >> 24 & 0xff,
+			// WORD bfReserved1 -- Reserved; must be zero
+			0, 0,
+			// WORD bfReserved2 -- Reserved; must be zero
+			0, 0,
+			// DWORD bfOffBits -- The offset, in bytes, from the beginning of the BITMAPFILEHEADER structure to the bitmap bits.
+			54, 0, 0, 0
+		];
+
+		//
+		//  typedef struct tagBITMAPINFOHEADER {
+		//  	DWORD biSize;
+		//  	LONG  biWidth;
+		//  	LONG  biHeight;
+		//  	WORD  biPlanes;
+		//  	WORD  biBitCount;
+		//  	DWORD biCompression;
+		//  	DWORD biSizeImage;
+		//  	LONG  biXPelsPerMeter;
+		//  	LONG  biYPelsPerMeter;
+		//  	DWORD biClrUsed;
+		//  	DWORD biClrImportant;
+		//  } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
+		//
+		var BITMAPINFOHEADER = [
+			// DWORD biSize -- The number of bytes required by the structure
+			40, 0, 0, 0,
+			// LONG biWidth -- The width of the bitmap, in pixels
+			biWidth & 0xff, biWidth >> 8 & 0xff, biWidth >> 16 & 0xff, biWidth >> 24 & 0xff,
+			// LONG biHeight -- The height of the bitmap, in pixels
+			biHeight & 0xff, biHeight >> 8  & 0xff, biHeight >> 16 & 0xff, biHeight >> 24 & 0xff,
+			// WORD biPlanes -- The number of planes for the target device. This value must be set to 1
+			1, 0,
+			// WORD biBitCount -- The number of bits-per-pixel, 24 bits-per-pixel -- the bitmap
+			// has a maximum of 2^24 colors (16777216, Truecolor)
+			24, 0,
+			// DWORD biCompression -- The type of compression, BI_RGB (code 0) -- uncompressed
+			0, 0, 0, 0,
+			// DWORD biSizeImage -- The size, in bytes, of the image. This may be set to zero for BI_RGB bitmaps
+			biSizeImage & 0xff, biSizeImage >> 8 & 0xff, biSizeImage >> 16 & 0xff, biSizeImage >> 24 & 0xff,
+			// LONG biXPelsPerMeter, unused
+			0,0,0,0,
+			// LONG biYPelsPerMeter, unused
+			0,0,0,0,
+			// DWORD biClrUsed, the number of color indexes of palette, unused
+			0,0,0,0,
+			// DWORD biClrImportant, unused
+			0,0,0,0
+		];
+
+		var iPadding = (4 - ((biWidth * 3) % 4)) % 4;
+
+		var aImgData = oData.data;
+
+		var strPixelData = '';
+		var biWidth4 = biWidth<<2;
+		var y = biHeight;
+		var fromCharCode = String.fromCharCode;
+
+		do {
+			var iOffsetY = biWidth4*(y-1);
+			var strPixelRow = '';
+			for (var x = 0; x < biWidth; x++) {
+				var iOffsetX = x<<2;
+				strPixelRow += fromCharCode(aImgData[iOffsetY+iOffsetX+2]) +
+							   fromCharCode(aImgData[iOffsetY+iOffsetX+1]) +
+							   fromCharCode(aImgData[iOffsetY+iOffsetX]);
+			}
+
+			for (var c = 0; c < iPadding; c++) {
+				strPixelRow += String.fromCharCode(0);
+			}
+
+			strPixelData += strPixelRow;
+		} while (--y);
+
+		var strEncoded = encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + encodeData(strPixelData);
+
+		return strEncoded;
+	};
+
+	
+	/**
+	 * [saveAsImage]
+	 * @param  {[obj]} canvas   [canvasElement]
+	 * @param  {[Number]} width    [optional] png width
+	 * @param  {[Number]} height   [optional] png height
+	 * @param  {[String]} type     [image type]
+	 * @param  {[String]} filename [image filename]
+	 * @return {[type]}          [description]
+	 */
+	var saveAsImage = function (canvas, width, height, type,filename) {
+		if ($support.canvas && $support.dataURL) {
+			if (typeof canvas == "string") { canvas = document.getElementById(canvas); }
+			if (type == undefined) { type = 'png'; }
+			filename = filename == undefined||filename.length === 0 ?Date.now()+'.'+type: filename+'.'+type
+			type = fixType(type);
+
+			if (/bmp/.test(type)) {
+				var data = getImageData(scaleCanvas(canvas, width, height));
+				var strData = genBitmapImage(data);
+
+				saveFile(makeURI(strData, downloadMimedownloadMime),filename);
+			} else {
+				var strData = getDataURL(canvas, type, width, height);
+				saveFile(strData.replace(type, downloadMime),filename);
+			}
+		}
+	};
+
+	var convertToImage = function (canvas, width, height, type) {
+		if ($support.canvas && $support.dataURL) {
+			if (typeof canvas == "string") { canvas = document.getElementById(canvas); }
+			if (type == undefined) { type = 'png'; }
+			type = fixType(type);
+
+			if (/bmp/.test(type)) {
+				var data = getImageData(scaleCanvas(canvas, width, height));
+				var strData = genBitmapImage(data);
+				return genImage(makeURI(strData, 'image/bmp'));
+			} else {
+				var strData = getDataURL(canvas, type, width, height);
+				return genImage(strData);
+			}
+		}
+	};
+
+
+	return {
+		saveAsImage: saveAsImage,
+		saveAsPNG: function (canvas, width, height, fileName) {
+			return saveAsImage(canvas, width, height, 'png',fileName);
+		},
+		saveAsJPEG: function (canvas, width, height, fileName) {
+			return saveAsImage(canvas, width, height, 'jpeg',fileName);
+		},
+		saveAsGIF: function (canvas, width, height, fileName) {
+			return saveAsImage(canvas, width, height, 'gif',fileName);
+		},
+		saveAsBMP: function (canvas, width, height, fileName) {
+			return saveAsImage(canvas, width, height, 'bmp',fileName);
+		},
+
+		convertToImage: convertToImage,
+		convertToPNG: function (canvas, width, height) {
+			return convertToImage(canvas, width, height, 'png');
+		},
+		convertToJPEG: function (canvas, width, height) {
+			return convertToImage(canvas, width, height, 'jpeg');
+		},
+		convertToGIF: function (canvas, width, height) {
+			return convertToImage(canvas, width, height, 'gif');
+		},
+		convertToBMP: function (canvas, width, height) {
+			return convertToImage(canvas, width, height, 'bmp');
+		}
+	};
+
+}();
+
+export default Canvas2Image
\ No newline at end of file
diff --git a/components/dyw-html2image/html2canvas.min.js b/components/dyw-html2image/html2canvas.min.js
new file mode 100644
index 0000000..a4a7be8
--- /dev/null
+++ b/components/dyw-html2image/html2canvas.min.js
@@ -0,0 +1,20 @@
+/*!
+ * html2canvas 1.0.0-rc.4 <https://html2canvas.hertzen.com>
+ * Copyright (c) 2019 Niklas von Hertzen <https://hertzen.com>
+ * Released under MIT License
+ */
+!function(A,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(A=A||self).html2canvas=e()}(this,function(){"use strict";
+/*! *****************************************************************************
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    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
+
+    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+    MERCHANTABLITY OR NON-INFRINGEMENT.
+
+    See the Apache Version 2.0 License for specific language governing permissions
+    and limitations under the License.
+    ***************************************************************************** */var r=function(A,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(A,e){A.__proto__=e}||function(A,e){for(var t in e)e.hasOwnProperty(t)&&(A[t]=e[t])})(A,e)};function A(A,e){function t(){this.constructor=A}r(A,e),A.prototype=null===e?Object.create(e):(t.prototype=e.prototype,new t)}var K=function(){return(K=Object.assign||function(A){for(var e,t=1,r=arguments.length;t<r;t++)for(var B in e=arguments[t])Object.prototype.hasOwnProperty.call(e,B)&&(A[B]=e[B]);return A}).apply(this,arguments)};function B(n,s,o,i){return new(o||(o=Promise))(function(A,e){function t(A){try{B(i.next(A))}catch(A){e(A)}}function r(A){try{B(i.throw(A))}catch(A){e(A)}}function B(e){e.done?A(e.value):new o(function(A){A(e.value)}).then(t,r)}B((i=i.apply(n,s||[])).next())})}function b(t,r){var B,n,s,A,o={label:0,sent:function(){if(1&s[0])throw s[1];return s[1]},trys:[],ops:[]};return A={next:e(0),throw:e(1),return:e(2)},"function"==typeof Symbol&&(A[Symbol.iterator]=function(){return this}),A;function e(e){return function(A){return function(e){if(B)throw new TypeError("Generator is already executing.");for(;o;)try{if(B=1,n&&(s=2&e[0]?n.return:e[0]?n.throw||((s=n.return)&&s.call(n),0):n.next)&&!(s=s.call(n,e[1])).done)return s;switch(n=0,s&&(e=[2&e[0],s.value]),e[0]){case 0:case 1:s=e;break;case 4:return o.label++,{value:e[1],done:!1};case 5:o.label++,n=e[1],e=[0];continue;case 7:e=o.ops.pop(),o.trys.pop();continue;default:if(!(s=0<(s=o.trys).length&&s[s.length-1])&&(6===e[0]||2===e[0])){o=0;continue}if(3===e[0]&&(!s||e[1]>s[0]&&e[1]<s[3])){o.label=e[1];break}if(6===e[0]&&o.label<s[1]){o.label=s[1],s=e;break}if(s&&o.label<s[2]){o.label=s[2],o.ops.push(e);break}s[2]&&o.ops.pop(),o.trys.pop();continue}e=r.call(t,o)}catch(A){e=[6,A],n=0}finally{B=s=0}if(5&e[0])throw e[1];return{value:e[0]?e[1]:void 0,done:!0}}([e,A])}}}var I=(n.prototype.add=function(A,e,t,r){return new n(this.left+A,this.top+e,this.width+t,this.height+r)},n.fromClientRect=function(A){return new n(A.left,A.top,A.width,A.height)},n);function n(A,e,t,r){this.left=A,this.top=e,this.width=t,this.height=r}for(var T=function(A){return I.fromClientRect(A.getBoundingClientRect())},c=function(A){for(var e=[],t=0,r=A.length;t<r;){var B=A.charCodeAt(t++);if(55296<=B&&B<=56319&&t<r){var n=A.charCodeAt(t++);56320==(64512&n)?e.push(((1023&B)<<10)+(1023&n)+65536):(e.push(B),t--)}else e.push(B)}return e},l=function(){for(var A=[],e=0;e<arguments.length;e++)A[e]=arguments[e];if(String.fromCodePoint)return String.fromCodePoint.apply(String,A);var t=A.length;if(!t)return"";for(var r=[],B=-1,n="";++B<t;){var s=A[B];s<=65535?r.push(s):(s-=65536,r.push(55296+(s>>10),s%1024+56320)),(B+1===t||16384<r.length)&&(n+=String.fromCharCode.apply(String,r),r.length=0)}return n},e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",Q="undefined"==typeof Uint8Array?[]:new Uint8Array(256),t=0;t<e.length;t++)Q[e.charCodeAt(t)]=t;function s(A,e,t){return A.slice?A.slice(e,t):new Uint16Array(Array.prototype.slice.call(A,e,t))}var o=(i.prototype.get=function(A){var e;if(0<=A){if(A<55296||56319<A&&A<=65535)return e=((e=this.index[A>>5])<<2)+(31&A),this.data[e];if(A<=65535)return e=((e=this.index[2048+(A-55296>>5)])<<2)+(31&A),this.data[e];if(A<this.highStart)return e=2080+(A>>11),e=this.index[e],e+=A>>5&63,e=((e=this.index[e])<<2)+(31&A),this.data[e];if(A<=1114111)return this.data[this.highValueIndex]}return this.errorValue},i);function i(A,e,t,r,B,n){this.initialValue=A,this.errorValue=e,this.highStart=t,this.highValueIndex=r,this.index=B,this.data=n}function C(A,e,t,r){var B=r[t];if(Array.isArray(A)?-1!==A.indexOf(B):A===B)for(var n=t;n<=r.length;){if((i=r[++n])===e)return!0;if(i!==H)break}if(B===H)for(n=t;0<n;){var s=r[--n];if(Array.isArray(A)?-1!==A.indexOf(s):A===s)for(var o=t;o<=r.length;){var i;if((i=r[++o])===e)return!0;if(i!==H)break}if(s!==H)break}return!1}function g(A,e){for(var t=A;0<=t;){var r=e[t];if(r!==H)return r;t--}return 0}function w(A,e,t,r,B){if(0===t[r])return Y;var n=r-1;if(Array.isArray(B)&&!0===B[n])return Y;var s=n-1,o=1+n,i=e[n],a=0<=s?e[s]:0,c=e[o];if(2===i&&3===c)return Y;if(-1!==j.indexOf(i))return"!";if(-1!==j.indexOf(c))return Y;if(-1!==$.indexOf(c))return Y;if(8===g(n,e))return"÷";if(11===q.get(A[n])&&(c===X||c===P||c===x))return Y;if(7===i||7===c)return Y;if(9===i)return Y;if(-1===[H,d,f].indexOf(i)&&9===c)return Y;if(-1!==[p,N,m,v,y].indexOf(c))return Y;if(g(n,e)===O)return Y;if(C(23,O,n,e))return Y;if(C([p,N],L,n,e))return Y;if(C(12,12,n,e))return Y;if(i===H)return"÷";if(23===i||23===c)return Y;if(16===c||16===i)return"÷";if(-1!==[d,f,L].indexOf(c)||14===i)return Y;if(36===a&&-1!==rA.indexOf(i))return Y;if(i===y&&36===c)return Y;if(c===R&&-1!==Z.concat(R,m,D,X,P,x).indexOf(i))return Y;if(-1!==Z.indexOf(c)&&i===D||-1!==Z.indexOf(i)&&c===D)return Y;if(i===M&&-1!==[X,P,x].indexOf(c)||-1!==[X,P,x].indexOf(i)&&c===S)return Y;if(-1!==Z.indexOf(i)&&-1!==AA.indexOf(c)||-1!==AA.indexOf(i)&&-1!==Z.indexOf(c))return Y;if(-1!==[M,S].indexOf(i)&&(c===D||-1!==[O,f].indexOf(c)&&e[1+o]===D)||-1!==[O,f].indexOf(i)&&c===D||i===D&&-1!==[D,y,v].indexOf(c))return Y;if(-1!==[D,y,v,p,N].indexOf(c))for(var Q=n;0<=Q;){if((w=e[Q])===D)return Y;if(-1===[y,v].indexOf(w))break;Q--}if(-1!==[M,S].indexOf(c))for(Q=-1!==[p,N].indexOf(i)?s:n;0<=Q;){var w;if((w=e[Q])===D)return Y;if(-1===[y,v].indexOf(w))break;Q--}if(J===i&&-1!==[J,G,V,z].indexOf(c)||-1!==[G,V].indexOf(i)&&-1!==[G,k].indexOf(c)||-1!==[k,z].indexOf(i)&&c===k)return Y;if(-1!==tA.indexOf(i)&&-1!==[R,S].indexOf(c)||-1!==tA.indexOf(c)&&i===M)return Y;if(-1!==Z.indexOf(i)&&-1!==Z.indexOf(c))return Y;if(i===v&&-1!==Z.indexOf(c))return Y;if(-1!==Z.concat(D).indexOf(i)&&c===O||-1!==Z.concat(D).indexOf(c)&&i===N)return Y;if(41===i&&41===c){for(var u=t[n],U=1;0<u&&41===e[--u];)U++;if(U%2!=0)return Y}return i===P&&c===x?Y:"÷"}function u(t,A){A||(A={lineBreak:"normal",wordBreak:"normal"});var e=function(A,B){void 0===B&&(B="strict");var n=[],s=[],o=[];return A.forEach(function(A,e){var t=q.get(A);if(50<t?(o.push(!0),t-=50):o.push(!1),-1!==["normal","auto","loose"].indexOf(B)&&-1!==[8208,8211,12316,12448].indexOf(A))return s.push(e),n.push(16);if(4!==t&&11!==t)return s.push(e),31===t?n.push("strict"===B?L:X):t===W?n.push(_):29===t?n.push(_):43===t?131072<=A&&A<=196605||196608<=A&&A<=262141?n.push(X):n.push(_):void n.push(t);if(0===e)return s.push(e),n.push(_);var r=n[e-1];return-1===eA.indexOf(r)?(s.push(s[e-1]),n.push(r)):(s.push(e),n.push(_))}),[s,n,o]}(t,A.lineBreak),r=e[0],B=e[1],n=e[2];return"break-all"!==A.wordBreak&&"break-word"!==A.wordBreak||(B=B.map(function(A){return-1!==[D,_,W].indexOf(A)?X:A})),[r,B,"keep-all"===A.wordBreak?n.map(function(A,e){return A&&19968<=t[e]&&t[e]<=40959}):void 0]}var a,U,E,F,h,H=10,d=13,f=15,p=17,N=18,m=19,R=20,L=21,O=22,v=24,D=25,S=26,M=27,y=28,_=30,P=32,x=33,V=34,z=35,X=37,J=38,G=39,k=40,W=42,Y="×",q=(a=function(A){var e,t,r,B,n,s=.75*A.length,o=A.length,i=0;"="===A[A.length-1]&&(s--,"="===A[A.length-2]&&s--);var a="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array&&void 0!==Uint8Array.prototype.slice?new ArrayBuffer(s):new Array(s),c=Array.isArray(a)?a:new Uint8Array(a);for(e=0;e<o;e+=4)t=Q[A.charCodeAt(e)],r=Q[A.charCodeAt(e+1)],B=Q[A.charCodeAt(e+2)],n=Q[A.charCodeAt(e+3)],c[i++]=t<<2|r>>4,c[i++]=(15&r)<<4|B>>2,c[i++]=(3&B)<<6|63&n;return a}("KwAAAAAAAAAACA4AIDoAAPAfAAACAAAAAAAIABAAGABAAEgAUABYAF4AZgBeAGYAYABoAHAAeABeAGYAfACEAIAAiACQAJgAoACoAK0AtQC9AMUAXgBmAF4AZgBeAGYAzQDVAF4AZgDRANkA3gDmAOwA9AD8AAQBDAEUARoBIgGAAIgAJwEvATcBPwFFAU0BTAFUAVwBZAFsAXMBewGDATAAiwGTAZsBogGkAawBtAG8AcIBygHSAdoB4AHoAfAB+AH+AQYCDgIWAv4BHgImAi4CNgI+AkUCTQJTAlsCYwJrAnECeQKBAk0CiQKRApkCoQKoArACuALAAsQCzAIwANQC3ALkAjAA7AL0AvwCAQMJAxADGAMwACADJgMuAzYDPgOAAEYDSgNSA1IDUgNaA1oDYANiA2IDgACAAGoDgAByA3YDfgOAAIQDgACKA5IDmgOAAIAAogOqA4AAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAK8DtwOAAIAAvwPHA88D1wPfAyAD5wPsA/QD/AOAAIAABAQMBBIEgAAWBB4EJgQuBDMEIAM7BEEEXgBJBCADUQRZBGEEaQQwADAAcQQ+AXkEgQSJBJEEgACYBIAAoASoBK8EtwQwAL8ExQSAAIAAgACAAIAAgACgAM0EXgBeAF4AXgBeAF4AXgBeANUEXgDZBOEEXgDpBPEE+QQBBQkFEQUZBSEFKQUxBTUFPQVFBUwFVAVcBV4AYwVeAGsFcwV7BYMFiwWSBV4AmgWgBacFXgBeAF4AXgBeAKsFXgCyBbEFugW7BcIFwgXIBcIFwgXQBdQF3AXkBesF8wX7BQMGCwYTBhsGIwYrBjMGOwZeAD8GRwZNBl4AVAZbBl4AXgBeAF4AXgBeAF4AXgBeAF4AXgBeAGMGXgBqBnEGXgBeAF4AXgBeAF4AXgBeAF4AXgB5BoAG4wSGBo4GkwaAAIADHgR5AF4AXgBeAJsGgABGA4AAowarBrMGswagALsGwwbLBjAA0wbaBtoG3QbaBtoG2gbaBtoG2gblBusG8wb7BgMHCwcTBxsHCwcjBysHMAc1BzUHOgdCB9oGSgdSB1oHYAfaBloHaAfaBlIH2gbaBtoG2gbaBtoG2gbaBjUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHbQdeAF4ANQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQd1B30HNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1B4MH2gaKB68EgACAAIAAgACAAIAAgACAAI8HlwdeAJ8HpweAAIAArwe3B14AXgC/B8UHygcwANAH2AfgB4AA6AfwBz4B+AcACFwBCAgPCBcIogEYAR8IJwiAAC8INwg/CCADRwhPCFcIXwhnCEoDGgSAAIAAgABvCHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIfQh3CHgIeQh6CHsIfAh9CHcIeAh5CHoIewh8CH0Idwh4CHkIegh7CHwIhAiLCI4IMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlggwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAANQc1BzUHNQc1BzUHNQc1BzUHNQc1B54INQc1B6II2gaqCLIIugiAAIAAvgjGCIAAgACAAIAAgACAAIAAgACAAIAAywiHAYAA0wiAANkI3QjlCO0I9Aj8CIAAgACAAAIJCgkSCRoJIgknCTYHLwk3CZYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiWCJYIlgiAAIAAAAFAAXgBeAGAAcABeAHwAQACQAKAArQC9AJ4AXgBeAE0A3gBRAN4A7AD8AMwBGgEAAKcBNwEFAUwBXAF4QkhCmEKnArcCgAHHAsABz4LAAcABwAHAAd+C6ABoAG+C/4LAAcABwAHAAc+DF4MAAcAB54M3gweDV4Nng3eDaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAEeDqABVg6WDqABoQ6gAaABoAHXDvcONw/3DvcO9w73DvcO9w73DvcO9w73DvcO9w73DvcO9w73DvcO9w73DvcO9w73DvcO9w73DvcO9w73DvcO9w73DncPAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcAB7cPPwlGCU4JMACAAIAAgABWCV4JYQmAAGkJcAl4CXwJgAkwADAAMAAwAIgJgACLCZMJgACZCZ8JowmrCYAAswkwAF4AXgB8AIAAuwkABMMJyQmAAM4JgADVCTAAMAAwADAAgACAAIAAgACAAIAAgACAAIAAqwYWBNkIMAAwADAAMADdCeAJ6AnuCR4E9gkwAP4JBQoNCjAAMACAABUK0wiAAB0KJAosCjQKgAAwADwKQwqAAEsKvQmdCVMKWwowADAAgACAALcEMACAAGMKgABrCjAAMAAwADAAMAAwADAAMAAwADAAMAAeBDAAMAAwADAAMAAwADAAMAAwADAAMAAwAIkEPQFzCnoKiQSCCooKkAqJBJgKoAqkCokEGAGsCrQKvArBCjAAMADJCtEKFQHZCuEK/gHpCvEKMAAwADAAMACAAIwE+QowAIAAPwEBCzAAMAAwADAAMACAAAkLEQswAIAAPwEZCyELgAAOCCkLMAAxCzkLMAAwADAAMAAwADAAXgBeAEELMAAwADAAMAAwADAAMAAwAEkLTQtVC4AAXAtkC4AAiQkwADAAMAAwADAAMAAwADAAbAtxC3kLgAuFC4sLMAAwAJMLlwufCzAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAApwswADAAMACAAIAAgACvC4AAgACAAIAAgACAALcLMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAvwuAAMcLgACAAIAAgACAAIAAyguAAIAAgACAAIAA0QswADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAANkLgACAAIAA4AswADAAMAAwADAAMAAwADAAMAAwADAAMAAwAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACJCR4E6AswADAAhwHwC4AA+AsADAgMEAwwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMACAAIAAGAwdDCUMMAAwAC0MNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQw1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHPQwwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADUHNQc1BzUHNQc1BzUHNQc2BzAAMAA5DDUHNQc1BzUHNQc1BzUHNQc1BzUHNQdFDDAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAgACAAIAATQxSDFoMMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAF4AXgBeAF4AXgBeAF4AYgxeAGoMXgBxDHkMfwxeAIUMXgBeAI0MMAAwADAAMAAwAF4AXgCVDJ0MMAAwADAAMABeAF4ApQxeAKsMswy7DF4Awgy9DMoMXgBeAF4AXgBeAF4AXgBeAF4AXgDRDNkMeQBqCeAM3Ax8AOYM7Az0DPgMXgBeAF4AXgBeAF4AXgBeAF4AXgBeAF4AXgBeAF4AXgCgAAANoAAHDQ4NFg0wADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAeDSYNMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAIAAgACAAIAAgACAAC4NMABeAF4ANg0wADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAD4NRg1ODVYNXg1mDTAAbQ0wADAAMAAwADAAMAAwADAA2gbaBtoG2gbaBtoG2gbaBnUNeg3CBYANwgWFDdoGjA3aBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gaUDZwNpA2oDdoG2gawDbcNvw3HDdoG2gbPDdYN3A3fDeYN2gbsDfMN2gbaBvoN/g3aBgYODg7aBl4AXgBeABYOXgBeACUG2gYeDl4AJA5eACwO2w3aBtoGMQ45DtoG2gbaBtoGQQ7aBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gZJDjUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1B1EO2gY1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQdZDjUHNQc1BzUHNQc1B2EONQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHaA41BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1B3AO2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gY1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1BzUHNQc1B2EO2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gZJDtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBtoG2gbaBkkOeA6gAKAAoAAwADAAMAAwAKAAoACgAKAAoACgAKAAgA4wADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAD//wQABAAEAAQABAAEAAQABAAEAA0AAwABAAEAAgAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAKABMAFwAeABsAGgAeABcAFgASAB4AGwAYAA8AGAAcAEsASwBLAEsASwBLAEsASwBLAEsAGAAYAB4AHgAeABMAHgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAFgAbABIAHgAeAB4AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQABYADQARAB4ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsABAAEAAQABAAEAAUABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAkAFgAaABsAGwAbAB4AHQAdAB4ATwAXAB4ADQAeAB4AGgAbAE8ATwAOAFAAHQAdAB0ATwBPABcATwBPAE8AFgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAB4AHgAeAB4AUABQAFAAUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAB4AHgAeAFAATwBAAE8ATwBPAEAATwBQAFAATwBQAB4AHgAeAB4AHgAeAB0AHQAdAB0AHgAdAB4ADgBQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgBQAB4AUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAJAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAkACQAJAAkACQAJAAkABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAeAB4AHgAeAFAAHgAeAB4AKwArAFAAUABQAFAAGABQACsAKwArACsAHgAeAFAAHgBQAFAAUAArAFAAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQABAAEAAQABAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAUAAeAB4AHgAeAB4AHgArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwAYAA0AKwArAB4AHgAbACsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQADQAEAB4ABAAEAB4ABAAEABMABAArACsAKwArACsAKwArACsAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAKwArACsAKwArAFYAVgBWAB4AHgArACsAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AGgAaABoAGAAYAB4AHgAEAAQABAAEAAQABAAEAAQABAAEAAQAEwAEACsAEwATAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABABLAEsASwBLAEsASwBLAEsASwBLABoAGQAZAB4AUABQAAQAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQABMAUAAEAAQABAAEAAQABAAEAB4AHgAEAAQABAAEAAQABABQAFAABAAEAB4ABAAEAAQABABQAFAASwBLAEsASwBLAEsASwBLAEsASwBQAFAAUAAeAB4AUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwAeAFAABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQAUABQAB4AHgAYABMAUAArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAFAABAAEAAQABAAEAFAABAAEAAQAUAAEAAQABAAEAAQAKwArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAArACsAHgArAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAeAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABABQAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAFAABAAEAAQABAAEAAQABABQAFAAUABQAFAAUABQAFAAUABQAAQABAANAA0ASwBLAEsASwBLAEsASwBLAEsASwAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQAKwBQAFAAUABQAFAAUABQAFAAKwArAFAAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUAArAFAAKwArACsAUABQAFAAUAArACsABABQAAQABAAEAAQABAAEAAQAKwArAAQABAArACsABAAEAAQAUAArACsAKwArACsAKwArACsABAArACsAKwArAFAAUAArAFAAUABQAAQABAArACsASwBLAEsASwBLAEsASwBLAEsASwBQAFAAGgAaAFAAUABQAFAAUABMAB4AGwBQAB4AKwArACsABAAEAAQAKwBQAFAAUABQAFAAUAArACsAKwArAFAAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUAArAFAAUAArAFAAUAArAFAAUAArACsABAArAAQABAAEAAQABAArACsAKwArAAQABAArACsABAAEAAQAKwArACsABAArACsAKwArACsAKwArAFAAUABQAFAAKwBQACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwAEAAQAUABQAFAABAArACsAKwArACsAKwArACsAKwArACsABAAEAAQAKwBQAFAAUABQAFAAUABQAFAAUAArAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUAArAFAAUAArAFAAUABQAFAAUAArACsABABQAAQABAAEAAQABAAEAAQABAArAAQABAAEACsABAAEAAQAKwArAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAAQABAArACsASwBLAEsASwBLAEsASwBLAEsASwAeABsAKwArACsAKwArACsAKwBQAAQABAAEAAQABAAEACsABAAEAAQAKwBQAFAAUABQAFAAUABQAFAAKwArAFAAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQAKwArAAQABAArACsABAAEAAQAKwArACsAKwArACsAKwArAAQABAArACsAKwArAFAAUAArAFAAUABQAAQABAArACsASwBLAEsASwBLAEsASwBLAEsASwAeAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwAEAFAAKwBQAFAAUABQAFAAUAArACsAKwBQAFAAUAArAFAAUABQAFAAKwArACsAUABQACsAUAArAFAAUAArACsAKwBQAFAAKwArACsAUABQAFAAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwAEAAQABAAEAAQAKwArACsABAAEAAQAKwAEAAQABAAEACsAKwBQACsAKwArACsAKwArAAQAKwArACsAKwArACsAKwArACsAKwBLAEsASwBLAEsASwBLAEsASwBLAFAAUABQAB4AHgAeAB4AHgAeABsAHgArACsAKwArACsABAAEAAQABAArAFAAUABQAFAAUABQAFAAUAArAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArAFAABAAEAAQABAAEAAQABAArAAQABAAEACsABAAEAAQABAArACsAKwArACsAKwArAAQABAArAFAAUABQACsAKwArACsAKwBQAFAABAAEACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAB4AUAAEAAQABAArAFAAUABQAFAAUABQAFAAUAArAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQACsAKwAEAFAABAAEAAQABAAEAAQABAArAAQABAAEACsABAAEAAQABAArACsAKwArACsAKwArAAQABAArACsAKwArACsAKwArAFAAKwBQAFAABAAEACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAFAABAAEAAQABAAEAAQABAArAAQABAAEACsABAAEAAQABABQAB4AKwArACsAKwBQAFAAUAAEAFAAUABQAFAAUABQAFAAUABQAFAABAAEACsAKwBLAEsASwBLAEsASwBLAEsASwBLAFAAUABQAFAAUABQAFAAUABQABoAUABQAFAAUABQAFAAKwArAAQABAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQACsAUAArACsAUABQAFAAUABQAFAAUAArACsAKwAEACsAKwArACsABAAEAAQABAAEAAQAKwAEACsABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArAAQABAAeACsAKwArACsAKwArACsAKwArACsAKwArAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAAqAFwAXAAqACoAKgAqACoAKgAqACsAKwArACsAGwBcAFwAXABcAFwAXABcACoAKgAqACoAKgAqACoAKgAeAEsASwBLAEsASwBLAEsASwBLAEsADQANACsAKwArACsAKwBcAFwAKwBcACsAKwBcAFwAKwBcACsAKwBcACsAKwArACsAKwArAFwAXABcAFwAKwBcAFwAXABcAFwAXABcACsAXABcAFwAKwBcACsAXAArACsAXABcACsAXABcAFwAXAAqAFwAXAAqACoAKgAqACoAKgArACoAKgBcACsAKwBcAFwAXABcAFwAKwBcACsAKgAqACoAKgAqACoAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArAFwAXABcAFwAUAAOAA4ADgAOAB4ADgAOAAkADgAOAA0ACQATABMAEwATABMACQAeABMAHgAeAB4ABAAEAB4AHgAeAB4AHgAeAEsASwBLAEsASwBLAEsASwBLAEsAUABQAFAAUABQAFAAUABQAFAAUAANAAQAHgAEAB4ABAAWABEAFgARAAQABABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAANAAQABAAEAAQABAANAAQABABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEACsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsADQANAB4AHgAeAB4AHgAeAAQAHgAeAB4AHgAeAB4AKwAeAB4ADgAOAA0ADgAeAB4AHgAeAB4ACQAJACsAKwArACsAKwBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqAFwASwBLAEsASwBLAEsASwBLAEsASwANAA0AHgAeAB4AHgBcAFwAXABcAFwAXAAqACoAKgAqAFwAXABcAFwAKgAqACoAXAAqACoAKgBcAFwAKgAqACoAKgAqACoAKgBcAFwAXAAqACoAKgAqAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKgAqACoAKgAqACoAKgAqACoAKgAqACoAXAAqAEsASwBLAEsASwBLAEsASwBLAEsAKgAqACoAKgAqACoAUABQAFAAUABQAFAAKwBQACsAKwArACsAKwBQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAFAAUABQAFAAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQACsAKwBQAFAAUABQAFAAUABQACsAUAArAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUAArACsAUABQAFAAUABQAFAAUAArAFAAKwBQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwAEAAQABAAeAA0AHgAeAB4AHgAeAB4AHgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAB4AHgAeAB4AHgAeAB4AHgAeACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAFAAUABQAFAAUABQACsAKwANAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAB4AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAA0AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQABYAEQArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAADQANAA0AUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAABAAEAAQAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAA0ADQArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQACsABAAEACsAKwArACsAKwArACsAKwArACsAKwArAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoADQANABUAXAANAB4ADQAbAFwAKgArACsASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArAB4AHgATABMADQANAA4AHgATABMAHgAEAAQABAAJACsASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAUABQAFAAUABQAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABABQACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsABAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArACsAKwAeACsAKwArABMAEwBLAEsASwBLAEsASwBLAEsASwBLAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcACsAKwBcAFwAXABcAFwAKwArACsAKwArACsAKwArACsAKwArAFwAXABcAFwAXABcAFwAXABcAFwAXABcACsAKwArACsAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwBcACsAKwArACoAKgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEACsAKwAeAB4AXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKgAqACoAKgAqACoAKgAqACoAKgArACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgArACsABABLAEsASwBLAEsASwBLAEsASwBLACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAKgAqACoAKgAqACoAKgBcACoAKgAqACoAKgAqACsAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArAAQABAAEAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQAUABQAFAAUABQAFAAUAArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsADQANAB4ADQANAA0ADQAeAB4AHgAeAB4AHgAeAB4AHgAeAAQABAAEAAQABAAEAAQABAAEAB4AHgAeAB4AHgAeAB4AHgAeACsAKwArAAQABAAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAUABQAEsASwBLAEsASwBLAEsASwBLAEsAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsAKwArACsAKwArACsAHgAeAB4AHgBQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsAKwANAA0ADQANAA0ASwBLAEsASwBLAEsASwBLAEsASwArACsAKwBQAFAAUABLAEsASwBLAEsASwBLAEsASwBLAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAANAA0AUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsABAAEAAQAHgAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAFAAUABQAFAABABQAFAAUABQAAQABAAEAFAAUAAEAAQABAArACsAKwArACsAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwAEAAQABAAEAAQAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAUABQAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUAArAFAAKwBQACsAUAArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAHgAeAB4AHgAeAB4AHgAeAFAAHgAeAB4AUABQAFAAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAFAAUABQAFAAKwArAB4AHgAeAB4AHgAeACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAUABQAFAAKwAeAB4AHgAeAB4AHgAeAA4AHgArAA0ADQANAA0ADQANAA0ACQANAA0ADQAIAAQACwAEAAQADQAJAA0ADQAMAB0AHQAeABcAFwAWABcAFwAXABYAFwAdAB0AHgAeABQAFAAUAA0AAQABAAQABAAEAAQABAAJABoAGgAaABoAGgAaABoAGgAeABcAFwAdABUAFQAeAB4AHgAeAB4AHgAYABYAEQAVABUAFQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgANAB4ADQANAA0ADQAeAA0ADQANAAcAHgAeAB4AHgArAAQABAAEAAQABAAEAAQABAAEAAQAUABQACsAKwBPAFAAUABQAFAAUAAeAB4AHgAWABEATwBQAE8ATwBPAE8AUABQAFAAUABQAB4AHgAeABYAEQArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAGwAbABsAGwAbABsAGwAaABsAGwAbABsAGwAbABsAGwAbABsAGwAbABsAGwAaABsAGwAbABsAGgAbABsAGgAbABsAGwAbABsAGwAbABsAGwAbABsAGwAbABsAGwAbABsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAB4AHgBQABoAHgAdAB4AUAAeABoAHgAeAB4AHgAeAB4AHgAeAB4ATwAeAFAAGwAeAB4AUABQAFAAUABQAB4AHgAeAB0AHQAeAFAAHgBQAB4AUAAeAFAATwBQAFAAHgAeAB4AHgAeAB4AHgBQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAB4AUABQAFAAUABPAE8AUABQAFAAUABQAE8AUABQAE8AUABPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBQAFAAUABQAE8ATwBPAE8ATwBPAE8ATwBPAE8AUABQAFAAUABQAFAAUABQAFAAHgAeAFAAUABQAFAATwAeAB4AKwArACsAKwAdAB0AHQAdAB0AHQAdAB0AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB4AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAeAB0AHQAeAB4AHgAdAB0AHgAeAB0AHgAeAB4AHQAeAB0AGwAbAB4AHQAeAB4AHgAeAB0AHgAeAB0AHQAdAB0AHgAeAB0AHgAdAB4AHQAdAB0AHQAdAB0AHgAdAB4AHgAeAB4AHgAdAB0AHQAdAB4AHgAeAB4AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAeAB4AHgAdAB4AHgAeAB4AHgAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAdAB4AHgAdAB0AHQAdAB4AHgAdAB0AHgAeAB0AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB0AHgAeAB0AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHgAeAB4AHQAeAB4AHgAeAB4AHgAeAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeABQAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAWABEAFgARAB4AHgAeAB4AHgAeAB0AHgAeAB4AHgAeAB4AHgAlACUAHgAeAB4AHgAeAB4AHgAeAB4AFgARAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBQAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB4AHgAeAB4AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHgAeAB0AHQAdAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB0AHgAdAB0AHQAdAB0AHQAdAB4AHgAeAB4AHgAeAB4AHgAdAB0AHgAeAB0AHQAeAB4AHgAeAB0AHQAeAB4AHgAeAB0AHQAdAB4AHgAdAB4AHgAdAB0AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAdAB0AHQAeAB4AHgAeAB4AHgAeAB4AHgAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAeAB0AHQAeAB4AHQAeAB4AHgAeAB0AHQAeAB4AHgAeACUAJQAdAB0AJQAeACUAJQAlACAAJQAlAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAHgAeAB4AHgAdAB4AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAdAB4AHQAdAB0AHgAdACUAHQAdAB4AHQAdAB4AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAlAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAlACUAJQAlACUAJQAlACUAHQAdAB0AHQAlAB4AJQAlACUAHQAlACUAHQAdAB0AJQAlAB0AHQAlAB0AHQAlACUAJQAeAB0AHgAeAB4AHgAdAB0AJQAdAB0AHQAdAB0AHQAlACUAJQAlACUAHQAlACUAIAAlAB0AHQAlACUAJQAlACUAJQAlACUAHgAeAB4AJQAlACAAIAAgACAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB4AHgAeABcAFwAXABcAFwAXAB4AEwATACUAHgAeAB4AFgARABYAEQAWABEAFgARABYAEQAWABEAFgARAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAWABEAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AFgARABYAEQAWABEAFgARABYAEQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeABYAEQAWABEAFgARABYAEQAWABEAFgARABYAEQAWABEAFgARABYAEQAWABEAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AFgARABYAEQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeABYAEQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAdAB0AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsAKwArACsAKwArAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAEAAQABAAeAB4AKwArACsAKwArABMADQANAA0AUAATAA0AUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAUAANACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAA0ADQANAA0ADQANAA0ADQAeAA0AFgANAB4AHgAXABcAHgAeABcAFwAWABEAFgARABYAEQAWABEADQANAA0ADQATAFAADQANAB4ADQANAB4AHgAeAB4AHgAMAAwADQANAA0AHgANAA0AFgANAA0ADQANAA0ADQANACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAKwArACsAKwArACsAKwArACsAKwArACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAlACUAJQAlACUAJQAlACUAJQAlACUAJQArACsAKwArAA0AEQARACUAJQBHAFcAVwAWABEAFgARABYAEQAWABEAFgARACUAJQAWABEAFgARABYAEQAWABEAFQAWABEAEQAlAFcAVwBXAFcAVwBXAFcAVwBXAAQABAAEAAQABAAEACUAVwBXAFcAVwA2ACUAJQBXAFcAVwBHAEcAJQAlACUAKwBRAFcAUQBXAFEAVwBRAFcAUQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFEAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBRAFcAUQBXAFEAVwBXAFcAVwBXAFcAUQBXAFcAVwBXAFcAVwBRAFEAKwArAAQABAAVABUARwBHAFcAFQBRAFcAUQBXAFEAVwBRAFcAUQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFEAVwBRAFcAUQBXAFcAVwBXAFcAVwBRAFcAVwBXAFcAVwBXAFEAUQBXAFcAVwBXABUAUQBHAEcAVwArACsAKwArACsAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAKwArAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwArACUAJQBXAFcAVwBXACUAJQAlACUAJQAlACUAJQAlACUAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAKwArACsAKwArACUAJQAlACUAKwArACsAKwArACsAKwArACsAKwArACsAUQBRAFEAUQBRAFEAUQBRAFEAUQBRAFEAUQBRAFEAUQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACsAVwBXAFcAVwBXAFcAVwBXAFcAVwAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAE8ATwBPAE8ATwBPAE8ATwAlAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQAlACUAJQAlACUAJQAlACUAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAEcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAKwArACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAADQATAA0AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABLAEsASwBLAEsASwBLAEsASwBLAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAABAAEAAQABAAeAAQABAAEAAQABAAEAAQABAAEAAQAHgBQAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AUABQAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAeAA0ADQANAA0ADQArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAAUABQAFAAUABQAFAAUABQAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAB4AHgAeAB4AHgAeAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAAQAUABQAFAABABQAFAAUABQAAQAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAeAB4AHgAeACsAKwArACsAUABQAFAAUABQAFAAHgAeABoAHgArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAADgAOABMAEwArACsAKwArACsAKwArACsABAAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwANAA0ASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABABQAFAAUABQAFAAUAAeAB4AHgBQAA4AUAArACsAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAA0ADQBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArACsAKwArACsAKwArACsAKwArAB4AWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYACsAKwArAAQAHgAeAB4AHgAeAB4ADQANAA0AHgAeAB4AHgArAFAASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArAB4AHgBcAFwAXABcAFwAKgBcAFwAXABcAFwAXABcAFwAXABcAEsASwBLAEsASwBLAEsASwBLAEsAXABcAFwAXABcACsAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwArAFAAUABQAAQAUABQAFAAUABQAFAAUABQAAQABAArACsASwBLAEsASwBLAEsASwBLAEsASwArACsAHgANAA0ADQBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKgAqACoAXAAqACoAKgBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAAqAFwAKgAqACoAXABcACoAKgBcAFwAXABcAFwAKgAqAFwAKgBcACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFwAXABcACoAKgBQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAA0ADQBQAFAAUAAEAAQAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUAArACsAUABQAFAAUABQAFAAKwArAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQADQAEAAQAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAVABVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBUAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVACsAKwArACsAKwArACsAKwArACsAKwArAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAKwArACsAKwBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAKwArACsAKwAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAKwArACsAKwArAFYABABWAFYAVgBWAFYAVgBWAFYAVgBWAB4AVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgArAFYAVgBWAFYAVgArAFYAKwBWAFYAKwBWAFYAKwBWAFYAVgBWAFYAVgBWAFYAVgBWAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAEQAWAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUAAaAB4AKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAGAARABEAGAAYABMAEwAWABEAFAArACsAKwArACsAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACUAJQAlACUAJQAWABEAFgARABYAEQAWABEAFgARABYAEQAlACUAFgARACUAJQAlACUAJQAlACUAEQAlABEAKwAVABUAEwATACUAFgARABYAEQAWABEAJQAlACUAJQAlACUAJQAlACsAJQAbABoAJQArACsAKwArAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAAcAKwATACUAJQAbABoAJQAlABYAEQAlACUAEQAlABEAJQBXAFcAVwBXAFcAVwBXAFcAVwBXABUAFQAlACUAJQATACUAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXABYAJQARACUAJQAlAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwAWACUAEQAlABYAEQARABYAEQARABUAVwBRAFEAUQBRAFEAUQBRAFEAUQBRAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAEcARwArACsAVwBXAFcAVwBXAFcAKwArAFcAVwBXAFcAVwBXACsAKwBXAFcAVwBXAFcAVwArACsAVwBXAFcAKwArACsAGgAbACUAJQAlABsAGwArAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwAEAAQABAAQAB0AKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsADQANAA0AKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArAB4AHgAeAB4AHgAeAB4AHgAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAFAAHgAeAB4AKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAAQAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsADQBQAFAAUABQACsAKwArACsAUABQAFAAUABQAFAAUABQAA0AUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUAArACsAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQACsAKwArAFAAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAA0AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB4AHgBQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsADQBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArAB4AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwBQAFAAUABQAFAABAAEAAQAKwAEAAQAKwArACsAKwArAAQABAAEAAQAUABQAFAAUAArAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsABAAEAAQAKwArACsAKwAEAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsADQANAA0ADQANAA0ADQANAB4AKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB4AUABQAFAAUABQAFAAUABQAB4AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEACsAKwArACsAUABQAFAAUABQAA0ADQANAA0ADQANABQAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwANAA0ADQANAA0ADQANAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAHgAeAB4AHgArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwBQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAA0ADQAeAB4AHgAeAB4AKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAAeAB4AHgANAA0ADQANACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAKwArACsAKwArAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsASwBLAEsASwBLAEsASwBLAEsASwANAA0ADQANACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAeAA4AUAArACsAKwArACsAKwArACsAKwAEAFAAUABQAFAADQANAB4ADQAeAAQABAAEAB4AKwArAEsASwBLAEsASwBLAEsASwBLAEsAUAAOAFAADQANAA0AKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAANAA0AHgANAA0AHgAEACsAUABQAFAAUABQAFAAUAArAFAAKwBQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAA0AKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsABAAEAAQABAArAFAAUABQAFAAUABQAFAAUAArACsAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAArACsABAAEACsAKwAEAAQABAArACsAUAArACsAKwArACsAKwAEACsAKwArACsAKwBQAFAAUABQAFAABAAEACsAKwAEAAQABAAEAAQABAAEACsAKwArAAQABAAEAAQABAArACsAKwArACsAKwArACsAKwArACsABAAEAAQABAAEAAQABABQAFAAUABQAA0ADQANAA0AHgBLAEsASwBLAEsASwBLAEsASwBLACsADQArAB4AKwArAAQABAAEAAQAUABQAB4AUAArACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEACsAKwAEAAQABAAEAAQABAAEAAQABAAOAA0ADQATABMAHgAeAB4ADQANAA0ADQANAA0ADQANAA0ADQANAA0ADQANAA0AUABQAFAAUAAEAAQAKwArAAQADQANAB4AUAArACsAKwArACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAArACsAKwAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAXABcAA0ADQANACoASwBLAEsASwBLAEsASwBLAEsASwBQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwBQAFAABAAEAAQABAAEAAQABAAEAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAFAABAAEAAQABAAOAB4ADQANAA0ADQAOAB4ABAArACsAKwArACsAKwArACsAUAAEAAQABAAEAAQABAAEAAQABAAEAAQAUABQAFAAUAArACsAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAA0ADQANACsADgAOAA4ADQANACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEACsABAAEAAQABAAEAAQABAAEAFAADQANAA0ADQANACsAKwArACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwAOABMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQACsAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAArACsAKwAEACsABAAEACsABAAEAAQABAAEAAQABABQAAQAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsADQANAA0ADQANACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAASABIAEgAQwBDAEMAUABQAFAAUABDAFAAUABQAEgAQwBIAEMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAASABDAEMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABIAEMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwANAA0AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAAQABAAEAAQABAANACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAA0ADQANAB4AHgAeAB4AHgAeAFAAUABQAFAADQAeACsAKwArACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwArAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsABAAEAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAEcARwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwArACsAKwArACsAKwArACsAKwArACsAKwArAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQACsAKwAeAAQABAANAAQABAAEAAQAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQABAAEAB4AHgAeAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAHgAeAAQABAAEAAQABAAEAAQAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAEAAQABAAEAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAB4AHgAEAAQABAAeACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArAFAAUAArACsAUAArACsAUABQACsAKwBQAFAAUABQACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwBQACsAUABQAFAAUABQAFAAUAArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAKwAeAB4AUABQAFAAUABQACsAUAArACsAKwBQAFAAUABQAFAAUABQACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgAeAB4AKwArAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAB4AHgAeAB4ABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAB4AHgAeAB4AHgAeAB4AHgAEAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAeAB4ADQANAA0ADQAeACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAAQABAAEAAQABAArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsABAAEAAQABAAEAAQABAArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsABAAEAAQABAAEAAQABAArAAQABAArAAQABAAEAAQABAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAEAAQABAAEAAQABAAEACsAKwArACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAKwArACsAFgAWAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUAArAFAAKwArAFAAKwBQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUAArAFAAKwBQACsAKwArACsAKwArAFAAKwArACsAKwBQACsAUAArAFAAKwBQAFAAUAArAFAAUAArAFAAKwArAFAAKwBQACsAUAArAFAAKwBQACsAUABQACsAUAArACsAUABQAFAAUAArAFAAUABQAFAAUABQAFAAKwBQAFAAUABQACsAUABQAFAAUAArAFAAKwBQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwBQAFAAUAArAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAB4AHgArACsAKwArACsAKwArACsAKwArACsAKwArACsATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwAlACUAJQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAeACUAHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHgAeACUAJQAlACUAHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQAlACUAJQAlACUAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAB4AHgAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAHgAeACUAJQAlACUAJQAeACUAJQAlACUAJQAgACAAIAAlACUAIAAlACUAIAAgACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAIQAhACEAIQAhACUAJQAgACAAJQAlACAAIAAgACAAIAAgACAAIAAgACAAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAIAAgACAAIAAlACUAJQAlACAAJQAgACAAIAAgACAAIAAgACAAIAAlACUAJQAgACUAJQAlACUAIAAgACAAJQAgACAAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeACUAHgAlAB4AJQAlACUAJQAlACAAJQAlACUAJQAeACUAHgAeACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAHgAeAB4AHgAeAB4AHgAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAIAAgACUAJQAlACUAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAIAAlACUAJQAlACAAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlACUAIAAgACAAJQAlACUAIAAgACAAIAAgAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AFwAXABcAFQAVABUAHgAeAB4AHgAlACUAJQAgACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAIAAgACAAJQAlACUAJQAlACUAJQAlACUAIAAlACUAJQAlACUAJQAlACUAJQAlACUAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAlACUAJQAlAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAlACUAJQAlAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAlACUAHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlACUAJQAlACUAJQAlACAAIAAgACAAIAAlACAAIAAlACUAJQAlACUAJQAgACUAJQAlACUAJQAlACUAJQAlACAAIAAgACAAIAAgACAAIAAgACAAJQAlACUAIAAgACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACsAKwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAJQAlACUAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAJQAlACUAJQAlAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQArAAQAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsA"),U=Array.isArray(a)?function(A){for(var e=A.length,t=[],r=0;r<e;r+=4)t.push(A[r+3]<<24|A[r+2]<<16|A[r+1]<<8|A[r]);return t}(a):new Uint32Array(a),E=Array.isArray(a)?function(A){for(var e=A.length,t=[],r=0;r<e;r+=2)t.push(A[r+1]<<8|A[r]);return t}(a):new Uint16Array(a),F=s(E,12,U[4]/2),h=2===U[5]?s(E,(24+U[4])/2):function(A,e,t){return A.slice?A.slice(e,t):new Uint32Array(Array.prototype.slice.call(A,e,t))}(U,Math.ceil((24+U[4])/4)),new o(U[0],U[1],U[2],U[3],F,h)),Z=[_,36],j=[1,2,3,5],$=[H,8],AA=[M,S],eA=j.concat($),tA=[J,G,k,V,z],rA=[f,d],BA=(nA.prototype.slice=function(){return l.apply(void 0,this.codePoints.slice(this.start,this.end))},nA);function nA(A,e,t,r){this.codePoints=A,this.required="!"===e,this.start=t,this.end=r}var sA,oA;(oA=sA||(sA={}))[oA.STRING_TOKEN=0]="STRING_TOKEN",oA[oA.BAD_STRING_TOKEN=1]="BAD_STRING_TOKEN",oA[oA.LEFT_PARENTHESIS_TOKEN=2]="LEFT_PARENTHESIS_TOKEN",oA[oA.RIGHT_PARENTHESIS_TOKEN=3]="RIGHT_PARENTHESIS_TOKEN",oA[oA.COMMA_TOKEN=4]="COMMA_TOKEN",oA[oA.HASH_TOKEN=5]="HASH_TOKEN",oA[oA.DELIM_TOKEN=6]="DELIM_TOKEN",oA[oA.AT_KEYWORD_TOKEN=7]="AT_KEYWORD_TOKEN",oA[oA.PREFIX_MATCH_TOKEN=8]="PREFIX_MATCH_TOKEN",oA[oA.DASH_MATCH_TOKEN=9]="DASH_MATCH_TOKEN",oA[oA.INCLUDE_MATCH_TOKEN=10]="INCLUDE_MATCH_TOKEN",oA[oA.LEFT_CURLY_BRACKET_TOKEN=11]="LEFT_CURLY_BRACKET_TOKEN",oA[oA.RIGHT_CURLY_BRACKET_TOKEN=12]="RIGHT_CURLY_BRACKET_TOKEN",oA[oA.SUFFIX_MATCH_TOKEN=13]="SUFFIX_MATCH_TOKEN",oA[oA.SUBSTRING_MATCH_TOKEN=14]="SUBSTRING_MATCH_TOKEN",oA[oA.DIMENSION_TOKEN=15]="DIMENSION_TOKEN",oA[oA.PERCENTAGE_TOKEN=16]="PERCENTAGE_TOKEN",oA[oA.NUMBER_TOKEN=17]="NUMBER_TOKEN",oA[oA.FUNCTION=18]="FUNCTION",oA[oA.FUNCTION_TOKEN=19]="FUNCTION_TOKEN",oA[oA.IDENT_TOKEN=20]="IDENT_TOKEN",oA[oA.COLUMN_TOKEN=21]="COLUMN_TOKEN",oA[oA.URL_TOKEN=22]="URL_TOKEN",oA[oA.BAD_URL_TOKEN=23]="BAD_URL_TOKEN",oA[oA.CDC_TOKEN=24]="CDC_TOKEN",oA[oA.CDO_TOKEN=25]="CDO_TOKEN",oA[oA.COLON_TOKEN=26]="COLON_TOKEN",oA[oA.SEMICOLON_TOKEN=27]="SEMICOLON_TOKEN",oA[oA.LEFT_SQUARE_BRACKET_TOKEN=28]="LEFT_SQUARE_BRACKET_TOKEN",oA[oA.RIGHT_SQUARE_BRACKET_TOKEN=29]="RIGHT_SQUARE_BRACKET_TOKEN",oA[oA.UNICODE_RANGE_TOKEN=30]="UNICODE_RANGE_TOKEN",oA[oA.WHITESPACE_TOKEN=31]="WHITESPACE_TOKEN",oA[oA.EOF_TOKEN=32]="EOF_TOKEN";function iA(A){return 48<=A&&A<=57}function aA(A){return iA(A)||65<=A&&A<=70||97<=A&&A<=102}function cA(A){return 10===A||9===A||32===A}function QA(A){return function(A){return function(A){return 97<=A&&A<=122}(A)||function(A){return 65<=A&&A<=90}(A)}(A)||function(A){return 128<=A}(A)||95===A}function wA(A){return QA(A)||iA(A)||45===A}function uA(A,e){return 92===A&&10!==e}function UA(A,e,t){return 45===A?QA(e)||uA(e,t):!!QA(A)||!(92!==A||!uA(A,e))}function lA(A,e,t){return 43===A||45===A?!!iA(e)||46===e&&iA(t):iA(46===A?e:A)}var CA={type:sA.LEFT_PARENTHESIS_TOKEN},gA={type:sA.RIGHT_PARENTHESIS_TOKEN},EA={type:sA.COMMA_TOKEN},FA={type:sA.SUFFIX_MATCH_TOKEN},hA={type:sA.PREFIX_MATCH_TOKEN},HA={type:sA.COLUMN_TOKEN},dA={type:sA.DASH_MATCH_TOKEN},fA={type:sA.INCLUDE_MATCH_TOKEN},pA={type:sA.LEFT_CURLY_BRACKET_TOKEN},NA={type:sA.RIGHT_CURLY_BRACKET_TOKEN},KA={type:sA.SUBSTRING_MATCH_TOKEN},IA={type:sA.BAD_URL_TOKEN},TA={type:sA.BAD_STRING_TOKEN},mA={type:sA.CDO_TOKEN},RA={type:sA.CDC_TOKEN},LA={type:sA.COLON_TOKEN},OA={type:sA.SEMICOLON_TOKEN},vA={type:sA.LEFT_SQUARE_BRACKET_TOKEN},DA={type:sA.RIGHT_SQUARE_BRACKET_TOKEN},SA={type:sA.WHITESPACE_TOKEN},bA={type:sA.EOF_TOKEN},MA=(yA.prototype.write=function(A){this._value=this._value.concat(c(A))},yA.prototype.read=function(){for(var A=[],e=this.consumeToken();e!==bA;)A.push(e),e=this.consumeToken();return A},yA.prototype.consumeToken=function(){var A=this.consumeCodePoint();switch(A){case 34:return this.consumeStringToken(34);case 35:var e=this.peekCodePoint(0),t=this.peekCodePoint(1),r=this.peekCodePoint(2);if(wA(e)||uA(t,r)){var B=UA(e,t,r)?2:1,n=this.consumeName();return{type:sA.HASH_TOKEN,value:n,flags:B}}break;case 36:if(61===this.peekCodePoint(0))return this.consumeCodePoint(),FA;break;case 39:return this.consumeStringToken(39);case 40:return CA;case 41:return gA;case 42:if(61===this.peekCodePoint(0))return this.consumeCodePoint(),KA;break;case 43:if(lA(A,this.peekCodePoint(0),this.peekCodePoint(1)))return this.reconsumeCodePoint(A),this.consumeNumericToken();break;case 44:return EA;case 45:var s=A,o=this.peekCodePoint(0),i=this.peekCodePoint(1);if(lA(s,o,i))return this.reconsumeCodePoint(A),this.consumeNumericToken();if(UA(s,o,i))return this.reconsumeCodePoint(A),this.consumeIdentLikeToken();if(45===o&&62===i)return this.consumeCodePoint(),this.consumeCodePoint(),RA;break;case 46:if(lA(A,this.peekCodePoint(0),this.peekCodePoint(1)))return this.reconsumeCodePoint(A),this.consumeNumericToken();break;case 47:if(42===this.peekCodePoint(0))for(this.consumeCodePoint();;){var a=this.consumeCodePoint();if(42===a&&47===(a=this.consumeCodePoint()))return this.consumeToken();if(-1===a)return this.consumeToken()}break;case 58:return LA;case 59:return OA;case 60:if(33===this.peekCodePoint(0)&&45===this.peekCodePoint(1)&&45===this.peekCodePoint(2))return this.consumeCodePoint(),this.consumeCodePoint(),mA;break;case 64:var c=this.peekCodePoint(0),Q=this.peekCodePoint(1),w=this.peekCodePoint(2);if(UA(c,Q,w))return n=this.consumeName(),{type:sA.AT_KEYWORD_TOKEN,value:n};break;case 91:return vA;case 92:if(uA(A,this.peekCodePoint(0)))return this.reconsumeCodePoint(A),this.consumeIdentLikeToken();break;case 93:return DA;case 61:if(61===this.peekCodePoint(0))return this.consumeCodePoint(),hA;break;case 123:return pA;case 125:return NA;case 117:case 85:var u=this.peekCodePoint(0),U=this.peekCodePoint(1);return 43!==u||!aA(U)&&63!==U||(this.consumeCodePoint(),this.consumeUnicodeRangeToken()),this.reconsumeCodePoint(A),this.consumeIdentLikeToken();case 124:if(61===this.peekCodePoint(0))return this.consumeCodePoint(),dA;if(124===this.peekCodePoint(0))return this.consumeCodePoint(),HA;break;case 126:if(61===this.peekCodePoint(0))return this.consumeCodePoint(),fA;break;case-1:return bA}return cA(A)?(this.consumeWhiteSpace(),SA):iA(A)?(this.reconsumeCodePoint(A),this.consumeNumericToken()):QA(A)?(this.reconsumeCodePoint(A),this.consumeIdentLikeToken()):{type:sA.DELIM_TOKEN,value:l(A)}},yA.prototype.consumeCodePoint=function(){var A=this._value.shift();return void 0===A?-1:A},yA.prototype.reconsumeCodePoint=function(A){this._value.unshift(A)},yA.prototype.peekCodePoint=function(A){return A>=this._value.length?-1:this._value[A]},yA.prototype.consumeUnicodeRangeToken=function(){for(var A=[],e=this.consumeCodePoint();aA(e)&&A.length<6;)A.push(e),e=this.consumeCodePoint();for(var t=!1;63===e&&A.length<6;)A.push(e),e=this.consumeCodePoint(),t=!0;if(t){var r=parseInt(l.apply(void 0,A.map(function(A){return 63===A?48:A})),16),B=parseInt(l.apply(void 0,A.map(function(A){return 63===A?70:A})),16);return{type:sA.UNICODE_RANGE_TOKEN,start:r,end:B}}var n=parseInt(l.apply(void 0,A),16);if(45===this.peekCodePoint(0)&&aA(this.peekCodePoint(1))){this.consumeCodePoint(),e=this.consumeCodePoint();for(var s=[];aA(e)&&s.length<6;)s.push(e),e=this.consumeCodePoint();return B=parseInt(l.apply(void 0,s),16),{type:sA.UNICODE_RANGE_TOKEN,start:n,end:B}}return{type:sA.UNICODE_RANGE_TOKEN,start:n,end:n}},yA.prototype.consumeIdentLikeToken=function(){var A=this.consumeName();return"url"===A.toLowerCase()&&40===this.peekCodePoint(0)?(this.consumeCodePoint(),this.consumeUrlToken()):40===this.peekCodePoint(0)?(this.consumeCodePoint(),{type:sA.FUNCTION_TOKEN,value:A}):{type:sA.IDENT_TOKEN,value:A}},yA.prototype.consumeUrlToken=function(){var A=[];if(this.consumeWhiteSpace(),-1===this.peekCodePoint(0))return{type:sA.URL_TOKEN,value:""};var e,t=this.peekCodePoint(0);if(39===t||34===t){var r=this.consumeStringToken(this.consumeCodePoint());return r.type===sA.STRING_TOKEN&&(this.consumeWhiteSpace(),-1===this.peekCodePoint(0)||41===this.peekCodePoint(0))?(this.consumeCodePoint(),{type:sA.URL_TOKEN,value:r.value}):(this.consumeBadUrlRemnants(),IA)}for(;;){var B=this.consumeCodePoint();if(-1===B||41===B)return{type:sA.URL_TOKEN,value:l.apply(void 0,A)};if(cA(B))return this.consumeWhiteSpace(),-1===this.peekCodePoint(0)||41===this.peekCodePoint(0)?(this.consumeCodePoint(),{type:sA.URL_TOKEN,value:l.apply(void 0,A)}):(this.consumeBadUrlRemnants(),IA);if(34===B||39===B||40===B||0<=(e=B)&&e<=8||11===e||14<=e&&e<=31||127===e)return this.consumeBadUrlRemnants(),IA;if(92===B){if(!uA(B,this.peekCodePoint(0)))return this.consumeBadUrlRemnants(),IA;A.push(this.consumeEscapedCodePoint())}else A.push(B)}},yA.prototype.consumeWhiteSpace=function(){for(;cA(this.peekCodePoint(0));)this.consumeCodePoint()},yA.prototype.consumeBadUrlRemnants=function(){for(;;){var A=this.consumeCodePoint();if(41===A||-1===A)return;uA(A,this.peekCodePoint(0))&&this.consumeEscapedCodePoint()}},yA.prototype.consumeStringSlice=function(A){for(var e="";0<A;){var t=Math.min(6e4,A);e+=l.apply(void 0,this._value.splice(0,t)),A-=t}return this._value.shift(),e},yA.prototype.consumeStringToken=function(A){for(var e="",t=0;;){var r=this._value[t];if(-1===r||void 0===r||r===A)return e+=this.consumeStringSlice(t),{type:sA.STRING_TOKEN,value:e};if(10===r)return this._value.splice(0,t),TA;if(92===r){var B=this._value[t+1];-1!==B&&void 0!==B&&(10===B?(e+=this.consumeStringSlice(t),t=-1,this._value.shift()):uA(r,B)&&(e+=this.consumeStringSlice(t),e+=l(this.consumeEscapedCodePoint()),t=-1))}t++}},yA.prototype.consumeNumber=function(){var A=[],e=4,t=this.peekCodePoint(0);for(43!==t&&45!==t||A.push(this.consumeCodePoint());iA(this.peekCodePoint(0));)A.push(this.consumeCodePoint());t=this.peekCodePoint(0);var r=this.peekCodePoint(1);if(46===t&&iA(r))for(A.push(this.consumeCodePoint(),this.consumeCodePoint()),e=8;iA(this.peekCodePoint(0));)A.push(this.consumeCodePoint());t=this.peekCodePoint(0),r=this.peekCodePoint(1);var B=this.peekCodePoint(2);if((69===t||101===t)&&((43===r||45===r)&&iA(B)||iA(r)))for(A.push(this.consumeCodePoint(),this.consumeCodePoint()),e=8;iA(this.peekCodePoint(0));)A.push(this.consumeCodePoint());return[function(A){var e=0,t=1;43!==A[e]&&45!==A[e]||(45===A[e]&&(t=-1),e++);for(var r=[];iA(A[e]);)r.push(A[e++]);var B=r.length?parseInt(l.apply(void 0,r),10):0;46===A[e]&&e++;for(var n=[];iA(A[e]);)n.push(A[e++]);var s=n.length,o=s?parseInt(l.apply(void 0,n),10):0;69!==A[e]&&101!==A[e]||e++;var i=1;43!==A[e]&&45!==A[e]||(45===A[e]&&(i=-1),e++);for(var a=[];iA(A[e]);)a.push(A[e++]);var c=a.length?parseInt(l.apply(void 0,a),10):0;return t*(B+o*Math.pow(10,-s))*Math.pow(10,i*c)}(A),e]},yA.prototype.consumeNumericToken=function(){var A=this.consumeNumber(),e=A[0],t=A[1],r=this.peekCodePoint(0),B=this.peekCodePoint(1),n=this.peekCodePoint(2);if(UA(r,B,n)){var s=this.consumeName();return{type:sA.DIMENSION_TOKEN,number:e,flags:t,unit:s}}return 37===r?(this.consumeCodePoint(),{type:sA.PERCENTAGE_TOKEN,number:e,flags:t}):{type:sA.NUMBER_TOKEN,number:e,flags:t}},yA.prototype.consumeEscapedCodePoint=function(){var A=this.consumeCodePoint();if(aA(A)){for(var e=l(A);aA(this.peekCodePoint(0))&&e.length<6;)e+=l(this.consumeCodePoint());cA(this.peekCodePoint(0))&&this.consumeCodePoint();var t=parseInt(e,16);return 0===t||function(A){return 55296<=A&&A<=57343}(t)||1114111<t?65533:t}return-1===A?65533:A},yA.prototype.consumeName=function(){for(var A="";;){var e=this.consumeCodePoint();if(wA(e))A+=l(e);else{if(!uA(e,this.peekCodePoint(0)))return this.reconsumeCodePoint(e),A;A+=l(this.consumeEscapedCodePoint())}}},yA);function yA(){this._value=[]}var _A=(PA.create=function(A){var e=new MA;return e.write(A),new PA(e.read())},PA.parseValue=function(A){return PA.create(A).parseComponentValue()},PA.parseValues=function(A){return PA.create(A).parseComponentValues()},PA.prototype.parseComponentValue=function(){for(var A=this.consumeToken();A.type===sA.WHITESPACE_TOKEN;)A=this.consumeToken();if(A.type===sA.EOF_TOKEN)throw new SyntaxError("Error parsing CSS component value, unexpected EOF");this.reconsumeToken(A);for(var e=this.consumeComponentValue();(A=this.consumeToken()).type===sA.WHITESPACE_TOKEN;);if(A.type===sA.EOF_TOKEN)return e;throw new SyntaxError("Error parsing CSS component value, multiple values found when expecting only one")},PA.prototype.parseComponentValues=function(){for(var A=[];;){var e=this.consumeComponentValue();if(e.type===sA.EOF_TOKEN)return A;A.push(e),A.push()}},PA.prototype.consumeComponentValue=function(){var A=this.consumeToken();switch(A.type){case sA.LEFT_CURLY_BRACKET_TOKEN:case sA.LEFT_SQUARE_BRACKET_TOKEN:case sA.LEFT_PARENTHESIS_TOKEN:return this.consumeSimpleBlock(A.type);case sA.FUNCTION_TOKEN:return this.consumeFunction(A)}return A},PA.prototype.consumeSimpleBlock=function(A){for(var e={type:A,values:[]},t=this.consumeToken();;){if(t.type===sA.EOF_TOKEN||ne(t,A))return e;this.reconsumeToken(t),e.values.push(this.consumeComponentValue()),t=this.consumeToken()}},PA.prototype.consumeFunction=function(A){for(var e={name:A.value,values:[],type:sA.FUNCTION};;){var t=this.consumeToken();if(t.type===sA.EOF_TOKEN||t.type===sA.RIGHT_PARENTHESIS_TOKEN)return e;this.reconsumeToken(t),e.values.push(this.consumeComponentValue())}},PA.prototype.consumeToken=function(){var A=this._tokens.shift();return void 0===A?bA:A},PA.prototype.reconsumeToken=function(A){this._tokens.unshift(A)},PA);function PA(A){this._tokens=A}function xA(A){return A.type===sA.DIMENSION_TOKEN}function VA(A){return A.type===sA.NUMBER_TOKEN}function zA(A){return A.type===sA.IDENT_TOKEN}function XA(A){return A.type===sA.STRING_TOKEN}function JA(A,e){return zA(A)&&A.value===e}function GA(A){return A.type!==sA.WHITESPACE_TOKEN}function kA(A){return A.type!==sA.WHITESPACE_TOKEN&&A.type!==sA.COMMA_TOKEN}function WA(A){var e=[],t=[];return A.forEach(function(A){if(A.type===sA.COMMA_TOKEN){if(0===t.length)throw new Error("Error parsing function args, zero tokens for arg");return e.push(t),void(t=[])}A.type!==sA.WHITESPACE_TOKEN&&t.push(A)}),t.length&&e.push(t),e}function YA(A){return A.type===sA.NUMBER_TOKEN||A.type===sA.DIMENSION_TOKEN}function qA(A){return A.type===sA.PERCENTAGE_TOKEN||YA(A)}function ZA(A){return 1<A.length?[A[0],A[1]]:[A[0]]}function jA(A,e,t){var r=A[0],B=A[1];return[ae(r,e),ae(void 0!==B?B:r,t)]}function $A(A){return A.type===sA.DIMENSION_TOKEN&&("deg"===A.unit||"grad"===A.unit||"rad"===A.unit||"turn"===A.unit)}function Ae(A){switch(A.filter(zA).map(function(A){return A.value}).join(" ")){case"to bottom right":case"to right bottom":case"left top":case"top left":return[se,se];case"to top":case"bottom":return Qe(0);case"to bottom left":case"to left bottom":case"right top":case"top right":return[se,ie];case"to right":case"left":return Qe(90);case"to top left":case"to left top":case"right bottom":case"bottom right":return[ie,ie];case"to bottom":case"top":return Qe(180);case"to top right":case"to right top":case"left bottom":case"bottom left":return[ie,se];case"to left":case"right":return Qe(270)}return 0}function ee(A){return 0==(255&A)}function te(A){var e=255&A,t=255&A>>8,r=255&A>>16,B=255&A>>24;return e<255?"rgba("+B+","+r+","+t+","+e/255+")":"rgb("+B+","+r+","+t+")"}function re(A,e){if(A.type===sA.NUMBER_TOKEN)return A.number;if(A.type!==sA.PERCENTAGE_TOKEN)return 0;var t=3===e?1:255;return 3===e?A.number/100*t:Math.round(A.number/100*t)}function Be(A){var e=A.filter(kA);if(3===e.length){var t=e.map(re),r=t[0],B=t[1],n=t[2];return ue(r,B,n,1)}if(4!==e.length)return 0;var s=e.map(re),o=(r=s[0],B=s[1],n=s[2],s[3]);return ue(r,B,n,o)}var ne=function(A,e){return e===sA.LEFT_CURLY_BRACKET_TOKEN&&A.type===sA.RIGHT_CURLY_BRACKET_TOKEN||(e===sA.LEFT_SQUARE_BRACKET_TOKEN&&A.type===sA.RIGHT_SQUARE_BRACKET_TOKEN||e===sA.LEFT_PARENTHESIS_TOKEN&&A.type===sA.RIGHT_PARENTHESIS_TOKEN)},se={type:sA.NUMBER_TOKEN,number:0,flags:4},oe={type:sA.PERCENTAGE_TOKEN,number:50,flags:4},ie={type:sA.PERCENTAGE_TOKEN,number:100,flags:4},ae=function(A,e){if(A.type===sA.PERCENTAGE_TOKEN)return A.number/100*e;if(xA(A))switch(A.unit){case"rem":case"em":return 16*A.number;case"px":default:return A.number}return A.number},ce=function(A){if(A.type===sA.DIMENSION_TOKEN)switch(A.unit){case"deg":return Math.PI*A.number/180;case"grad":return Math.PI/200*A.number;case"rad":return A.number;case"turn":return 2*Math.PI*A.number}throw new Error("Unsupported angle type")},Qe=function(A){return Math.PI*A/180},we=function(A){if(A.type===sA.FUNCTION){var e=he[A.name];if(void 0===e)throw new Error('Attempting to parse an unsupported color function "'+A.name+'"');return e(A.values)}if(A.type===sA.HASH_TOKEN){if(3===A.value.length){var t=A.value.substring(0,1),r=A.value.substring(1,2),B=A.value.substring(2,3);return ue(parseInt(t+t,16),parseInt(r+r,16),parseInt(B+B,16),1)}if(4===A.value.length){t=A.value.substring(0,1),r=A.value.substring(1,2),B=A.value.substring(2,3);var n=A.value.substring(3,4);return ue(parseInt(t+t,16),parseInt(r+r,16),parseInt(B+B,16),parseInt(n+n,16)/255)}if(6===A.value.length){t=A.value.substring(0,2),r=A.value.substring(2,4),B=A.value.substring(4,6);return ue(parseInt(t,16),parseInt(r,16),parseInt(B,16),1)}if(8===A.value.length){t=A.value.substring(0,2),r=A.value.substring(2,4),B=A.value.substring(4,6),n=A.value.substring(6,8);return ue(parseInt(t,16),parseInt(r,16),parseInt(B,16),parseInt(n,16)/255)}}if(A.type===sA.IDENT_TOKEN){var s=He[A.value.toUpperCase()];if(void 0!==s)return s}return He.TRANSPARENT},ue=function(A,e,t,r){return(A<<24|e<<16|t<<8|Math.round(255*r)<<0)>>>0};function Ue(A,e,t){return t<0&&(t+=1),1<=t&&(t-=1),t<1/6?(e-A)*t*6+A:t<.5?e:t<2/3?6*(e-A)*(2/3-t)+A:A}function le(A){var e=A.filter(kA),t=e[0],r=e[1],B=e[2],n=e[3],s=(t.type===sA.NUMBER_TOKEN?Qe(t.number):ce(t))/(2*Math.PI),o=qA(r)?r.number/100:0,i=qA(B)?B.number/100:0,a=void 0!==n&&qA(n)?ae(n,1):1;if(0==o)return ue(255*i,255*i,255*i,1);var c=i<=.5?i*(1+o):i+o-i*o,Q=2*i-c,w=Ue(Q,c,s+1/3),u=Ue(Q,c,s),U=Ue(Q,c,s-1/3);return ue(255*w,255*u,255*U,a)}var Ce,ge,Ee,Fe,he={hsl:le,hsla:le,rgb:Be,rgba:Be},He={ALICEBLUE:4042850303,ANTIQUEWHITE:4209760255,AQUA:16777215,AQUAMARINE:2147472639,AZURE:4043309055,BEIGE:4126530815,BISQUE:4293182719,BLACK:255,BLANCHEDALMOND:4293643775,BLUE:65535,BLUEVIOLET:2318131967,BROWN:2771004159,BURLYWOOD:3736635391,CADETBLUE:1604231423,CHARTREUSE:2147418367,CHOCOLATE:3530104575,CORAL:4286533887,CORNFLOWERBLUE:1687547391,CORNSILK:4294499583,CRIMSON:3692313855,CYAN:16777215,DARKBLUE:35839,DARKCYAN:9145343,DARKGOLDENROD:3095837695,DARKGRAY:2846468607,DARKGREEN:6553855,DARKGREY:2846468607,DARKKHAKI:3182914559,DARKMAGENTA:2332068863,DARKOLIVEGREEN:1433087999,DARKORANGE:4287365375,DARKORCHID:2570243327,DARKRED:2332033279,DARKSALMON:3918953215,DARKSEAGREEN:2411499519,DARKSLATEBLUE:1211993087,DARKSLATEGRAY:793726975,DARKSLATEGREY:793726975,DARKTURQUOISE:13554175,DARKVIOLET:2483082239,DEEPPINK:4279538687,DEEPSKYBLUE:12582911,DIMGRAY:1768516095,DIMGREY:1768516095,DODGERBLUE:512819199,FIREBRICK:2988581631,FLORALWHITE:4294635775,FORESTGREEN:579543807,FUCHSIA:4278255615,GAINSBORO:3705462015,GHOSTWHITE:4177068031,GOLD:4292280575,GOLDENROD:3668254975,GRAY:2155905279,GREEN:8388863,GREENYELLOW:2919182335,GREY:2155905279,HONEYDEW:4043305215,HOTPINK:4285117695,INDIANRED:3445382399,INDIGO:1258324735,IVORY:4294963455,KHAKI:4041641215,LAVENDER:3873897215,LAVENDERBLUSH:4293981695,LAWNGREEN:2096890111,LEMONCHIFFON:4294626815,LIGHTBLUE:2916673279,LIGHTCORAL:4034953471,LIGHTCYAN:3774873599,LIGHTGOLDENRODYELLOW:4210742015,LIGHTGRAY:3553874943,LIGHTGREEN:2431553791,LIGHTGREY:3553874943,LIGHTPINK:4290167295,LIGHTSALMON:4288707327,LIGHTSEAGREEN:548580095,LIGHTSKYBLUE:2278488831,LIGHTSLATEGRAY:2005441023,LIGHTSLATEGREY:2005441023,LIGHTSTEELBLUE:2965692159,LIGHTYELLOW:4294959359,LIME:16711935,LIMEGREEN:852308735,LINEN:4210091775,MAGENTA:4278255615,MAROON:2147483903,MEDIUMAQUAMARINE:1724754687,MEDIUMBLUE:52735,MEDIUMORCHID:3126187007,MEDIUMPURPLE:2473647103,MEDIUMSEAGREEN:1018393087,MEDIUMSLATEBLUE:2070474495,MEDIUMSPRINGGREEN:16423679,MEDIUMTURQUOISE:1221709055,MEDIUMVIOLETRED:3340076543,MIDNIGHTBLUE:421097727,MINTCREAM:4127193855,MISTYROSE:4293190143,MOCCASIN:4293178879,NAVAJOWHITE:4292783615,NAVY:33023,OLDLACE:4260751103,OLIVE:2155872511,OLIVEDRAB:1804477439,ORANGE:4289003775,ORANGERED:4282712319,ORCHID:3664828159,PALEGOLDENROD:4008225535,PALEGREEN:2566625535,PALETURQUOISE:2951671551,PALEVIOLETRED:3681588223,PAPAYAWHIP:4293907967,PEACHPUFF:4292524543,PERU:3448061951,PINK:4290825215,PLUM:3718307327,POWDERBLUE:2967529215,PURPLE:2147516671,REBECCAPURPLE:1714657791,RED:4278190335,ROSYBROWN:3163525119,ROYALBLUE:1097458175,SADDLEBROWN:2336560127,SALMON:4202722047,SANDYBROWN:4104413439,SEAGREEN:780883967,SEASHELL:4294307583,SIENNA:2689740287,SILVER:3233857791,SKYBLUE:2278484991,SLATEBLUE:1784335871,SLATEGRAY:1887473919,SLATEGREY:1887473919,SNOW:4294638335,SPRINGGREEN:16744447,STEELBLUE:1182971135,TAN:3535047935,TEAL:8421631,THISTLE:3636451583,TOMATO:4284696575,TRANSPARENT:0,TURQUOISE:1088475391,VIOLET:4001558271,WHEAT:4125012991,WHITE:4294967295,WHITESMOKE:4126537215,YELLOW:4294902015,YELLOWGREEN:2597139199};(ge=Ce||(Ce={}))[ge.VALUE=0]="VALUE",ge[ge.LIST=1]="LIST",ge[ge.IDENT_VALUE=2]="IDENT_VALUE",ge[ge.TYPE_VALUE=3]="TYPE_VALUE",ge[ge.TOKEN_VALUE=4]="TOKEN_VALUE",(Fe=Ee||(Ee={}))[Fe.BORDER_BOX=0]="BORDER_BOX",Fe[Fe.PADDING_BOX=1]="PADDING_BOX";function de(A){var e=we(A[0]),t=A[1];return t&&qA(t)?{color:e,stop:t}:{color:e,stop:null}}function fe(A,t){var e=A[0],r=A[A.length-1];null===e.stop&&(e.stop=se),null===r.stop&&(r.stop=ie);for(var B=[],n=0,s=0;s<A.length;s++){var o=A[s].stop;if(null!==o){var i=ae(o,t);n<i?B.push(i):B.push(n),n=i}else B.push(null)}var a=null;for(s=0;s<B.length;s++){var c=B[s];if(null===c)null===a&&(a=s);else if(null!==a){for(var Q=s-a,w=(c-B[a-1])/(1+Q),u=1;u<=Q;u++)B[a+u-1]=w*u;a=null}}return A.map(function(A,e){return{color:A.color,stop:Math.max(Math.min(1,B[e]/t),0)}})}function pe(A,e,t){var r="number"==typeof A?A:function(A,e,t){var r=e/2,B=t/2,n=ae(A[0],e)-r,s=B-ae(A[1],t);return(Math.atan2(s,n)+2*Math.PI)%(2*Math.PI)}(A,e,t),B=Math.abs(e*Math.sin(r))+Math.abs(t*Math.cos(r)),n=e/2,s=t/2,o=B/2,i=Math.sin(r-Math.PI/2)*o,a=Math.cos(r-Math.PI/2)*o;return[B,n-a,n+a,s-i,s+i]}function Ne(A,e){return Math.sqrt(A*A+e*e)}function Ke(A,e,n,s,o){return[[0,0],[0,e],[A,0],[A,e]].reduce(function(A,e){var t=e[0],r=e[1],B=Ne(n-t,s-r);return(o?B<A.optimumDistance:B>A.optimumDistance)?{optimumCorner:e,optimumDistance:B}:A},{optimumDistance:o?1/0:-1/0,optimumCorner:null}).optimumCorner}function Ie(A){var B=Qe(180),n=[];return WA(A).forEach(function(A,e){if(0===e){var t=A[0];if(t.type===sA.IDENT_TOKEN&&-1!==["top","left","right","bottom"].indexOf(t.value))return void(B=Ae(A));if($A(t))return void(B=(ce(t)+Qe(270))%Qe(360))}var r=de(A);n.push(r)}),{angle:B,stops:n,type:xe.LINEAR_GRADIENT}}function Te(A){return 0===A[0]&&255===A[1]&&0===A[2]&&255===A[3]}var me={name:"background-clip",initialValue:"border-box",prefix:!(Fe[Fe.CONTENT_BOX=2]="CONTENT_BOX"),type:Ce.LIST,parse:function(A){return A.map(function(A){if(zA(A))switch(A.value){case"padding-box":return Ee.PADDING_BOX;case"content-box":return Ee.CONTENT_BOX}return Ee.BORDER_BOX})}},Re={name:"background-color",initialValue:"transparent",prefix:!1,type:Ce.TYPE_VALUE,format:"color"},Le=function(A,e,t,r,B){var n="http://www.w3.org/2000/svg",s=document.createElementNS(n,"svg"),o=document.createElementNS(n,"foreignObject");return s.setAttributeNS(null,"width",A.toString()),s.setAttributeNS(null,"height",e.toString()),o.setAttributeNS(null,"width","100%"),o.setAttributeNS(null,"height","100%"),o.setAttributeNS(null,"x",t.toString()),o.setAttributeNS(null,"y",r.toString()),o.setAttributeNS(null,"externalResourcesRequired","true"),s.appendChild(o),o.appendChild(B),s},Oe=function(r){return new Promise(function(A,e){var t=new Image;t.onload=function(){return A(t)},t.onerror=e,t.src="data:image/svg+xml;charset=utf-8,"+encodeURIComponent((new XMLSerializer).serializeToString(r))})},ve={get SUPPORT_RANGE_BOUNDS(){var A=function(A){if(A.createRange){var e=A.createRange();if(e.getBoundingClientRect){var t=A.createElement("boundtest");t.style.height="123px",t.style.display="block",A.body.appendChild(t),e.selectNode(t);var r=e.getBoundingClientRect(),B=Math.round(r.height);if(A.body.removeChild(t),123===B)return!0}}return!1}(document);return Object.defineProperty(ve,"SUPPORT_RANGE_BOUNDS",{value:A}),A},get SUPPORT_SVG_DRAWING(){var A=function(A){var e=new Image,t=A.createElement("canvas"),r=t.getContext("2d");if(!r)return!1;e.src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>";try{r.drawImage(e,0,0),t.toDataURL()}catch(A){return!1}return!0}(document);return Object.defineProperty(ve,"SUPPORT_SVG_DRAWING",{value:A}),A},get SUPPORT_FOREIGNOBJECT_DRAWING(){var A="function"==typeof Array.from&&"function"==typeof window.fetch?function(r){var A=r.createElement("canvas"),B=100;A.width=B,A.height=B;var n=A.getContext("2d");if(!n)return Promise.reject(!1);n.fillStyle="rgb(0, 255, 0)",n.fillRect(0,0,B,B);var e=new Image,s=A.toDataURL();e.src=s;var t=Le(B,B,0,0,e);return n.fillStyle="red",n.fillRect(0,0,B,B),Oe(t).then(function(A){n.drawImage(A,0,0);var e=n.getImageData(0,0,B,B).data;n.fillStyle="red",n.fillRect(0,0,B,B);var t=r.createElement("div");return t.style.backgroundImage="url("+s+")",t.style.height="100px",Te(e)?Oe(Le(B,B,0,0,t)):Promise.reject(!1)}).then(function(A){return n.drawImage(A,0,0),Te(n.getImageData(0,0,B,B).data)}).catch(function(){return!1})}(document):Promise.resolve(!1);return Object.defineProperty(ve,"SUPPORT_FOREIGNOBJECT_DRAWING",{value:A}),A},get SUPPORT_CORS_IMAGES(){var A=void 0!==(new Image).crossOrigin;return Object.defineProperty(ve,"SUPPORT_CORS_IMAGES",{value:A}),A},get SUPPORT_RESPONSE_TYPE(){var A="string"==typeof(new XMLHttpRequest).responseType;return Object.defineProperty(ve,"SUPPORT_RESPONSE_TYPE",{value:A}),A},get SUPPORT_CORS_XHR(){var A="withCredentials"in new XMLHttpRequest;return Object.defineProperty(ve,"SUPPORT_CORS_XHR",{value:A}),A}},De=(Se.prototype.debug=function(){for(var A=[],e=0;e<arguments.length;e++)A[e]=arguments[e];"undefined"!=typeof window&&window.console&&"function"==typeof console.debug?console.debug.apply(console,[this.id,this.getTime()+"ms"].concat(A)):this.info.apply(this,A)},Se.prototype.getTime=function(){return Date.now()-this.start},Se.create=function(A){Se.instances[A]=new Se(A)},Se.destroy=function(A){delete Se.instances[A]},Se.getInstance=function(A){var e=Se.instances[A];if(void 0===e)throw new Error("No logger instance found with id "+A);return e},Se.prototype.info=function(){for(var A=[],e=0;e<arguments.length;e++)A[e]=arguments[e];"undefined"!=typeof window&&window.console&&"function"==typeof console.info&&console.info.apply(console,[this.id,this.getTime()+"ms"].concat(A))},Se.prototype.error=function(){for(var A=[],e=0;e<arguments.length;e++)A[e]=arguments[e];"undefined"!=typeof window&&window.console&&"function"==typeof console.error?console.error.apply(console,[this.id,this.getTime()+"ms"].concat(A)):this.info.apply(this,A)},Se.instances={},Se);function Se(A){this.id=A,this.start=Date.now()}var be=(Me.create=function(A,e){return Me._caches[A]=new ye(A,e)},Me.destroy=function(A){delete Me._caches[A]},Me.open=function(A){var e=Me._caches[A];if(void 0!==e)return e;throw new Error('Cache with key "'+A+'" not found')},Me.getOrigin=function(A){var e=Me._link;return e?(e.href=A,e.href=e.href,e.protocol+e.hostname+e.port):"about:blank"},Me.isSameOrigin=function(A){return Me.getOrigin(A)===Me._origin},Me.setContext=function(A){Me._link=A.document.createElement("a"),Me._origin=Me.getOrigin(A.location.href)},Me.getInstance=function(){var A=Me._current;if(null===A)throw new Error("No cache instance attached");return A},Me.attachInstance=function(A){Me._current=A},Me.detachInstance=function(){Me._current=null},Me._caches={},Me._origin="about:blank",Me._current=null,Me);function Me(){}var ye=(_e.prototype.addImage=function(A){var e=Promise.resolve();return this.has(A)||(Ye(A)||Ge(A))&&(this._cache[A]=this.loadImage(A)),e},_e.prototype.match=function(A){return this._cache[A]},_e.prototype.loadImage=function(s){return B(this,void 0,void 0,function(){var e,r,t,B,n=this;return b(this,function(A){switch(A.label){case 0:return e=be.isSameOrigin(s),r=!ke(s)&&!0===this._options.useCORS&&ve.SUPPORT_CORS_IMAGES&&!e,t=!ke(s)&&!e&&"string"==typeof this._options.proxy&&ve.SUPPORT_CORS_XHR&&!r,e||!1!==this._options.allowTaint||ke(s)||t||r?(B=s,t?[4,this.proxy(B)]:[3,2]):[2];case 1:B=A.sent(),A.label=2;case 2:return De.getInstance(this.id).debug("Added image "+s.substring(0,256)),[4,new Promise(function(A,e){var t=new Image;t.onload=function(){return A(t)},t.onerror=e,(We(B)||r)&&(t.crossOrigin="anonymous"),t.src=B,!0===t.complete&&setTimeout(function(){return A(t)},500),0<n._options.imageTimeout&&setTimeout(function(){return e("Timed out ("+n._options.imageTimeout+"ms) loading image")},n._options.imageTimeout)})];case 3:return[2,A.sent()]}})})},_e.prototype.has=function(A){return void 0!==this._cache[A]},_e.prototype.keys=function(){return Promise.resolve(Object.keys(this._cache))},_e.prototype.proxy=function(n){var s=this,o=this._options.proxy;if(!o)throw new Error("No proxy defined");var i=n.substring(0,256);return new Promise(function(e,t){var r=ve.SUPPORT_RESPONSE_TYPE?"blob":"text",B=new XMLHttpRequest;if(B.onload=function(){if(200===B.status)if("text"==r)e(B.response);else{var A=new FileReader;A.addEventListener("load",function(){return e(A.result)},!1),A.addEventListener("error",function(A){return t(A)},!1),A.readAsDataURL(B.response)}else t("Failed to proxy resource "+i+" with status code "+B.status)},B.onerror=t,B.open("GET",o+"?url="+encodeURIComponent(n)+"&responseType="+r),"text"!=r&&B instanceof XMLHttpRequest&&(B.responseType=r),s._options.imageTimeout){var A=s._options.imageTimeout;B.timeout=A,B.ontimeout=function(){return t("Timed out ("+A+"ms) proxying "+i)}}B.send()})},_e);function _e(A,e){this.id=A,this._options=e,this._cache={}}function Pe(A){var B=rt.CIRCLE,n=nt.FARTHEST_CORNER,s=[],o=[];return WA(A).forEach(function(A,e){var t=!0;if(0===e?t=A.reduce(function(A,e){if(zA(e))switch(e.value){case"center":return o.push(oe),!1;case"top":case"left":return o.push(se),!1;case"right":case"bottom":return o.push(ie),!1}else if(qA(e)||YA(e))return o.push(e),!1;return A},t):1===e&&(t=A.reduce(function(A,e){if(zA(e))switch(e.value){case"circle":return B=rt.CIRCLE,!1;case et:return B=rt.ELLIPSE,!1;case tt:case Ze:return n=nt.CLOSEST_SIDE,!1;case je:return n=nt.FARTHEST_SIDE,!1;case $e:return n=nt.CLOSEST_CORNER,!1;case"cover":case At:return n=nt.FARTHEST_CORNER,!1}else if(YA(e)||qA(e))return Array.isArray(n)||(n=[]),n.push(e),!1;return A},t)),t){var r=de(A);s.push(r)}}),{size:n,shape:B,stops:s,position:o,type:xe.RADIAL_GRADIENT}}var xe,Ve,ze=/^data:image\/svg\+xml/i,Xe=/^data:image\/.*;base64,/i,Je=/^data:image\/.*/i,Ge=function(A){return ve.SUPPORT_SVG_DRAWING||!qe(A)},ke=function(A){return Je.test(A)},We=function(A){return Xe.test(A)},Ye=function(A){return"blob"===A.substr(0,4)},qe=function(A){return"svg"===A.substr(-3).toLowerCase()||ze.test(A)},Ze="closest-side",je="farthest-side",$e="closest-corner",At="farthest-corner",et="ellipse",tt="contain";(Ve=xe||(xe={}))[Ve.URL=0]="URL",Ve[Ve.LINEAR_GRADIENT=1]="LINEAR_GRADIENT",Ve[Ve.RADIAL_GRADIENT=2]="RADIAL_GRADIENT";var rt,Bt,nt,st;(Bt=rt||(rt={}))[Bt.CIRCLE=0]="CIRCLE",Bt[Bt.ELLIPSE=1]="ELLIPSE",(st=nt||(nt={}))[st.CLOSEST_SIDE=0]="CLOSEST_SIDE",st[st.FARTHEST_SIDE=1]="FARTHEST_SIDE",st[st.CLOSEST_CORNER=2]="CLOSEST_CORNER",st[st.FARTHEST_CORNER=3]="FARTHEST_CORNER";var ot=function(A){if(A.type===sA.URL_TOKEN){var e={url:A.value,type:xe.URL};return be.getInstance().addImage(A.value),e}if(A.type!==sA.FUNCTION)throw new Error("Unsupported image type");var t=ct[A.name];if(void 0===t)throw new Error('Attempting to parse an unsupported image function "'+A.name+'"');return t(A.values)};var it,at,ct={"linear-gradient":function(A){var B=Qe(180),n=[];return WA(A).forEach(function(A,e){if(0===e){var t=A[0];if(t.type===sA.IDENT_TOKEN&&"to"===t.value)return void(B=Ae(A));if($A(t))return void(B=ce(t))}var r=de(A);n.push(r)}),{angle:B,stops:n,type:xe.LINEAR_GRADIENT}},"-moz-linear-gradient":Ie,"-ms-linear-gradient":Ie,"-o-linear-gradient":Ie,"-webkit-linear-gradient":Ie,"radial-gradient":function(A){var n=rt.CIRCLE,s=nt.FARTHEST_CORNER,o=[],i=[];return WA(A).forEach(function(A,e){var t=!0;if(0===e){var r=!1;t=A.reduce(function(A,e){if(r)if(zA(e))switch(e.value){case"center":return i.push(oe),A;case"top":case"left":return i.push(se),A;case"right":case"bottom":return i.push(ie),A}else(qA(e)||YA(e))&&i.push(e);else if(zA(e))switch(e.value){case"circle":return n=rt.CIRCLE,!1;case et:return n=rt.ELLIPSE,!1;case"at":return!(r=!0);case Ze:return s=nt.CLOSEST_SIDE,!1;case"cover":case je:return s=nt.FARTHEST_SIDE,!1;case tt:case $e:return s=nt.CLOSEST_CORNER,!1;case At:return s=nt.FARTHEST_CORNER,!1}else if(YA(e)||qA(e))return Array.isArray(s)||(s=[]),s.push(e),!1;return A},t)}if(t){var B=de(A);o.push(B)}}),{size:s,shape:n,stops:o,position:i,type:xe.RADIAL_GRADIENT}},"-moz-radial-gradient":Pe,"-ms-radial-gradient":Pe,"-o-radial-gradient":Pe,"-webkit-radial-gradient":Pe,"-webkit-gradient":function(A){var e=Qe(180),s=[],o=xe.LINEAR_GRADIENT,t=rt.CIRCLE,r=nt.FARTHEST_CORNER;return WA(A).forEach(function(A,e){var t=A[0];if(0===e){if(zA(t)&&"linear"===t.value)return void(o=xe.LINEAR_GRADIENT);if(zA(t)&&"radial"===t.value)return void(o=xe.RADIAL_GRADIENT)}if(t.type===sA.FUNCTION)if("from"===t.name){var r=we(t.values[0]);s.push({stop:se,color:r})}else if("to"===t.name)r=we(t.values[0]),s.push({stop:ie,color:r});else if("color-stop"===t.name){var B=t.values.filter(kA);if(2===B.length){r=we(B[1]);var n=B[0];VA(n)&&s.push({stop:{type:sA.PERCENTAGE_TOKEN,number:100*n.number,flags:n.flags},color:r})}}}),o===xe.LINEAR_GRADIENT?{angle:(e+Qe(180))%Qe(360),stops:s,type:o}:{size:r,shape:t,stops:s,position:[],type:o}}},Qt={name:"background-image",initialValue:"none",type:Ce.LIST,prefix:!1,parse:function(A){if(0===A.length)return[];var e=A[0];return e.type===sA.IDENT_TOKEN&&"none"===e.value?[]:A.filter(function(A){return kA(A)&&function(A){return A.type!==sA.FUNCTION||ct[A.name]}(A)}).map(ot)}},wt={name:"background-origin",initialValue:"border-box",prefix:!1,type:Ce.LIST,parse:function(A){return A.map(function(A){if(zA(A))switch(A.value){case"padding-box":return 1;case"content-box":return 2}return 0})}},ut={name:"background-position",initialValue:"0% 0%",type:Ce.LIST,prefix:!1,parse:function(A){return WA(A).map(function(A){return A.filter(qA)}).map(ZA)}};(at=it||(it={}))[at.REPEAT=0]="REPEAT",at[at.NO_REPEAT=1]="NO_REPEAT",at[at.REPEAT_X=2]="REPEAT_X";var Ut,lt,Ct={name:"background-repeat",initialValue:"repeat",prefix:!(at[at.REPEAT_Y=3]="REPEAT_Y"),type:Ce.LIST,parse:function(A){return WA(A).map(function(A){return A.filter(zA).map(function(A){return A.value}).join(" ")}).map(gt)}},gt=function(A){switch(A){case"no-repeat":return it.NO_REPEAT;case"repeat-x":case"repeat no-repeat":return it.REPEAT_X;case"repeat-y":case"no-repeat repeat":return it.REPEAT_Y;case"repeat":default:return it.REPEAT}};(lt=Ut||(Ut={})).AUTO="auto",lt.CONTAIN="contain";function Et(A){return{name:"border-"+A+"-color",initialValue:"transparent",prefix:!1,type:Ce.TYPE_VALUE,format:"color"}}function Ft(A){return{name:"border-radius-"+A,initialValue:"0 0",prefix:!1,type:Ce.LIST,parse:function(A){return ZA(A.filter(qA))}}}var ht,Ht,dt={name:"background-size",initialValue:"0",prefix:!(lt.COVER="cover"),type:Ce.LIST,parse:function(A){return WA(A).map(function(A){return A.filter(ft)})}},ft=function(A){return zA(A)||qA(A)},pt=Et("top"),Nt=Et("right"),Kt=Et("bottom"),It=Et("left"),Tt=Ft("top-left"),mt=Ft("top-right"),Rt=Ft("bottom-right"),Lt=Ft("bottom-left");(Ht=ht||(ht={}))[Ht.NONE=0]="NONE",Ht[Ht.SOLID=1]="SOLID";function Ot(A){return{name:"border-"+A+"-style",initialValue:"solid",prefix:!1,type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"none":return ht.NONE}return ht.SOLID}}}function vt(A){return{name:"border-"+A+"-width",initialValue:"0",type:Ce.VALUE,prefix:!1,parse:function(A){return xA(A)?A.number:0}}}var Dt,St,bt=Ot("top"),Mt=Ot("right"),yt=Ot("bottom"),_t=Ot("left"),Pt=vt("top"),xt=vt("right"),Vt=vt("bottom"),zt=vt("left"),Xt={name:"color",initialValue:"transparent",prefix:!1,type:Ce.TYPE_VALUE,format:"color"},Jt={name:"display",initialValue:"inline-block",prefix:!1,type:Ce.LIST,parse:function(A){return A.filter(zA).reduce(function(A,e){return A|Gt(e.value)},0)}},Gt=function(A){switch(A){case"block":return 2;case"inline":return 4;case"run-in":return 8;case"flow":return 16;case"flow-root":return 32;case"table":return 64;case"flex":case"-webkit-flex":return 128;case"grid":case"-ms-grid":return 256;case"ruby":return 512;case"subgrid":return 1024;case"list-item":return 2048;case"table-row-group":return 4096;case"table-header-group":return 8192;case"table-footer-group":return 16384;case"table-row":return 32768;case"table-cell":return 65536;case"table-column-group":return 131072;case"table-column":return 262144;case"table-caption":return 524288;case"ruby-base":return 1048576;case"ruby-text":return 2097152;case"ruby-base-container":return 4194304;case"ruby-text-container":return 8388608;case"contents":return 16777216;case"inline-block":return 33554432;case"inline-list-item":return 67108864;case"inline-table":return 134217728;case"inline-flex":return 268435456;case"inline-grid":return 536870912}return 0};(St=Dt||(Dt={}))[St.NONE=0]="NONE",St[St.LEFT=1]="LEFT",St[St.RIGHT=2]="RIGHT",St[St.INLINE_START=3]="INLINE_START";var kt,Wt,Yt,qt,Zt={name:"float",initialValue:"none",prefix:!(St[St.INLINE_END=4]="INLINE_END"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"left":return Dt.LEFT;case"right":return Dt.RIGHT;case"inline-start":return Dt.INLINE_START;case"inline-end":return Dt.INLINE_END}return Dt.NONE}},jt={name:"letter-spacing",initialValue:"0",prefix:!1,type:Ce.VALUE,parse:function(A){return A.type===sA.IDENT_TOKEN&&"normal"===A.value?0:A.type===sA.NUMBER_TOKEN?A.number:A.type===sA.DIMENSION_TOKEN?A.number:0}},$t={name:"line-break",initialValue:(Wt=kt||(kt={})).NORMAL="normal",prefix:!(Wt.STRICT="strict"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"strict":return kt.STRICT;case"normal":default:return kt.NORMAL}}},Ar={name:"line-height",initialValue:"normal",prefix:!1,type:Ce.TOKEN_VALUE},er={name:"list-style-image",initialValue:"none",type:Ce.VALUE,prefix:!1,parse:function(A){return A.type===sA.IDENT_TOKEN&&"none"===A.value?null:ot(A)}};(qt=Yt||(Yt={}))[qt.INSIDE=0]="INSIDE";var tr,rr,Br={name:"list-style-position",initialValue:"outside",prefix:!(qt[qt.OUTSIDE=1]="OUTSIDE"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"inside":return Yt.INSIDE;case"outside":default:return Yt.OUTSIDE}}};(rr=tr||(tr={}))[rr.NONE=-1]="NONE",rr[rr.DISC=0]="DISC",rr[rr.CIRCLE=1]="CIRCLE",rr[rr.SQUARE=2]="SQUARE",rr[rr.DECIMAL=3]="DECIMAL",rr[rr.CJK_DECIMAL=4]="CJK_DECIMAL",rr[rr.DECIMAL_LEADING_ZERO=5]="DECIMAL_LEADING_ZERO",rr[rr.LOWER_ROMAN=6]="LOWER_ROMAN",rr[rr.UPPER_ROMAN=7]="UPPER_ROMAN",rr[rr.LOWER_GREEK=8]="LOWER_GREEK",rr[rr.LOWER_ALPHA=9]="LOWER_ALPHA",rr[rr.UPPER_ALPHA=10]="UPPER_ALPHA",rr[rr.ARABIC_INDIC=11]="ARABIC_INDIC",rr[rr.ARMENIAN=12]="ARMENIAN",rr[rr.BENGALI=13]="BENGALI",rr[rr.CAMBODIAN=14]="CAMBODIAN",rr[rr.CJK_EARTHLY_BRANCH=15]="CJK_EARTHLY_BRANCH",rr[rr.CJK_HEAVENLY_STEM=16]="CJK_HEAVENLY_STEM",rr[rr.CJK_IDEOGRAPHIC=17]="CJK_IDEOGRAPHIC",rr[rr.DEVANAGARI=18]="DEVANAGARI",rr[rr.ETHIOPIC_NUMERIC=19]="ETHIOPIC_NUMERIC",rr[rr.GEORGIAN=20]="GEORGIAN",rr[rr.GUJARATI=21]="GUJARATI",rr[rr.GURMUKHI=22]="GURMUKHI",rr[rr.HEBREW=22]="HEBREW",rr[rr.HIRAGANA=23]="HIRAGANA",rr[rr.HIRAGANA_IROHA=24]="HIRAGANA_IROHA",rr[rr.JAPANESE_FORMAL=25]="JAPANESE_FORMAL",rr[rr.JAPANESE_INFORMAL=26]="JAPANESE_INFORMAL",rr[rr.KANNADA=27]="KANNADA",rr[rr.KATAKANA=28]="KATAKANA",rr[rr.KATAKANA_IROHA=29]="KATAKANA_IROHA",rr[rr.KHMER=30]="KHMER",rr[rr.KOREAN_HANGUL_FORMAL=31]="KOREAN_HANGUL_FORMAL",rr[rr.KOREAN_HANJA_FORMAL=32]="KOREAN_HANJA_FORMAL",rr[rr.KOREAN_HANJA_INFORMAL=33]="KOREAN_HANJA_INFORMAL",rr[rr.LAO=34]="LAO",rr[rr.LOWER_ARMENIAN=35]="LOWER_ARMENIAN",rr[rr.MALAYALAM=36]="MALAYALAM",rr[rr.MONGOLIAN=37]="MONGOLIAN",rr[rr.MYANMAR=38]="MYANMAR",rr[rr.ORIYA=39]="ORIYA",rr[rr.PERSIAN=40]="PERSIAN",rr[rr.SIMP_CHINESE_FORMAL=41]="SIMP_CHINESE_FORMAL",rr[rr.SIMP_CHINESE_INFORMAL=42]="SIMP_CHINESE_INFORMAL",rr[rr.TAMIL=43]="TAMIL",rr[rr.TELUGU=44]="TELUGU",rr[rr.THAI=45]="THAI",rr[rr.TIBETAN=46]="TIBETAN",rr[rr.TRAD_CHINESE_FORMAL=47]="TRAD_CHINESE_FORMAL",rr[rr.TRAD_CHINESE_INFORMAL=48]="TRAD_CHINESE_INFORMAL",rr[rr.UPPER_ARMENIAN=49]="UPPER_ARMENIAN",rr[rr.DISCLOSURE_OPEN=50]="DISCLOSURE_OPEN";function nr(A){return{name:"margin-"+A,initialValue:"0",prefix:!1,type:Ce.TOKEN_VALUE}}var sr,or,ir={name:"list-style-type",initialValue:"none",prefix:!(rr[rr.DISCLOSURE_CLOSED=51]="DISCLOSURE_CLOSED"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"disc":return tr.DISC;case"circle":return tr.CIRCLE;case"square":return tr.SQUARE;case"decimal":return tr.DECIMAL;case"cjk-decimal":return tr.CJK_DECIMAL;case"decimal-leading-zero":return tr.DECIMAL_LEADING_ZERO;case"lower-roman":return tr.LOWER_ROMAN;case"upper-roman":return tr.UPPER_ROMAN;case"lower-greek":return tr.LOWER_GREEK;case"lower-alpha":return tr.LOWER_ALPHA;case"upper-alpha":return tr.UPPER_ALPHA;case"arabic-indic":return tr.ARABIC_INDIC;case"armenian":return tr.ARMENIAN;case"bengali":return tr.BENGALI;case"cambodian":return tr.CAMBODIAN;case"cjk-earthly-branch":return tr.CJK_EARTHLY_BRANCH;case"cjk-heavenly-stem":return tr.CJK_HEAVENLY_STEM;case"cjk-ideographic":return tr.CJK_IDEOGRAPHIC;case"devanagari":return tr.DEVANAGARI;case"ethiopic-numeric":return tr.ETHIOPIC_NUMERIC;case"georgian":return tr.GEORGIAN;case"gujarati":return tr.GUJARATI;case"gurmukhi":return tr.GURMUKHI;case"hebrew":return tr.HEBREW;case"hiragana":return tr.HIRAGANA;case"hiragana-iroha":return tr.HIRAGANA_IROHA;case"japanese-formal":return tr.JAPANESE_FORMAL;case"japanese-informal":return tr.JAPANESE_INFORMAL;case"kannada":return tr.KANNADA;case"katakana":return tr.KATAKANA;case"katakana-iroha":return tr.KATAKANA_IROHA;case"khmer":return tr.KHMER;case"korean-hangul-formal":return tr.KOREAN_HANGUL_FORMAL;case"korean-hanja-formal":return tr.KOREAN_HANJA_FORMAL;case"korean-hanja-informal":return tr.KOREAN_HANJA_INFORMAL;case"lao":return tr.LAO;case"lower-armenian":return tr.LOWER_ARMENIAN;case"malayalam":return tr.MALAYALAM;case"mongolian":return tr.MONGOLIAN;case"myanmar":return tr.MYANMAR;case"oriya":return tr.ORIYA;case"persian":return tr.PERSIAN;case"simp-chinese-formal":return tr.SIMP_CHINESE_FORMAL;case"simp-chinese-informal":return tr.SIMP_CHINESE_INFORMAL;case"tamil":return tr.TAMIL;case"telugu":return tr.TELUGU;case"thai":return tr.THAI;case"tibetan":return tr.TIBETAN;case"trad-chinese-formal":return tr.TRAD_CHINESE_FORMAL;case"trad-chinese-informal":return tr.TRAD_CHINESE_INFORMAL;case"upper-armenian":return tr.UPPER_ARMENIAN;case"disclosure-open":return tr.DISCLOSURE_OPEN;case"disclosure-closed":return tr.DISCLOSURE_CLOSED;case"none":default:return tr.NONE}}},ar=nr("top"),cr=nr("right"),Qr=nr("bottom"),wr=nr("left");(or=sr||(sr={}))[or.VISIBLE=0]="VISIBLE",or[or.HIDDEN=1]="HIDDEN",or[or.SCROLL=2]="SCROLL";function ur(A){return{name:"padding-"+A,initialValue:"0",prefix:!1,type:Ce.TYPE_VALUE,format:"length-percentage"}}var Ur,lr,Cr,gr,Er={name:"overflow",initialValue:"visible",prefix:!(or[or.AUTO=3]="AUTO"),type:Ce.LIST,parse:function(A){return A.filter(zA).map(function(A){switch(A.value){case"hidden":return sr.HIDDEN;case"scroll":return sr.SCROLL;case"auto":return sr.AUTO;case"visible":default:return sr.VISIBLE}})}},Fr={name:"overflow-wrap",initialValue:(lr=Ur||(Ur={})).NORMAL="normal",prefix:!(lr.BREAK_WORD="break-word"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"break-word":return Ur.BREAK_WORD;case"normal":default:return Ur.NORMAL}}},hr=ur("top"),Hr=ur("right"),dr=ur("bottom"),fr=ur("left");(gr=Cr||(Cr={}))[gr.LEFT=0]="LEFT",gr[gr.CENTER=1]="CENTER";var pr,Nr,Kr={name:"text-align",initialValue:"left",prefix:!(gr[gr.RIGHT=2]="RIGHT"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"right":return Cr.RIGHT;case"center":case"justify":return Cr.CENTER;case"left":default:return Cr.LEFT}}};(Nr=pr||(pr={}))[Nr.STATIC=0]="STATIC",Nr[Nr.RELATIVE=1]="RELATIVE",Nr[Nr.ABSOLUTE=2]="ABSOLUTE",Nr[Nr.FIXED=3]="FIXED";var Ir,Tr,mr={name:"position",initialValue:"static",prefix:!(Nr[Nr.STICKY=4]="STICKY"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"relative":return pr.RELATIVE;case"absolute":return pr.ABSOLUTE;case"fixed":return pr.FIXED;case"sticky":return pr.STICKY}return pr.STATIC}},Rr={name:"text-shadow",initialValue:"none",type:Ce.LIST,prefix:!1,parse:function(A){return 1===A.length&&JA(A[0],"none")?[]:WA(A).map(function(A){for(var e={color:He.TRANSPARENT,offsetX:se,offsetY:se,blur:se},t=0,r=0;r<A.length;r++){var B=A[r];YA(B)?(0===t?e.offsetX=B:1===t?e.offsetY=B:e.blur=B,t++):e.color=we(B)}return e})}};(Tr=Ir||(Ir={}))[Tr.NONE=0]="NONE",Tr[Tr.LOWERCASE=1]="LOWERCASE",Tr[Tr.UPPERCASE=2]="UPPERCASE";var Lr,Or,vr={name:"text-transform",initialValue:"none",prefix:!(Tr[Tr.CAPITALIZE=3]="CAPITALIZE"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"uppercase":return Ir.UPPERCASE;case"lowercase":return Ir.LOWERCASE;case"capitalize":return Ir.CAPITALIZE}return Ir.NONE}},Dr={name:"transform",initialValue:"none",prefix:!0,type:Ce.VALUE,parse:function(A){if(A.type===sA.IDENT_TOKEN&&"none"===A.value)return null;if(A.type!==sA.FUNCTION)return null;var e=Sr[A.name];if(void 0===e)throw new Error('Attempting to parse an unsupported transform function "'+A.name+'"');return e(A.values)}},Sr={matrix:function(A){var e=A.filter(function(A){return A.type===sA.NUMBER_TOKEN}).map(function(A){return A.number});return 6===e.length?e:null},matrix3d:function(A){var e=A.filter(function(A){return A.type===sA.NUMBER_TOKEN}).map(function(A){return A.number}),t=e[0],r=e[1],B=(e[2],e[3],e[4]),n=e[5],s=(e[6],e[7],e[8],e[9],e[10],e[11],e[12]),o=e[13];e[14],e[15];return 16===e.length?[t,r,B,n,s,o]:null}},br={type:sA.PERCENTAGE_TOKEN,number:50,flags:4},Mr=[br,br],yr={name:"transform-origin",initialValue:"50% 50%",prefix:!0,type:Ce.LIST,parse:function(A){var e=A.filter(qA);return 2!==e.length?Mr:[e[0],e[1]]}};(Or=Lr||(Lr={}))[Or.VISIBLE=0]="VISIBLE",Or[Or.HIDDEN=1]="HIDDEN";var _r,Pr,xr={name:"visible",initialValue:"none",prefix:!(Or[Or.COLLAPSE=2]="COLLAPSE"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"hidden":return Lr.HIDDEN;case"collapse":return Lr.COLLAPSE;case"visible":default:return Lr.VISIBLE}}};(Pr=_r||(_r={})).NORMAL="normal",Pr.BREAK_ALL="break-all";var Vr,zr,Xr={name:"word-break",initialValue:"normal",prefix:!(Pr.KEEP_ALL="keep-all"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"break-all":return _r.BREAK_ALL;case"keep-all":return _r.KEEP_ALL;case"normal":default:return _r.NORMAL}}},Jr={name:"z-index",initialValue:"auto",prefix:!1,type:Ce.VALUE,parse:function(A){if(A.type===sA.IDENT_TOKEN)return{auto:!0,order:0};if(VA(A))return{auto:!1,order:A.number};throw new Error("Invalid z-index number parsed")}},Gr={name:"opacity",initialValue:"1",type:Ce.VALUE,prefix:!1,parse:function(A){return VA(A)?A.number:1}},kr={name:"text-decoration-color",initialValue:"transparent",prefix:!1,type:Ce.TYPE_VALUE,format:"color"},Wr={name:"text-decoration-line",initialValue:"none",prefix:!1,type:Ce.LIST,parse:function(A){return A.filter(zA).map(function(A){switch(A.value){case"underline":return 1;case"overline":return 2;case"line-through":return 3;case"none":return 4}return 0}).filter(function(A){return 0!==A})}},Yr={name:"font-family",initialValue:"",prefix:!1,type:Ce.LIST,parse:function(A){return A.filter(qr).map(function(A){return A.value})}},qr=function(A){return A.type===sA.STRING_TOKEN||A.type===sA.IDENT_TOKEN},Zr={name:"font-size",initialValue:"0",prefix:!1,type:Ce.TYPE_VALUE,format:"length"},jr={name:"font-weight",initialValue:"normal",type:Ce.VALUE,prefix:!1,parse:function(A){if(VA(A))return A.number;if(zA(A))switch(A.value){case"bold":return 700;case"normal":default:return 400}return 400}},$r={name:"font-variant",initialValue:"none",type:Ce.LIST,prefix:!1,parse:function(A){return A.filter(zA).map(function(A){return A.value})}};(zr=Vr||(Vr={})).NORMAL="normal",zr.ITALIC="italic";function AB(A,e){return 0!=(A&e)}function eB(A,e,t){if(!A)return"";var r=A[Math.min(e,A.length-1)];return r?t?r.open:r.close:""}var tB={name:"font-style",initialValue:"normal",prefix:!(zr.OBLIQUE="oblique"),type:Ce.IDENT_VALUE,parse:function(A){switch(A){case"oblique":return Vr.OBLIQUE;case"italic":return Vr.ITALIC;case"normal":default:return Vr.NORMAL}}},rB={name:"content",initialValue:"none",type:Ce.LIST,prefix:!1,parse:function(A){if(0===A.length)return[];var e=A[0];return e.type===sA.IDENT_TOKEN&&"none"===e.value?[]:A}},BB={name:"counter-increment",initialValue:"none",prefix:!0,type:Ce.LIST,parse:function(A){if(0===A.length)return null;var e=A[0];if(e.type===sA.IDENT_TOKEN&&"none"===e.value)return null;for(var t=[],r=A.filter(GA),B=0;B<r.length;B++){var n=r[B],s=r[B+1];if(n.type===sA.IDENT_TOKEN){var o=s&&VA(s)?s.number:1;t.push({counter:n.value,increment:o})}}return t}},nB={name:"counter-reset",initialValue:"none",prefix:!0,type:Ce.LIST,parse:function(A){if(0===A.length)return[];for(var e=[],t=A.filter(GA),r=0;r<t.length;r++){var B=t[r],n=t[r+1];if(zA(B)&&"none"!==B.value){var s=n&&VA(n)?n.number:0;e.push({counter:B.value,reset:s})}}return e}},sB={name:"quotes",initialValue:"none",prefix:!0,type:Ce.LIST,parse:function(A){if(0===A.length)return null;var e=A[0];if(e.type===sA.IDENT_TOKEN&&"none"===e.value)return null;var t=[],r=A.filter(XA);if(r.length%2!=0)return null;for(var B=0;B<r.length;B+=2){var n=r[B].value,s=r[B+1].value;t.push({open:n,close:s})}return t}},oB={name:"box-shadow",initialValue:"none",type:Ce.LIST,prefix:!1,parse:function(A){return 1===A.length&&JA(A[0],"none")?[]:WA(A).map(function(A){for(var e={color:255,offsetX:se,offsetY:se,blur:se,spread:se,inset:!1},t=0,r=0;r<A.length;r++){var B=A[r];JA(B,"inset")?e.inset=!0:YA(B)?(0===t?e.offsetX=B:1===t?e.offsetY=B:2===t?e.blur=B:e.spread=B,t++):e.color=we(B)}return e})}},iB=(aB.prototype.isVisible=function(){return 0<this.display&&0<this.opacity&&this.visibility===Lr.VISIBLE},aB.prototype.isTransparent=function(){return ee(this.backgroundColor)},aB.prototype.isTransformed=function(){return null!==this.transform},aB.prototype.isPositioned=function(){return this.position!==pr.STATIC},aB.prototype.isPositionedWithZIndex=function(){return this.isPositioned()&&!this.zIndex.auto},aB.prototype.isFloating=function(){return this.float!==Dt.NONE},aB.prototype.isInlineLevel=function(){return AB(this.display,4)||AB(this.display,33554432)||AB(this.display,268435456)||AB(this.display,536870912)||AB(this.display,67108864)||AB(this.display,134217728)},aB);function aB(A){this.backgroundClip=uB(me,A.backgroundClip),this.backgroundColor=uB(Re,A.backgroundColor),this.backgroundImage=uB(Qt,A.backgroundImage),this.backgroundOrigin=uB(wt,A.backgroundOrigin),this.backgroundPosition=uB(ut,A.backgroundPosition),this.backgroundRepeat=uB(Ct,A.backgroundRepeat),this.backgroundSize=uB(dt,A.backgroundSize),this.borderTopColor=uB(pt,A.borderTopColor),this.borderRightColor=uB(Nt,A.borderRightColor),this.borderBottomColor=uB(Kt,A.borderBottomColor),this.borderLeftColor=uB(It,A.borderLeftColor),this.borderTopLeftRadius=uB(Tt,A.borderTopLeftRadius),this.borderTopRightRadius=uB(mt,A.borderTopRightRadius),this.borderBottomRightRadius=uB(Rt,A.borderBottomRightRadius),this.borderBottomLeftRadius=uB(Lt,A.borderBottomLeftRadius),this.borderTopStyle=uB(bt,A.borderTopStyle),this.borderRightStyle=uB(Mt,A.borderRightStyle),this.borderBottomStyle=uB(yt,A.borderBottomStyle),this.borderLeftStyle=uB(_t,A.borderLeftStyle),this.borderTopWidth=uB(Pt,A.borderTopWidth),this.borderRightWidth=uB(xt,A.borderRightWidth),this.borderBottomWidth=uB(Vt,A.borderBottomWidth),this.borderLeftWidth=uB(zt,A.borderLeftWidth),this.boxShadow=uB(oB,A.boxShadow),this.color=uB(Xt,A.color),this.display=uB(Jt,A.display),this.float=uB(Zt,A.cssFloat),this.fontFamily=uB(Yr,A.fontFamily),this.fontSize=uB(Zr,A.fontSize),this.fontStyle=uB(tB,A.fontStyle),this.fontVariant=uB($r,A.fontVariant),this.fontWeight=uB(jr,A.fontWeight),this.letterSpacing=uB(jt,A.letterSpacing),this.lineBreak=uB($t,A.lineBreak),this.lineHeight=uB(Ar,A.lineHeight),this.listStyleImage=uB(er,A.listStyleImage),this.listStylePosition=uB(Br,A.listStylePosition),this.listStyleType=uB(ir,A.listStyleType),this.marginTop=uB(ar,A.marginTop),this.marginRight=uB(cr,A.marginRight),this.marginBottom=uB(Qr,A.marginBottom),this.marginLeft=uB(wr,A.marginLeft),this.opacity=uB(Gr,A.opacity);var e=uB(Er,A.overflow);this.overflowX=e[0],this.overflowY=e[1<e.length?1:0],this.overflowWrap=uB(Fr,A.overflowWrap),this.paddingTop=uB(hr,A.paddingTop),this.paddingRight=uB(Hr,A.paddingRight),this.paddingBottom=uB(dr,A.paddingBottom),this.paddingLeft=uB(fr,A.paddingLeft),this.position=uB(mr,A.position),this.textAlign=uB(Kr,A.textAlign),this.textDecorationColor=uB(kr,A.textDecorationColor||A.color),this.textDecorationLine=uB(Wr,A.textDecorationLine),this.textShadow=uB(Rr,A.textShadow),this.textTransform=uB(vr,A.textTransform),this.transform=uB(Dr,A.transform),this.transformOrigin=uB(yr,A.transformOrigin),this.visibility=uB(xr,A.visibility),this.wordBreak=uB(Xr,A.wordBreak),this.zIndex=uB(Jr,A.zIndex)}var cB,QB=function(A){this.content=uB(rB,A.content),this.quotes=uB(sB,A.quotes)},wB=function(A){this.counterIncrement=uB(BB,A.counterIncrement),this.counterReset=uB(nB,A.counterReset)},uB=function(A,e){var t=new MA,r=null!=e?e.toString():A.initialValue;t.write(r);var B=new _A(t.read());switch(A.type){case Ce.IDENT_VALUE:var n=B.parseComponentValue();return A.parse(zA(n)?n.value:A.initialValue);case Ce.VALUE:return A.parse(B.parseComponentValue());case Ce.LIST:return A.parse(B.parseComponentValues());case Ce.TOKEN_VALUE:return B.parseComponentValue();case Ce.TYPE_VALUE:switch(A.format){case"angle":return ce(B.parseComponentValue());case"color":return we(B.parseComponentValue());case"image":return ot(B.parseComponentValue());case"length":var s=B.parseComponentValue();return YA(s)?s:se;case"length-percentage":var o=B.parseComponentValue();return qA(o)?o:se}}throw new Error("Attempting to parse unsupported css format type "+A.format)},UB=function(A){this.styles=new iB(window.getComputedStyle(A,null)),this.textNodes=[],this.elements=[],null!==this.styles.transform&&un(A)&&(A.style.transform="none"),this.bounds=T(A),this.flags=0},lB=function(A,e){this.text=A,this.bounds=e},CB=function(A){var e=A.ownerDocument;if(e){var t=e.createElement("html2canvaswrapper");t.appendChild(A.cloneNode(!0));var r=A.parentNode;if(r){r.replaceChild(t,A);var B=T(t);return t.firstChild&&r.replaceChild(t.firstChild,t),B}}return new I(0,0,0,0)},gB=function(A,e,t){var r=A.ownerDocument;if(!r)throw new Error("Node has no owner document");var B=r.createRange();return B.setStart(A,e),B.setEnd(A,e+t),I.fromClientRect(B.getBoundingClientRect())},EB=function(A,e){return 0!==e.letterSpacing?c(A).map(function(A){return l(A)}):FB(A,e)},FB=function(A,e){for(var t,r=function(A,e){var t=c(A),r=u(t,e),B=r[0],n=r[1],s=r[2],o=t.length,i=0,a=0;return{next:function(){if(o<=a)return{done:!0,value:null};for(var A=Y;a<o&&(A=w(t,n,B,++a,s))===Y;);if(A===Y&&a!==o)return{done:!0,value:null};var e=new BA(t,A,i,a);return i=a,{value:e,done:!1}}}}(A,{lineBreak:e.lineBreak,wordBreak:e.overflowWrap===Ur.BREAK_WORD?"break-word":e.wordBreak}),B=[];!(t=r.next()).done;)t.value&&B.push(t.value.slice());return B},hB=function(A,e){this.text=HB(A.data,e.textTransform),this.textBounds=function(A,t,r){var e=EB(A,t),B=[],n=0;return e.forEach(function(A){if(t.textDecorationLine.length||0<A.trim().length)if(ve.SUPPORT_RANGE_BOUNDS)B.push(new lB(A,gB(r,n,A.length)));else{var e=r.splitText(A.length);B.push(new lB(A,CB(r))),r=e}else ve.SUPPORT_RANGE_BOUNDS||(r=r.splitText(A.length));n+=A.length}),B}(this.text,e,A)},HB=function(A,e){switch(e){case Ir.LOWERCASE:return A.toLowerCase();case Ir.CAPITALIZE:return A.replace(dB,fB);case Ir.UPPERCASE:return A.toUpperCase();default:return A}},dB=/(^|\s|:|-|\(|\))([a-z])/g,fB=function(A,e,t){return 0<A.length?e+t.toUpperCase():A},pB=(A(NB,cB=UB),NB);function NB(A){var e=cB.call(this,A)||this;return e.src=A.currentSrc||A.src,e.intrinsicWidth=A.naturalWidth,e.intrinsicHeight=A.naturalHeight,be.getInstance().addImage(e.src),e}var KB,IB=(A(TB,KB=UB),TB);function TB(A){var e=KB.call(this,A)||this;return e.canvas=A,e.intrinsicWidth=A.width,e.intrinsicHeight=A.height,e}var mB,RB=(A(LB,mB=UB),LB);function LB(A){var e=mB.call(this,A)||this,t=new XMLSerializer;return e.svg="data:image/svg+xml,"+encodeURIComponent(t.serializeToString(A)),e.intrinsicWidth=A.width.baseVal.value,e.intrinsicHeight=A.height.baseVal.value,be.getInstance().addImage(e.svg),e}var OB,vB=(A(DB,OB=UB),DB);function DB(A){var e=OB.call(this,A)||this;return e.value=A.value,e}var SB,bB=(A(MB,SB=UB),MB);function MB(A){var e=SB.call(this,A)||this;return e.start=A.start,e.reversed="boolean"==typeof A.reversed&&!0===A.reversed,e}var yB,_B=[{type:sA.DIMENSION_TOKEN,flags:0,unit:"px",number:3}],PB=[{type:sA.PERCENTAGE_TOKEN,flags:0,number:50}],xB="checkbox",VB="radio",zB="password",XB=707406591,JB=(A(GB,yB=UB),GB);function GB(A){var e=yB.call(this,A)||this;switch(e.type=A.type.toLowerCase(),e.checked=A.checked,e.value=function(A){var e=A.type===zB?new Array(A.value.length+1).join("•"):A.value;return 0===e.length?A.placeholder||"":e}(A),e.type!==xB&&e.type!==VB||(e.styles.backgroundColor=3739148031,e.styles.borderTopColor=e.styles.borderRightColor=e.styles.borderBottomColor=e.styles.borderLeftColor=2779096575,e.styles.borderTopWidth=e.styles.borderRightWidth=e.styles.borderBottomWidth=e.styles.borderLeftWidth=1,e.styles.borderTopStyle=e.styles.borderRightStyle=e.styles.borderBottomStyle=e.styles.borderLeftStyle=ht.SOLID,e.styles.backgroundClip=[Ee.BORDER_BOX],e.styles.backgroundOrigin=[0],e.bounds=function(A){return A.width>A.height?new I(A.left+(A.width-A.height)/2,A.top,A.height,A.height):A.width<A.height?new I(A.left,A.top+(A.height-A.width)/2,A.width,A.width):A}(e.bounds)),e.type){case xB:e.styles.borderTopRightRadius=e.styles.borderTopLeftRadius=e.styles.borderBottomRightRadius=e.styles.borderBottomLeftRadius=_B;break;case VB:e.styles.borderTopRightRadius=e.styles.borderTopLeftRadius=e.styles.borderBottomRightRadius=e.styles.borderBottomLeftRadius=PB}return e}var kB,WB=(A(YB,kB=UB),YB);function YB(A){var e=kB.call(this,A)||this,t=A.options[A.selectedIndex||0];return e.value=t&&t.text||"",e}var qB,ZB=(A(jB,qB=UB),jB);function jB(A){var e=qB.call(this,A)||this;return e.value=A.value,e}function $B(A){return we(_A.create(A).parseComponentValue())}var An,en=(A(tn,An=UB),tn);function tn(A){var e=An.call(this,A)||this;e.src=A.src,e.width=parseInt(A.width,10)||0,e.height=parseInt(A.height,10)||0,e.backgroundColor=e.styles.backgroundColor;try{if(A.contentWindow&&A.contentWindow.document&&A.contentWindow.document.documentElement){e.tree=on(A.contentWindow.document.documentElement);var t=A.contentWindow.document.documentElement?$B(getComputedStyle(A.contentWindow.document.documentElement).backgroundColor):He.TRANSPARENT,r=A.contentWindow.document.body?$B(getComputedStyle(A.contentWindow.document.body).backgroundColor):He.TRANSPARENT;e.backgroundColor=ee(t)?ee(r)?e.styles.backgroundColor:r:t}}catch(A){}return e}function rn(A){return"STYLE"===A.tagName}var Bn=["OL","UL","MENU"],nn=function(A,e,t){for(var r=A.firstChild,B=void 0;r;r=B)if(B=r.nextSibling,Qn(r)&&0<r.data.trim().length)e.textNodes.push(new hB(r,e.styles));else if(wn(r)){var n=sn(r);n.styles.isVisible()&&(an(r,n,t)?n.flags|=4:cn(n.styles)&&(n.flags|=2),-1!==Bn.indexOf(r.tagName)&&(n.flags|=8),e.elements.push(n),dn(r)||gn(r)||fn(r)||nn(r,n,t))}},sn=function(A){return hn(A)?new pB(A):Fn(A)?new IB(A):gn(A)?new RB(A):Un(A)?new vB(A):ln(A)?new bB(A):Cn(A)?new JB(A):fn(A)?new WB(A):dn(A)?new ZB(A):Hn(A)?new en(A):new UB(A)},on=function(A){var e=sn(A);return e.flags|=4,nn(A,e,e),e},an=function(A,e,t){return e.styles.isPositionedWithZIndex()||e.styles.opacity<1||e.styles.isTransformed()||En(A)&&t.styles.isTransparent()},cn=function(A){return A.isPositioned()||A.isFloating()},Qn=function(A){return A.nodeType===Node.TEXT_NODE},wn=function(A){return A.nodeType===Node.ELEMENT_NODE},un=function(A){return void 0!==A.style},Un=function(A){return"LI"===A.tagName},ln=function(A){return"OL"===A.tagName},Cn=function(A){return"INPUT"===A.tagName},gn=function(A){return"svg"===A.tagName},En=function(A){return"BODY"===A.tagName},Fn=function(A){return"CANVAS"===A.tagName},hn=function(A){return"IMG"===A.tagName},Hn=function(A){return"IFRAME"===A.tagName},dn=function(A){return"TEXTAREA"===A.tagName},fn=function(A){return"SELECT"===A.tagName},pn=(Nn.prototype.getCounterValue=function(A){var e=this.counters[A];return e&&e.length?e[e.length-1]:1},Nn.prototype.getCounterValues=function(A){var e=this.counters[A];return e||[]},Nn.prototype.pop=function(A){var e=this;A.forEach(function(A){return e.counters[A].pop()})},Nn.prototype.parse=function(A){var t=this,e=A.counterIncrement,r=A.counterReset;null!==e&&e.forEach(function(A){var e=t.counters[A.counter];e&&(e[Math.max(0,e.length-1)]+=A.increment)});var B=[];return r.forEach(function(A){var e=t.counters[A.counter];B.push(A.counter),e||(e=t.counters[A.counter]=[]),e.push(A.reset)}),B},Nn);function Nn(){this.counters={}}function Kn(r,A,e,B,t,n){return r<A||e<r?yn(r,t,0<n.length):B.integers.reduce(function(A,e,t){for(;e<=r;)r-=e,A+=B.values[t];return A},"")+n}function In(A,e,t,r){for(var B="";t||A--,B=r(A)+B,e<=(A/=e)*e;);return B}function Tn(A,e,t,r,B){var n=t-e+1;return(A<0?"-":"")+(In(Math.abs(A),n,r,function(A){return l(Math.floor(A%n)+e)})+B)}function mn(A,e,t){void 0===t&&(t=". ");var r=e.length;return In(Math.abs(A),r,!1,function(A){return e[Math.floor(A%r)]})+t}function Rn(A,e,t,r,B,n){if(A<-9999||9999<A)return yn(A,tr.CJK_DECIMAL,0<B.length);var s=Math.abs(A),o=B;if(0===s)return e[0]+o;for(var i=0;0<s&&i<=4;i++){var a=s%10;0==a&&AB(n,1)&&""!==o?o=e[a]+o:1<a||1==a&&0===i||1==a&&1===i&&AB(n,2)||1==a&&1===i&&AB(n,4)&&100<A||1==a&&1<i&&AB(n,8)?o=e[a]+(0<i?t[i-1]:"")+o:1==a&&0<i&&(o=t[i-1]+o),s=Math.floor(s/10)}return(A<0?r:"")+o}var Ln,On,vn={integers:[1e3,900,500,400,100,90,50,40,10,9,5,4,1],values:["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"]},Dn={integers:[9e3,8e3,7e3,6e3,5e3,4e3,3e3,2e3,1e3,900,800,700,600,500,400,300,200,100,90,80,70,60,50,40,30,20,10,9,8,7,6,5,4,3,2,1],values:["Ք","Փ","Ւ","Ց","Ր","Տ","Վ","Ս","Ռ","Ջ","Պ","Չ","Ո","Շ","Ն","Յ","Մ","Ճ","Ղ","Ձ","Հ","Կ","Ծ","Խ","Լ","Ի","Ժ","Թ","Ը","Է","Զ","Ե","Դ","Գ","Բ","Ա"]},Sn={integers:[1e4,9e3,8e3,7e3,6e3,5e3,4e3,3e3,2e3,1e3,400,300,200,100,90,80,70,60,50,40,30,20,19,18,17,16,15,10,9,8,7,6,5,4,3,2,1],values:["י׳","ט׳","ח׳","ז׳","ו׳","ה׳","ד׳","ג׳","ב׳","א׳","ת","ש","ר","ק","צ","פ","ע","ס","נ","מ","ל","כ","יט","יח","יז","טז","טו","י","ט","ח","ז","ו","ה","ד","ג","ב","א"]},bn={integers:[1e4,9e3,8e3,7e3,6e3,5e3,4e3,3e3,2e3,1e3,900,800,700,600,500,400,300,200,100,90,80,70,60,50,40,30,20,10,9,8,7,6,5,4,3,2,1],values:["ჵ","ჰ","ჯ","ჴ","ხ","ჭ","წ","ძ","ც","ჩ","შ","ყ","ღ","ქ","ფ","ჳ","ტ","ს","რ","ჟ","პ","ო","ჲ","ნ","მ","ლ","კ","ი","თ","ჱ","ზ","ვ","ე","დ","გ","ბ","ა"]},Mn="마이너스",yn=function(A,e,t){var r=t?". ":"",B=t?"、":"",n=t?", ":"",s=t?" ":"";switch(e){case tr.DISC:return"•"+s;case tr.CIRCLE:return"◦"+s;case tr.SQUARE:return"◾"+s;case tr.DECIMAL_LEADING_ZERO:var o=Tn(A,48,57,!0,r);return o.length<4?"0"+o:o;case tr.CJK_DECIMAL:return mn(A,"〇一二三四五六七八九",B);case tr.LOWER_ROMAN:return Kn(A,1,3999,vn,tr.DECIMAL,r).toLowerCase();case tr.UPPER_ROMAN:return Kn(A,1,3999,vn,tr.DECIMAL,r);case tr.LOWER_GREEK:return Tn(A,945,969,!1,r);case tr.LOWER_ALPHA:return Tn(A,97,122,!1,r);case tr.UPPER_ALPHA:return Tn(A,65,90,!1,r);case tr.ARABIC_INDIC:return Tn(A,1632,1641,!0,r);case tr.ARMENIAN:case tr.UPPER_ARMENIAN:return Kn(A,1,9999,Dn,tr.DECIMAL,r);case tr.LOWER_ARMENIAN:return Kn(A,1,9999,Dn,tr.DECIMAL,r).toLowerCase();case tr.BENGALI:return Tn(A,2534,2543,!0,r);case tr.CAMBODIAN:case tr.KHMER:return Tn(A,6112,6121,!0,r);case tr.CJK_EARTHLY_BRANCH:return mn(A,"子丑寅卯辰巳午未申酉戌亥",B);case tr.CJK_HEAVENLY_STEM:return mn(A,"甲乙丙丁戊己庚辛壬癸",B);case tr.CJK_IDEOGRAPHIC:case tr.TRAD_CHINESE_INFORMAL:return Rn(A,"零一二三四五六七八九","十百千萬","負",B,14);case tr.TRAD_CHINESE_FORMAL:return Rn(A,"零壹貳參肆伍陸柒捌玖","拾佰仟萬","負",B,15);case tr.SIMP_CHINESE_INFORMAL:return Rn(A,"零一二三四五六七八九","十百千萬","负",B,14);case tr.SIMP_CHINESE_FORMAL:return Rn(A,"零壹贰叁肆伍陆柒捌玖","拾佰仟萬","负",B,15);case tr.JAPANESE_INFORMAL:return Rn(A,"〇一二三四五六七八九","十百千万","マイナス",B,0);case tr.JAPANESE_FORMAL:return Rn(A,"零壱弐参四伍六七八九","拾百千万","マイナス",B,7);case tr.KOREAN_HANGUL_FORMAL:return Rn(A,"영일이삼사오육칠팔구","십백천만",Mn,n,7);case tr.KOREAN_HANJA_INFORMAL:return Rn(A,"零一二三四五六七八九","十百千萬",Mn,n,0);case tr.KOREAN_HANJA_FORMAL:return Rn(A,"零壹貳參四五六七八九","拾百千",Mn,n,7);case tr.DEVANAGARI:return Tn(A,2406,2415,!0,r);case tr.GEORGIAN:return Kn(A,1,19999,bn,tr.DECIMAL,r);case tr.GUJARATI:return Tn(A,2790,2799,!0,r);case tr.GURMUKHI:return Tn(A,2662,2671,!0,r);case tr.HEBREW:return Kn(A,1,10999,Sn,tr.DECIMAL,r);case tr.HIRAGANA:return mn(A,"あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわゐゑをん");case tr.HIRAGANA_IROHA:return mn(A,"いろはにほへとちりぬるをわかよたれそつねならむうゐのおくやまけふこえてあさきゆめみしゑひもせす");case tr.KANNADA:return Tn(A,3302,3311,!0,r);case tr.KATAKANA:return mn(A,"アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヰヱヲン",B);case tr.KATAKANA_IROHA:return mn(A,"イロハニホヘトチリヌルヲワカヨタレソツネナラムウヰノオクヤマケフコエテアサキユメミシヱヒモセス",B);case tr.LAO:return Tn(A,3792,3801,!0,r);case tr.MONGOLIAN:return Tn(A,6160,6169,!0,r);case tr.MYANMAR:return Tn(A,4160,4169,!0,r);case tr.ORIYA:return Tn(A,2918,2927,!0,r);case tr.PERSIAN:return Tn(A,1776,1785,!0,r);case tr.TAMIL:return Tn(A,3046,3055,!0,r);case tr.TELUGU:return Tn(A,3174,3183,!0,r);case tr.THAI:return Tn(A,3664,3673,!0,r);case tr.TIBETAN:return Tn(A,3872,3881,!0,r);case tr.DECIMAL:default:return Tn(A,48,57,!0,r)}},_n="data-html2canvas-ignore",Pn=(xn.prototype.toIFrame=function(A,e){var t=this,r=Xn(A,e);if(!r.contentWindow)return Promise.reject("Unable to find iframe window");var B=A.defaultView.pageXOffset,n=A.defaultView.pageYOffset,s=r.contentWindow,o=s.document,i=Jn(r).then(function(){t.scrolledElements.forEach(Yn),s&&(s.scrollTo(e.left,e.top),!/(iPad|iPhone|iPod)/g.test(navigator.userAgent)||s.scrollY===e.top&&s.scrollX===e.left||(o.documentElement.style.top=-e.top+"px",o.documentElement.style.left=-e.left+"px",o.documentElement.style.position="absolute"));var A=t.options.onclone;return void 0===t.clonedReferenceElement?Promise.reject("Error finding the "+t.referenceElement.nodeName+" in the cloned document"):"function"==typeof A?Promise.resolve().then(function(){return A(o)}).then(function(){return r}):r});return o.open(),o.write(kn(document.doctype)+"<html></html>"),Wn(this.referenceElement.ownerDocument,B,n),o.replaceChild(o.adoptNode(this.documentElement),o.documentElement),o.close(),i},xn.prototype.createElementClone=function(A){return Fn(A)?this.createCanvasClone(A):rn(A)?this.createStyleClone(A):A.cloneNode(!1)},xn.prototype.createStyleClone=function(A){try{var e=A.sheet;if(e&&e.cssRules){var t=[].slice.call(e.cssRules,0).reduce(function(A,e){return e&&"string"==typeof e.cssText?A+e.cssText:A},""),r=A.cloneNode(!1);return r.textContent=t,r}}catch(A){if(De.getInstance(this.options.id).error("Unable to access cssRules property",A),"SecurityError"!==A.name)throw A}return A.cloneNode(!1)},xn.prototype.createCanvasClone=function(A){if(this.options.inlineImages&&A.ownerDocument){var e=A.ownerDocument.createElement("img");try{return e.src=A.toDataURL(),e}catch(A){De.getInstance(this.options.id).info("Unable to clone canvas contents, canvas is tainted")}}var t=A.cloneNode(!1);try{t.width=A.width,t.height=A.height;var r=A.getContext("2d"),B=t.getContext("2d");return B&&(r?B.putImageData(r.getImageData(0,0,A.width,A.height),0,0):B.drawImage(A,0,0)),t}catch(A){}return t},xn.prototype.cloneNode=function(A){if(Qn(A))return document.createTextNode(A.data);if(!A.ownerDocument)return A.cloneNode(!1);var e=A.ownerDocument.defaultView;if(un(A)&&e){var t=this.createElementClone(A),r=e.getComputedStyle(A),B=e.getComputedStyle(A,":before"),n=e.getComputedStyle(A,":after");this.referenceElement===A&&(this.clonedReferenceElement=t),En(t)&&$n(t);for(var s=this.counters.parse(new wB(r)),o=this.resolvePseudoContent(A,t,B,Ln.BEFORE),i=A.firstChild;i;i=i.nextSibling)wn(i)&&("SCRIPT"===i.tagName||i.hasAttribute(_n)||"function"==typeof this.options.ignoreElements&&this.options.ignoreElements(i))||this.options.copyStyles&&wn(i)&&rn(i)||t.appendChild(this.cloneNode(i));o&&t.insertBefore(o,t.firstChild);var a=this.resolvePseudoContent(A,t,n,Ln.AFTER);return a&&t.appendChild(a),this.counters.pop(s),r&&this.options.copyStyles&&!Hn(A)&&Gn(r,t),0===A.scrollTop&&0===A.scrollLeft||this.scrolledElements.push([t,A.scrollLeft,A.scrollTop]),(dn(A)||fn(A))&&(dn(t)||fn(t))&&(t.value=A.value),t}return A.cloneNode(!1)},xn.prototype.resolvePseudoContent=function(U,A,e,t){var l=this;if(e){var r=e.content,C=A.ownerDocument;if(C&&r&&"none"!==r&&"-moz-alt-content"!==r&&"none"!==e.display){this.counters.parse(new wB(e));var g=new QB(e),E=C.createElement("html2canvaspseudoelement");return Gn(e,E),g.content.forEach(function(A){if(A.type===sA.STRING_TOKEN)E.appendChild(C.createTextNode(A.value));else if(A.type===sA.URL_TOKEN){var e=C.createElement("img");e.src=A.value,e.style.opacity="1",E.appendChild(e)}else if(A.type===sA.FUNCTION){if("attr"===A.name){var t=A.values.filter(zA);t.length&&E.appendChild(C.createTextNode(U.getAttribute(t[0].value)||""))}else if("counter"===A.name){var r=A.values.filter(kA),B=r[0],n=r[1];if(B&&zA(B)){var s=l.counters.getCounterValue(B.value),o=n&&zA(n)?ir.parse(n.value):tr.DECIMAL;E.appendChild(C.createTextNode(yn(s,o,!1)))}}else if("counters"===A.name){var i=A.values.filter(kA),a=(B=i[0],i[1]);if(n=i[2],B&&zA(B)){var c=l.counters.getCounterValues(B.value),Q=n&&zA(n)?ir.parse(n.value):tr.DECIMAL,w=a&&a.type===sA.STRING_TOKEN?a.value:"",u=c.map(function(A){return yn(A,Q,!1)}).join(w);E.appendChild(C.createTextNode(u))}}}else if(A.type===sA.IDENT_TOKEN)switch(A.value){case"open-quote":E.appendChild(C.createTextNode(eB(g.quotes,l.quoteDepth++,!0)));break;case"close-quote":E.appendChild(C.createTextNode(eB(g.quotes,--l.quoteDepth,!1)))}}),E.className=qn+" "+Zn,A.className+=t===Ln.BEFORE?" "+qn:" "+Zn,E}}},xn);function xn(A,e){if(this.options=e,this.scrolledElements=[],this.referenceElement=A,this.counters=new pn,this.quoteDepth=0,!A.ownerDocument)throw new Error("Cloned element does not have an owner document");this.documentElement=this.cloneNode(A.ownerDocument.documentElement)}(On=Ln||(Ln={}))[On.BEFORE=0]="BEFORE",On[On.AFTER=1]="AFTER";var Vn,zn,Xn=function(A,e){var t=A.createElement("iframe");return t.className="html2canvas-container",t.style.visibility="hidden",t.style.position="fixed",t.style.left="-10000px",t.style.top="0px",t.style.border="0",t.width=e.width.toString(),t.height=e.height.toString(),t.scrolling="no",t.setAttribute(_n,"true"),A.body.appendChild(t),t},Jn=function(B){return new Promise(function(e,A){var t=B.contentWindow;if(!t)return A("No window assigned for iframe");var r=t.document;t.onload=B.onload=r.onreadystatechange=function(){t.onload=B.onload=r.onreadystatechange=null;var A=setInterval(function(){0<r.body.childNodes.length&&"complete"===r.readyState&&(clearInterval(A),e(B))},50)}})},Gn=function(A,e){for(var t=A.length-1;0<=t;t--){var r=A.item(t);"content"!==r&&e.style.setProperty(r,A.getPropertyValue(r))}return e},kn=function(A){var e="";return A&&(e+="<!DOCTYPE ",A.name&&(e+=A.name),A.internalSubset&&(e+=A.internalSubset),A.publicId&&(e+='"'+A.publicId+'"'),A.systemId&&(e+='"'+A.systemId+'"'),e+=">"),e},Wn=function(A,e,t){A&&A.defaultView&&(e!==A.defaultView.pageXOffset||t!==A.defaultView.pageYOffset)&&A.defaultView.scrollTo(e,t)},Yn=function(A){var e=A[0],t=A[1],r=A[2];e.scrollLeft=t,e.scrollTop=r},qn="___html2canvas___pseudoelement_before",Zn="___html2canvas___pseudoelement_after",jn='{\n    content: "" !important;\n    display: none !important;\n}',$n=function(A){As(A,"."+qn+":before"+jn+"\n         ."+Zn+":after"+jn)},As=function(A,e){var t=A.ownerDocument;if(t){var r=t.createElement("style");r.textContent=e,A.appendChild(r)}};(zn=Vn||(Vn={}))[zn.VECTOR=0]="VECTOR",zn[zn.BEZIER_CURVE=1]="BEZIER_CURVE";function es(A,t){return A.length===t.length&&A.some(function(A,e){return A===t[e]})}var ts=(rs.prototype.add=function(A,e){return new rs(this.x+A,this.y+e)},rs);function rs(A,e){this.type=Vn.VECTOR,this.x=A,this.y=e}function Bs(A,e,t){return new ts(A.x+(e.x-A.x)*t,A.y+(e.y-A.y)*t)}var ns=(ss.prototype.subdivide=function(A,e){var t=Bs(this.start,this.startControl,A),r=Bs(this.startControl,this.endControl,A),B=Bs(this.endControl,this.end,A),n=Bs(t,r,A),s=Bs(r,B,A),o=Bs(n,s,A);return e?new ss(this.start,t,n,o):new ss(o,s,B,this.end)},ss.prototype.add=function(A,e){return new ss(this.start.add(A,e),this.startControl.add(A,e),this.endControl.add(A,e),this.end.add(A,e))},ss.prototype.reverse=function(){return new ss(this.end,this.endControl,this.startControl,this.start)},ss);function ss(A,e,t,r){this.type=Vn.BEZIER_CURVE,this.start=A,this.startControl=e,this.endControl=t,this.end=r}function os(A){return A.type===Vn.BEZIER_CURVE}var is,as,cs=function(A){var e=A.styles,t=A.bounds,r=jA(e.borderTopLeftRadius,t.width,t.height),B=r[0],n=r[1],s=jA(e.borderTopRightRadius,t.width,t.height),o=s[0],i=s[1],a=jA(e.borderBottomRightRadius,t.width,t.height),c=a[0],Q=a[1],w=jA(e.borderBottomLeftRadius,t.width,t.height),u=w[0],U=w[1],l=[];l.push((B+o)/t.width),l.push((u+c)/t.width),l.push((n+U)/t.height),l.push((i+Q)/t.height);var C=Math.max.apply(Math,l);1<C&&(B/=C,n/=C,o/=C,i/=C,c/=C,Q/=C,u/=C,U/=C);var g=t.width-o,E=t.height-Q,F=t.width-c,h=t.height-U,H=e.borderTopWidth,d=e.borderRightWidth,f=e.borderBottomWidth,p=e.borderLeftWidth,N=ae(e.paddingTop,A.bounds.width),K=ae(e.paddingRight,A.bounds.width),I=ae(e.paddingBottom,A.bounds.width),T=ae(e.paddingLeft,A.bounds.width);this.topLeftBorderBox=0<B||0<n?us(t.left,t.top,B,n,is.TOP_LEFT):new ts(t.left,t.top),this.topRightBorderBox=0<o||0<i?us(t.left+g,t.top,o,i,is.TOP_RIGHT):new ts(t.left+t.width,t.top),this.bottomRightBorderBox=0<c||0<Q?us(t.left+F,t.top+E,c,Q,is.BOTTOM_RIGHT):new ts(t.left+t.width,t.top+t.height),this.bottomLeftBorderBox=0<u||0<U?us(t.left,t.top+h,u,U,is.BOTTOM_LEFT):new ts(t.left,t.top+t.height),this.topLeftPaddingBox=0<B||0<n?us(t.left+p,t.top+H,Math.max(0,B-p),Math.max(0,n-H),is.TOP_LEFT):new ts(t.left+p,t.top+H),this.topRightPaddingBox=0<o||0<i?us(t.left+Math.min(g,t.width+p),t.top+H,g>t.width+p?0:o-p,i-H,is.TOP_RIGHT):new ts(t.left+t.width-d,t.top+H),this.bottomRightPaddingBox=0<c||0<Q?us(t.left+Math.min(F,t.width-p),t.top+Math.min(E,t.height+H),Math.max(0,c-d),Q-f,is.BOTTOM_RIGHT):new ts(t.left+t.width-d,t.top+t.height-f),this.bottomLeftPaddingBox=0<u||0<U?us(t.left+p,t.top+h,Math.max(0,u-p),U-f,is.BOTTOM_LEFT):new ts(t.left+p,t.top+t.height-f),this.topLeftContentBox=0<B||0<n?us(t.left+p+T,t.top+H+N,Math.max(0,B-(p+T)),Math.max(0,n-(H+N)),is.TOP_LEFT):new ts(t.left+p+T,t.top+H+N),this.topRightContentBox=0<o||0<i?us(t.left+Math.min(g,t.width+p+T),t.top+H+N,g>t.width+p+T?0:o-p+T,i-(H+N),is.TOP_RIGHT):new ts(t.left+t.width-(d+K),t.top+H+N),this.bottomRightContentBox=0<c||0<Q?us(t.left+Math.min(F,t.width-(p+T)),t.top+Math.min(E,t.height+H+N),Math.max(0,c-(d+K)),Q-(f+I),is.BOTTOM_RIGHT):new ts(t.left+t.width-(d+K),t.top+t.height-(f+I)),this.bottomLeftContentBox=0<u||0<U?us(t.left+p+T,t.top+h,Math.max(0,u-(p+T)),U-(f+I),is.BOTTOM_LEFT):new ts(t.left+p+T,t.top+t.height-(f+I))};(as=is||(is={}))[as.TOP_LEFT=0]="TOP_LEFT",as[as.TOP_RIGHT=1]="TOP_RIGHT",as[as.BOTTOM_RIGHT=2]="BOTTOM_RIGHT",as[as.BOTTOM_LEFT=3]="BOTTOM_LEFT";function Qs(A){return[A.topLeftBorderBox,A.topRightBorderBox,A.bottomRightBorderBox,A.bottomLeftBorderBox]}function ws(A){return[A.topLeftPaddingBox,A.topRightPaddingBox,A.bottomRightPaddingBox,A.bottomLeftPaddingBox]}var us=function(A,e,t,r,B){var n=(Math.sqrt(2)-1)/3*4,s=t*n,o=r*n,i=A+t,a=e+r;switch(B){case is.TOP_LEFT:return new ns(new ts(A,a),new ts(A,a-o),new ts(i-s,e),new ts(i,e));case is.TOP_RIGHT:return new ns(new ts(A,e),new ts(A+s,e),new ts(i,a-o),new ts(i,a));case is.BOTTOM_RIGHT:return new ns(new ts(i,e),new ts(i,e+o),new ts(A+s,a),new ts(A,a));case is.BOTTOM_LEFT:default:return new ns(new ts(i,a),new ts(i-s,a),new ts(A,e+o),new ts(A,e))}},Us=function(A,e,t){this.type=0,this.offsetX=A,this.offsetY=e,this.matrix=t,this.target=6},ls=function(A,e){this.type=1,this.target=e,this.path=A},Cs=function(A){this.element=A,this.inlineLevel=[],this.nonInlineLevel=[],this.negativeZIndex=[],this.zeroOrAutoZIndexOrTransformedOrOpacity=[],this.positiveZIndex=[],this.nonPositionedFloats=[],this.nonPositionedInlineLevel=[]},gs=(Es.prototype.getParentEffects=function(){var A=this.effects.slice(0);if(this.container.styles.overflowX!==sr.VISIBLE){var e=Qs(this.curves),t=ws(this.curves);es(e,t)||A.push(new ls(t,6))}return A},Es);function Es(A,e){if(this.container=A,this.effects=e.slice(0),this.curves=new cs(A),null!==A.styles.transform){var t=A.bounds.left+A.styles.transformOrigin[0].number,r=A.bounds.top+A.styles.transformOrigin[1].number,B=A.styles.transform;this.effects.push(new Us(t,r,B))}if(A.styles.overflowX!==sr.VISIBLE){var n=Qs(this.curves),s=ws(this.curves);es(n,s)?this.effects.push(new ls(n,6)):(this.effects.push(new ls(n,2)),this.effects.push(new ls(s,4)))}}function Fs(A){var e=A.bounds,t=A.styles;return e.add(t.borderLeftWidth,t.borderTopWidth,-(t.borderRightWidth+t.borderLeftWidth),-(t.borderTopWidth+t.borderBottomWidth))}function hs(A){var e=A.styles,t=A.bounds,r=ae(e.paddingLeft,t.width),B=ae(e.paddingRight,t.width),n=ae(e.paddingTop,t.width),s=ae(e.paddingBottom,t.width);return t.add(r+e.borderLeftWidth,n+e.borderTopWidth,-(e.borderRightWidth+e.borderLeftWidth+r+B),-(e.borderTopWidth+e.borderBottomWidth+n+s))}function Hs(A,e,t){var r=function(A,e){return 0===A?e.bounds:2===A?hs(e):Fs(e)}(Ts(A.styles.backgroundOrigin,e),A),B=function(A,e){return A===Ee.BORDER_BOX?e.bounds:A===Ee.CONTENT_BOX?hs(e):Fs(e)}(Ts(A.styles.backgroundClip,e),A),n=Is(Ts(A.styles.backgroundSize,e),t,r),s=n[0],o=n[1],i=jA(Ts(A.styles.backgroundPosition,e),r.width-s,r.height-o);return[ms(Ts(A.styles.backgroundRepeat,e),i,n,r,B),Math.round(r.left+i[0]),Math.round(r.top+i[1]),s,o]}function ds(A){return zA(A)&&A.value===Ut.AUTO}function fs(A){return"number"==typeof A}var ps=function(c,Q,w,u){c.container.elements.forEach(function(A){var e=AB(A.flags,4),t=AB(A.flags,2),r=new gs(A,c.getParentEffects());AB(A.styles.display,2048)&&u.push(r);var B=AB(A.flags,8)?[]:u;if(e||t){var n=e||A.styles.isPositioned()?w:Q,s=new Cs(r);if(A.styles.isPositioned()||A.styles.opacity<1||A.styles.isTransformed()){var o=A.styles.zIndex.order;if(o<0){var i=0;n.negativeZIndex.some(function(A,e){return o>A.element.container.styles.zIndex.order?(i=e,!1):0<i}),n.negativeZIndex.splice(i,0,s)}else if(0<o){var a=0;n.positiveZIndex.some(function(A,e){return o>A.element.container.styles.zIndex.order?(a=e+1,!1):0<a}),n.positiveZIndex.splice(a,0,s)}else n.zeroOrAutoZIndexOrTransformedOrOpacity.push(s)}else A.styles.isFloating()?n.nonPositionedFloats.push(s):n.nonPositionedInlineLevel.push(s);ps(r,s,e?s:w,B)}else A.styles.isInlineLevel()?Q.inlineLevel.push(r):Q.nonInlineLevel.push(r),ps(r,Q,w,B);AB(A.flags,8)&&Ns(A,B)})},Ns=function(A,e){for(var t=A instanceof bB?A.start:1,r=A instanceof bB&&A.reversed,B=0;B<e.length;B++){var n=e[B];n.container instanceof vB&&"number"==typeof n.container.value&&0!==n.container.value&&(t=n.container.value),n.listValue=yn(t,n.container.styles.listStyleType,!0),t+=r?-1:1}},Ks=function(A,e,t,r){var B=[];return os(A)?B.push(A.subdivide(.5,!1)):B.push(A),os(t)?B.push(t.subdivide(.5,!0)):B.push(t),os(r)?B.push(r.subdivide(.5,!0).reverse()):B.push(r),os(e)?B.push(e.subdivide(.5,!1).reverse()):B.push(e),B},Is=function(A,e,t){var r=e[0],B=e[1],n=e[2],s=A[0],o=A[1];if(qA(s)&&o&&qA(o))return[ae(s,t.width),ae(o,t.height)];var i=fs(n);if(zA(s)&&(s.value===Ut.CONTAIN||s.value===Ut.COVER))return fs(n)?t.width/t.height<n!=(s.value===Ut.COVER)?[t.width,t.width/n]:[t.height*n,t.height]:[t.width,t.height];var a=fs(r),c=fs(B),Q=a||c;if(ds(s)&&(!o||ds(o)))return a&&c?[r,B]:i||Q?Q&&i?[a?r:B*n,c?B:r/n]:[a?r:t.width,c?B:t.height]:[t.width,t.height];if(i){var w=0,u=0;return qA(s)?w=ae(s,t.width):qA(o)&&(u=ae(o,t.height)),ds(s)?w=u*n:o&&!ds(o)||(u=w/n),[w,u]}var U=null,l=null;if(qA(s)?U=ae(s,t.width):o&&qA(o)&&(l=ae(o,t.height)),null===U||o&&!ds(o)||(l=a&&c?U/r*B:t.height),null!==l&&ds(s)&&(U=a&&c?l/B*r:t.width),null!==U&&null!==l)return[U,l];throw new Error("Unable to calculate background-size for element")},Ts=function(A,e){var t=A[e];return void 0===t?A[0]:t},ms=function(A,e,t,r,B){var n=e[0],s=e[1],o=t[0],i=t[1];switch(A){case it.REPEAT_X:return[new ts(Math.round(r.left),Math.round(r.top+s)),new ts(Math.round(r.left+r.width),Math.round(r.top+s)),new ts(Math.round(r.left+r.width),Math.round(i+r.top+s)),new ts(Math.round(r.left),Math.round(i+r.top+s))];case it.REPEAT_Y:return[new ts(Math.round(r.left+n),Math.round(r.top)),new ts(Math.round(r.left+n+o),Math.round(r.top)),new ts(Math.round(r.left+n+o),Math.round(r.height+r.top)),new ts(Math.round(r.left+n),Math.round(r.height+r.top))];case it.NO_REPEAT:return[new ts(Math.round(r.left+n),Math.round(r.top+s)),new ts(Math.round(r.left+n+o),Math.round(r.top+s)),new ts(Math.round(r.left+n+o),Math.round(r.top+s+i)),new ts(Math.round(r.left+n),Math.round(r.top+s+i))];default:return[new ts(Math.round(B.left),Math.round(B.top)),new ts(Math.round(B.left+B.width),Math.round(B.top)),new ts(Math.round(B.left+B.width),Math.round(B.height+B.top)),new ts(Math.round(B.left),Math.round(B.height+B.top))]}},Rs="Hidden Text",Ls=(Os.prototype.parseMetrics=function(A,e){var t=this._document.createElement("div"),r=this._document.createElement("img"),B=this._document.createElement("span"),n=this._document.body;t.style.visibility="hidden",t.style.fontFamily=A,t.style.fontSize=e,t.style.margin="0",t.style.padding="0",n.appendChild(t),r.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",r.width=1,r.height=1,r.style.margin="0",r.style.padding="0",r.style.verticalAlign="baseline",B.style.fontFamily=A,B.style.fontSize=e,B.style.margin="0",B.style.padding="0",B.appendChild(this._document.createTextNode(Rs)),t.appendChild(B),t.appendChild(r);var s=r.offsetTop-B.offsetTop+2;t.removeChild(B),t.appendChild(this._document.createTextNode(Rs)),t.style.lineHeight="normal",r.style.verticalAlign="super";var o=r.offsetTop-t.offsetTop+2;return n.removeChild(t),{baseline:s,middle:o}},Os.prototype.getMetrics=function(A,e){var t=A+" "+e;return void 0===this._data[t]&&(this._data[t]=this.parseMetrics(A,e)),this._data[t]},Os);function Os(A){this._data={},this._document=A}var vs=(Ds.prototype.applyEffects=function(A,e){for(var t=this;this._activeEffects.length;)this.popEffect();A.filter(function(A){return AB(A.target,e)}).forEach(function(A){return t.applyEffect(A)})},Ds.prototype.applyEffect=function(A){this.ctx.save(),function(A){return 0===A.type}(A)&&(this.ctx.translate(A.offsetX,A.offsetY),this.ctx.transform(A.matrix[0],A.matrix[1],A.matrix[2],A.matrix[3],A.matrix[4],A.matrix[5]),this.ctx.translate(-A.offsetX,-A.offsetY)),function(A){return 1===A.type}(A)&&(this.path(A.path),this.ctx.clip()),this._activeEffects.push(A)},Ds.prototype.popEffect=function(){this._activeEffects.pop(),this.ctx.restore()},Ds.prototype.renderStack=function(t){return B(this,void 0,void 0,function(){var e;return b(this,function(A){switch(A.label){case 0:return(e=t.element.container.styles).isVisible()?(this.ctx.globalAlpha=e.opacity,[4,this.renderStackContent(t)]):[3,2];case 1:A.sent(),A.label=2;case 2:return[2]}})})},Ds.prototype.renderNode=function(e){return B(this,void 0,void 0,function(){return b(this,function(A){switch(A.label){case 0:return e.container.styles.isVisible()?[4,this.renderNodeBackgroundAndBorders(e)]:[3,3];case 1:return A.sent(),[4,this.renderNodeContent(e)];case 2:A.sent(),A.label=3;case 3:return[2]}})})},Ds.prototype.renderTextWithLetterSpacing=function(t,A){var r=this;0===A?this.ctx.fillText(t.text,t.bounds.left,t.bounds.top+t.bounds.height):c(t.text).map(function(A){return l(A)}).reduce(function(A,e){return r.ctx.fillText(e,A,t.bounds.top+t.bounds.height),A+r.ctx.measureText(e).width},t.bounds.left)},Ds.prototype.createFontStyle=function(A){var e=A.fontVariant.filter(function(A){return"normal"===A||"small-caps"===A}).join(""),t=A.fontFamily.join(", "),r=xA(A.fontSize)?""+A.fontSize.number+A.fontSize.unit:A.fontSize.number+"px";return[[A.fontStyle,e,A.fontWeight,r,t].join(" "),t,r]},Ds.prototype.renderTextNode=function(r,o){return B(this,void 0,void 0,function(){var e,t,B,n,s=this;return b(this,function(A){return e=this.createFontStyle(o),t=e[0],B=e[1],n=e[2],this.ctx.font=t,r.textBounds.forEach(function(r){s.ctx.fillStyle=te(o.color),s.renderTextWithLetterSpacing(r,o.letterSpacing);var A=o.textShadow;A.length&&r.text.trim().length&&(A.slice(0).reverse().forEach(function(A){s.ctx.shadowColor=te(A.color),s.ctx.shadowOffsetX=A.offsetX.number*s.options.scale,s.ctx.shadowOffsetY=A.offsetY.number*s.options.scale,s.ctx.shadowBlur=A.blur.number,s.ctx.fillText(r.text,r.bounds.left,r.bounds.top+r.bounds.height)}),s.ctx.shadowColor="",s.ctx.shadowOffsetX=0,s.ctx.shadowOffsetY=0,s.ctx.shadowBlur=0),o.textDecorationLine.length&&(s.ctx.fillStyle=te(o.textDecorationColor||o.color),o.textDecorationLine.forEach(function(A){switch(A){case 1:var e=s.fontMetrics.getMetrics(B,n).baseline;s.ctx.fillRect(r.bounds.left,Math.round(r.bounds.top+e),r.bounds.width,1);break;case 2:s.ctx.fillRect(r.bounds.left,Math.round(r.bounds.top),r.bounds.width,1);break;case 3:var t=s.fontMetrics.getMetrics(B,n).middle;s.ctx.fillRect(r.bounds.left,Math.ceil(r.bounds.top+t),r.bounds.width,1)}}))}),[2]})})},Ds.prototype.renderReplacedElement=function(A,e,t){if(t&&0<A.intrinsicWidth&&0<A.intrinsicHeight){var r=hs(A),B=ws(e);this.path(B),this.ctx.save(),this.ctx.clip(),this.ctx.drawImage(t,0,0,A.intrinsicWidth,A.intrinsicHeight,r.left,r.top,r.width,r.height),this.ctx.restore()}},Ds.prototype.renderNodeContent=function(l){return B(this,void 0,void 0,function(){var e,t,r,B,n,s,o,i,a,c,Q,w,u,U;return b(this,function(A){switch(A.label){case 0:this.applyEffects(l.effects,4),e=l.container,t=l.curves,r=e.styles,B=0,n=e.textNodes,A.label=1;case 1:return B<n.length?(s=n[B],[4,this.renderTextNode(s,r)]):[3,4];case 2:A.sent(),A.label=3;case 3:return B++,[3,1];case 4:if(!(e instanceof pB))return[3,8];A.label=5;case 5:return A.trys.push([5,7,,8]),[4,this.options.cache.match(e.src)];case 6:return w=A.sent(),this.renderReplacedElement(e,t,w),[3,8];case 7:return A.sent(),De.getInstance(this.options.id).error("Error loading image "+e.src),[3,8];case 8:if(e instanceof IB&&this.renderReplacedElement(e,t,e.canvas),!(e instanceof RB))return[3,12];A.label=9;case 9:return A.trys.push([9,11,,12]),[4,this.options.cache.match(e.svg)];case 10:return w=A.sent(),this.renderReplacedElement(e,t,w),[3,12];case 11:return A.sent(),De.getInstance(this.options.id).error("Error loading svg "+e.svg.substring(0,255)),[3,12];case 12:return e instanceof en&&e.tree?[4,new Ds({id:this.options.id,scale:this.options.scale,backgroundColor:e.backgroundColor,x:0,y:0,scrollX:0,scrollY:0,width:e.width,height:e.height,cache:this.options.cache,windowWidth:e.width,windowHeight:e.height}).render(e.tree)]:[3,14];case 13:o=A.sent(),e.width&&e.height&&this.ctx.drawImage(o,0,0,e.width,e.height,e.bounds.left,e.bounds.top,e.bounds.width,e.bounds.height),A.label=14;case 14:if(e instanceof JB&&(i=Math.min(e.bounds.width,e.bounds.height),e.type===xB?e.checked&&(this.ctx.save(),this.path([new ts(e.bounds.left+.39363*i,e.bounds.top+.79*i),new ts(e.bounds.left+.16*i,e.bounds.top+.5549*i),new ts(e.bounds.left+.27347*i,e.bounds.top+.44071*i),new ts(e.bounds.left+.39694*i,e.bounds.top+.5649*i),new ts(e.bounds.left+.72983*i,e.bounds.top+.23*i),new ts(e.bounds.left+.84*i,e.bounds.top+.34085*i),new ts(e.bounds.left+.39363*i,e.bounds.top+.79*i)]),this.ctx.fillStyle=te(XB),this.ctx.fill(),this.ctx.restore()):e.type===VB&&e.checked&&(this.ctx.save(),this.ctx.beginPath(),this.ctx.arc(e.bounds.left+i/2,e.bounds.top+i/2,i/4,0,2*Math.PI,!0),this.ctx.fillStyle=te(XB),this.ctx.fill(),this.ctx.restore())),Ss(e)&&e.value.length){switch(this.ctx.font=this.createFontStyle(r)[0],this.ctx.fillStyle=te(r.color),this.ctx.textBaseline="middle",this.ctx.textAlign=Ms(e.styles.textAlign),U=hs(e),a=0,e.styles.textAlign){case Cr.CENTER:a+=U.width/2;break;case Cr.RIGHT:a+=U.width}c=U.add(a,0,0,-U.height/2+1),this.ctx.save(),this.path([new ts(U.left,U.top),new ts(U.left+U.width,U.top),new ts(U.left+U.width,U.top+U.height),new ts(U.left,U.top+U.height)]),this.ctx.clip(),this.renderTextWithLetterSpacing(new lB(e.value,c),r.letterSpacing),this.ctx.restore(),this.ctx.textBaseline="bottom",this.ctx.textAlign="left"}if(!AB(e.styles.display,2048))return[3,20];if(null===e.styles.listStyleImage)return[3,19];if((Q=e.styles.listStyleImage).type!==xe.URL)return[3,18];w=void 0,u=Q.url,A.label=15;case 15:return A.trys.push([15,17,,18]),[4,this.options.cache.match(u)];case 16:return w=A.sent(),this.ctx.drawImage(w,e.bounds.left-(w.width+10),e.bounds.top),[3,18];case 17:return A.sent(),De.getInstance(this.options.id).error("Error loading list-style-image "+u),[3,18];case 18:return[3,20];case 19:l.listValue&&e.styles.listStyleType!==tr.NONE&&(this.ctx.font=this.createFontStyle(r)[0],this.ctx.fillStyle=te(r.color),this.ctx.textBaseline="middle",this.ctx.textAlign="right",U=new I(e.bounds.left,e.bounds.top+ae(e.styles.paddingTop,e.bounds.width),e.bounds.width,function(A,e){return zA(A)&&"normal"===A.value?1.2*e:A.type===sA.NUMBER_TOKEN?e*A.number:qA(A)?ae(A,e):e}(r.lineHeight,r.fontSize.number)/2+1),this.renderTextWithLetterSpacing(new lB(l.listValue,U),r.letterSpacing),this.ctx.textBaseline="bottom",this.ctx.textAlign="left"),A.label=20;case 20:return[2]}})})},Ds.prototype.renderStackContent=function(C){return B(this,void 0,void 0,function(){var e,t,r,B,n,s,o,i,a,c,Q,w,u,U,l;return b(this,function(A){switch(A.label){case 0:return[4,this.renderNodeBackgroundAndBorders(C.element)];case 1:A.sent(),e=0,t=C.negativeZIndex,A.label=2;case 2:return e<t.length?(l=t[e],[4,this.renderStack(l)]):[3,5];case 3:A.sent(),A.label=4;case 4:return e++,[3,2];case 5:return[4,this.renderNodeContent(C.element)];case 6:A.sent(),r=0,B=C.nonInlineLevel,A.label=7;case 7:return r<B.length?(l=B[r],[4,this.renderNode(l)]):[3,10];case 8:A.sent(),A.label=9;case 9:return r++,[3,7];case 10:n=0,s=C.nonPositionedFloats,A.label=11;case 11:return n<s.length?(l=s[n],[4,this.renderStack(l)]):[3,14];case 12:A.sent(),A.label=13;case 13:return n++,[3,11];case 14:o=0,i=C.nonPositionedInlineLevel,A.label=15;case 15:return o<i.length?(l=i[o],[4,this.renderStack(l)]):[3,18];case 16:A.sent(),A.label=17;case 17:return o++,[3,15];case 18:a=0,c=C.inlineLevel,A.label=19;case 19:return a<c.length?(l=c[a],[4,this.renderNode(l)]):[3,22];case 20:A.sent(),A.label=21;case 21:return a++,[3,19];case 22:Q=0,w=C.zeroOrAutoZIndexOrTransformedOrOpacity,A.label=23;case 23:return Q<w.length?(l=w[Q],[4,this.renderStack(l)]):[3,26];case 24:A.sent(),A.label=25;case 25:return Q++,[3,23];case 26:u=0,U=C.positiveZIndex,A.label=27;case 27:return u<U.length?(l=U[u],[4,this.renderStack(l)]):[3,30];case 28:A.sent(),A.label=29;case 29:return u++,[3,27];case 30:return[2]}})})},Ds.prototype.mask=function(A){this.ctx.beginPath(),this.ctx.moveTo(0,0),this.ctx.lineTo(this.canvas.width,0),this.ctx.lineTo(this.canvas.width,this.canvas.height),this.ctx.lineTo(0,this.canvas.height),this.ctx.lineTo(0,0),this.formatPath(A.slice(0).reverse()),this.ctx.closePath()},Ds.prototype.path=function(A){this.ctx.beginPath(),this.formatPath(A),this.ctx.closePath()},Ds.prototype.formatPath=function(A){var r=this;A.forEach(function(A,e){var t=os(A)?A.start:A;0===e?r.ctx.moveTo(t.x,t.y):r.ctx.lineTo(t.x,t.y),os(A)&&r.ctx.bezierCurveTo(A.startControl.x,A.startControl.y,A.endControl.x,A.endControl.y,A.end.x,A.end.y)})},Ds.prototype.renderRepeat=function(A,e,t,r){this.path(A),this.ctx.fillStyle=e,this.ctx.translate(t,r),this.ctx.fill(),this.ctx.translate(-t,-r)},Ds.prototype.resizeImage=function(A,e,t){if(A.width===e&&A.height===t)return A;var r=this.canvas.ownerDocument.createElement("canvas");return r.width=e,r.height=t,r.getContext("2d").drawImage(A,0,0,A.width,A.height,0,0,e,t),r},Ds.prototype.renderBackgroundImage=function(S){return B(this,void 0,void 0,function(){var v,e,D,t,r,B;return b(this,function(A){switch(A.label){case 0:v=S.styles.backgroundImage.length-1,e=function(e){var t,r,B,n,s,o,i,a,c,Q,w,u,U,l,C,g,E,F,h,H,d,f,p,N,K,I,T,m,R,L,O;return b(this,function(A){switch(A.label){case 0:if(e.type!==xe.URL)return[3,5];t=void 0,r=e.url,A.label=1;case 1:return A.trys.push([1,3,,4]),[4,D.options.cache.match(r)];case 2:return t=A.sent(),[3,4];case 3:return A.sent(),De.getInstance(D.options.id).error("Error loading background-image "+r),[3,4];case 4:return t&&(B=Hs(S,v,[t.width,t.height,t.width/t.height]),g=B[0],f=B[1],p=B[2],h=B[3],H=B[4],l=D.ctx.createPattern(D.resizeImage(t,h,H),"repeat"),D.renderRepeat(g,l,f,p)),[3,6];case 5:!function(A){return A.type===xe.LINEAR_GRADIENT}(e)?function(A){return A.type===xe.RADIAL_GRADIENT}(e)&&(C=Hs(S,v,[null,null,null]),g=C[0],E=C[1],F=C[2],h=C[3],H=C[4],d=0===e.position.length?[oe]:e.position,f=ae(d[0],h),p=ae(d[d.length-1],H),N=function(A,e,t,r,B){var n=0,s=0;switch(A.size){case nt.CLOSEST_SIDE:A.shape===rt.CIRCLE?n=s=Math.min(Math.abs(e),Math.abs(e-r),Math.abs(t),Math.abs(t-B)):A.shape===rt.ELLIPSE&&(n=Math.min(Math.abs(e),Math.abs(e-r)),s=Math.min(Math.abs(t),Math.abs(t-B)));break;case nt.CLOSEST_CORNER:if(A.shape===rt.CIRCLE)n=s=Math.min(Ne(e,t),Ne(e,t-B),Ne(e-r,t),Ne(e-r,t-B));else if(A.shape===rt.ELLIPSE){var o=Math.min(Math.abs(t),Math.abs(t-B))/Math.min(Math.abs(e),Math.abs(e-r)),i=Ke(r,B,e,t,!0),a=i[0],c=i[1];s=o*(n=Ne(a-e,(c-t)/o))}break;case nt.FARTHEST_SIDE:A.shape===rt.CIRCLE?n=s=Math.max(Math.abs(e),Math.abs(e-r),Math.abs(t),Math.abs(t-B)):A.shape===rt.ELLIPSE&&(n=Math.max(Math.abs(e),Math.abs(e-r)),s=Math.max(Math.abs(t),Math.abs(t-B)));break;case nt.FARTHEST_CORNER:if(A.shape===rt.CIRCLE)n=s=Math.max(Ne(e,t),Ne(e,t-B),Ne(e-r,t),Ne(e-r,t-B));else if(A.shape===rt.ELLIPSE){o=Math.max(Math.abs(t),Math.abs(t-B))/Math.max(Math.abs(e),Math.abs(e-r));var Q=Ke(r,B,e,t,!1);a=Q[0],c=Q[1],s=o*(n=Ne(a-e,(c-t)/o))}}return Array.isArray(A.size)&&(n=ae(A.size[0],r),s=2===A.size.length?ae(A.size[1],B):n),[n,s]}(e,f,p,h,H),K=N[0],I=N[1],0<K&&0<K&&(T=D.ctx.createRadialGradient(E+f,F+p,0,E+f,F+p,K),fe(e.stops,2*K).forEach(function(A){return T.addColorStop(A.stop,te(A.color))}),D.path(g),D.ctx.fillStyle=T,K!==I?(m=S.bounds.left+.5*S.bounds.width,R=S.bounds.top+.5*S.bounds.height,O=1/(L=I/K),D.ctx.save(),D.ctx.translate(m,R),D.ctx.transform(1,0,0,L,0,0),D.ctx.translate(-m,-R),D.ctx.fillRect(E,O*(F-R)+R,h,H*O),D.ctx.restore()):D.ctx.fill())):(n=Hs(S,v,[null,null,null]),g=n[0],f=n[1],p=n[2],h=n[3],H=n[4],s=pe(e.angle,h,H),o=s[0],i=s[1],a=s[2],c=s[3],Q=s[4],(w=document.createElement("canvas")).width=h,w.height=H,u=w.getContext("2d"),U=u.createLinearGradient(i,c,a,Q),fe(e.stops,o).forEach(function(A){return U.addColorStop(A.stop,te(A.color))}),u.fillStyle=U,u.fillRect(0,0,h,H),0<h&&0<H&&(l=D.ctx.createPattern(w,"repeat"),D.renderRepeat(g,l,f,p))),A.label=6;case 6:return v--,[2]}})},D=this,t=0,r=S.styles.backgroundImage.slice(0).reverse(),A.label=1;case 1:return t<r.length?(B=r[t],[5,e(B)]):[3,4];case 2:A.sent(),A.label=3;case 3:return t++,[3,1];case 4:return[2]}})})},Ds.prototype.renderBorder=function(e,t,r){return B(this,void 0,void 0,function(){return b(this,function(A){return this.path(function(A,e){switch(e){case 0:return Ks(A.topLeftBorderBox,A.topLeftPaddingBox,A.topRightBorderBox,A.topRightPaddingBox);case 1:return Ks(A.topRightBorderBox,A.topRightPaddingBox,A.bottomRightBorderBox,A.bottomRightPaddingBox);case 2:return Ks(A.bottomRightBorderBox,A.bottomRightPaddingBox,A.bottomLeftBorderBox,A.bottomLeftPaddingBox);case 3:default:return Ks(A.bottomLeftBorderBox,A.bottomLeftPaddingBox,A.topLeftBorderBox,A.topLeftPaddingBox)}}(r,t)),this.ctx.fillStyle=te(e),this.ctx.fill(),[2]})})},Ds.prototype.renderNodeBackgroundAndBorders=function(c){return B(this,void 0,void 0,function(){var e,t,r,B,n,s,o,i,a=this;return b(this,function(A){switch(A.label){case 0:return this.applyEffects(c.effects,2),e=c.container.styles,t=!ee(e.backgroundColor)||e.backgroundImage.length,r=[{style:e.borderTopStyle,color:e.borderTopColor},{style:e.borderRightStyle,color:e.borderRightColor},{style:e.borderBottomStyle,color:e.borderBottomColor},{style:e.borderLeftStyle,color:e.borderLeftColor}],B=bs(Ts(e.backgroundClip,0),c.curves),t||e.boxShadow.length?(this.ctx.save(),this.path(B),this.ctx.clip(),ee(e.backgroundColor)||(this.ctx.fillStyle=te(e.backgroundColor),this.ctx.fill()),[4,this.renderBackgroundImage(c.container)]):[3,2];case 1:A.sent(),this.ctx.restore(),e.boxShadow.slice(0).reverse().forEach(function(A){a.ctx.save();var e=Qs(c.curves),t=A.inset?0:1e4,r=function(A,t,r,B,n){return A.map(function(A,e){switch(e){case 0:return A.add(t,r);case 1:return A.add(t+B,r);case 2:return A.add(t+B,r+n);case 3:return A.add(t,r+n)}return A})}(e,-t+(A.inset?1:-1)*A.spread.number,(A.inset?1:-1)*A.spread.number,A.spread.number*(A.inset?-2:2),A.spread.number*(A.inset?-2:2));A.inset?(a.path(e),a.ctx.clip(),a.mask(r)):(a.mask(e),a.ctx.clip(),a.path(r)),a.ctx.shadowOffsetX=A.offsetX.number+t,a.ctx.shadowOffsetY=A.offsetY.number,a.ctx.shadowColor=te(A.color),a.ctx.shadowBlur=A.blur.number,a.ctx.fillStyle=A.inset?te(A.color):"rgba(0,0,0,1)",a.ctx.fill(),a.ctx.restore()}),A.label=2;case 2:s=n=0,o=r,A.label=3;case 3:return s<o.length?(i=o[s]).style===ht.NONE||ee(i.color)?[3,5]:[4,this.renderBorder(i.color,n,c.curves)]:[3,7];case 4:A.sent(),A.label=5;case 5:n++,A.label=6;case 6:return s++,[3,3];case 7:return[2]}})})},Ds.prototype.render=function(t){return B(this,void 0,void 0,function(){var e;return b(this,function(A){switch(A.label){case 0:return this.options.backgroundColor&&(this.ctx.fillStyle=te(this.options.backgroundColor),this.ctx.fillRect(this.options.x-this.options.scrollX,this.options.y-this.options.scrollY,this.options.width,this.options.height)),e=function(A){var e=new gs(A,[]),t=new Cs(e),r=[];return ps(e,t,t,r),Ns(e.container,r),t}(t),[4,this.renderStack(e)];case 1:return A.sent(),this.applyEffects([],2),[2,this.canvas]}})})},Ds);function Ds(A){this._activeEffects=[],this.canvas=A.canvas?A.canvas:document.createElement("canvas"),this.ctx=this.canvas.getContext("2d"),this.options=A,this.canvas.width=Math.floor(A.width*A.scale),this.canvas.height=Math.floor(A.height*A.scale),this.canvas.style.width=A.width+"px",this.canvas.style.height=A.height+"px",this.fontMetrics=new Ls(document),this.ctx.scale(this.options.scale,this.options.scale),this.ctx.translate(-A.x+A.scrollX,-A.y+A.scrollY),this.ctx.textBaseline="bottom",this._activeEffects=[],De.getInstance(A.id).debug("Canvas renderer initialized ("+A.width+"x"+A.height+" at "+A.x+","+A.y+") with scale "+A.scale)}var Ss=function(A){return A instanceof ZB||(A instanceof WB||A instanceof JB&&A.type!==VB&&A.type!==xB)},bs=function(A,e){switch(A){case Ee.BORDER_BOX:return Qs(e);case Ee.CONTENT_BOX:return function(A){return[A.topLeftContentBox,A.topRightContentBox,A.bottomRightContentBox,A.bottomLeftContentBox]}(e);case Ee.PADDING_BOX:default:return ws(e)}},Ms=function(A){switch(A){case Cr.CENTER:return"center";case Cr.RIGHT:return"right";case Cr.LEFT:default:return"left"}},ys=(_s.prototype.render=function(r){return B(this,void 0,void 0,function(){var e,t;return b(this,function(A){switch(A.label){case 0:return e=Le(Math.max(this.options.windowWidth,this.options.width)*this.options.scale,Math.max(this.options.windowHeight,this.options.height)*this.options.scale,this.options.scrollX*this.options.scale,this.options.scrollY*this.options.scale,r),[4,xs(e)];case 1:return t=A.sent(),this.options.backgroundColor&&(this.ctx.fillStyle=te(this.options.backgroundColor),this.ctx.fillRect(0,0,this.options.width*this.options.scale,this.options.height*this.options.scale)),this.ctx.drawImage(t,-this.options.x*this.options.scale,-this.options.y*this.options.scale),[2,this.canvas]}})})},_s);function _s(A){this.canvas=A.canvas?A.canvas:document.createElement("canvas"),this.ctx=this.canvas.getContext("2d"),this.options=A,this.canvas.width=Math.floor(A.width*A.scale),this.canvas.height=Math.floor(A.height*A.scale),this.canvas.style.width=A.width+"px",this.canvas.style.height=A.height+"px",this.ctx.scale(this.options.scale,this.options.scale),this.ctx.translate(-A.x+A.scrollX,-A.y+A.scrollY),De.getInstance(A.id).debug("EXPERIMENTAL ForeignObject renderer initialized ("+A.width+"x"+A.height+" at "+A.x+","+A.y+") with scale "+A.scale)}function Ps(A){return we(_A.create(A).parseComponentValue())}var xs=function(r){return new Promise(function(A,e){var t=new Image;t.onload=function(){A(t)},t.onerror=e,t.src="data:image/svg+xml;charset=utf-8,"+encodeURIComponent((new XMLSerializer).serializeToString(r))})};be.setContext(window);var Vs=function(p,N){return B(void 0,void 0,void 0,function(){var e,t,r,B,n,s,o,i,a,c,Q,w,u,U,l,C,g,E,F,h,H,d,f;return b(this,function(A){switch(A.label){case 0:if(!(e=p.ownerDocument))throw new Error("Element is not attached to a Document");if(!(t=e.defaultView))throw new Error("Document is not attached to a Window");return r=(Math.round(1e3*Math.random())+Date.now()).toString(16),B=En(p)||function(A){return"HTML"===A.tagName}(p)?function(A){var e=A.body,t=A.documentElement;if(!e||!t)throw new Error("Unable to get document size");var r=Math.max(Math.max(e.scrollWidth,t.scrollWidth),Math.max(e.offsetWidth,t.offsetWidth),Math.max(e.clientWidth,t.clientWidth)),B=Math.max(Math.max(e.scrollHeight,t.scrollHeight),Math.max(e.offsetHeight,t.offsetHeight),Math.max(e.clientHeight,t.clientHeight));return new I(0,0,r,B)}(e):T(p),n=B.width,s=B.height,o=B.left,i=B.top,a=K({},{allowTaint:!1,imageTimeout:15e3,proxy:void 0,useCORS:!1},N),c={backgroundColor:"#ffffff",cache:N.cache?N.cache:be.create(r,a),logging:!0,removeContainer:!0,foreignObjectRendering:!1,scale:t.devicePixelRatio||1,windowWidth:t.innerWidth,windowHeight:t.innerHeight,scrollX:t.pageXOffset,scrollY:t.pageYOffset,x:o,y:i,width:Math.ceil(n),height:Math.ceil(s),id:r},Q=K({},c,a,N),w=new I(Q.scrollX,Q.scrollY,Q.windowWidth,Q.windowHeight),De.create(r),De.getInstance(r).debug("Starting document clone"),u=new Pn(p,{id:r,onclone:Q.onclone,ignoreElements:Q.ignoreElements,inlineImages:Q.foreignObjectRendering,copyStyles:Q.foreignObjectRendering}),(U=u.clonedReferenceElement)?[4,u.toIFrame(e,w)]:[2,Promise.reject("Unable to find element in cloned iframe")];case 1:return l=A.sent(),C=e.documentElement?Ps(getComputedStyle(e.documentElement).backgroundColor):He.TRANSPARENT,g=e.body?Ps(getComputedStyle(e.body).backgroundColor):He.TRANSPARENT,E=N.backgroundColor,F="string"==typeof E?Ps(E):null===E?He.TRANSPARENT:4294967295,h=p===e.documentElement?ee(C)?ee(g)?F:g:C:F,H={id:r,cache:Q.cache,backgroundColor:h,scale:Q.scale,x:Q.x,y:Q.y,scrollX:Q.scrollX,scrollY:Q.scrollY,width:Q.width,height:Q.height,windowWidth:Q.windowWidth,windowHeight:Q.windowHeight},Q.foreignObjectRendering?(De.getInstance(r).debug("Document cloned, using foreign object rendering"),[4,new ys(H).render(U)]):[3,3];case 2:return d=A.sent(),[3,5];case 3:return De.getInstance(r).debug("Document cloned, using computed rendering"),be.attachInstance(Q.cache),De.getInstance(r).debug("Starting DOM parsing"),f=on(U),be.detachInstance(),h===f.styles.backgroundColor&&(f.styles.backgroundColor=He.TRANSPARENT),De.getInstance(r).debug("Starting renderer"),[4,new vs(H).render(f)];case 4:d=A.sent(),A.label=5;case 5:return!0===Q.removeContainer&&(zs(l)||De.getInstance(r).error("Cannot detach cloned iframe as it is not in the DOM anymore")),De.getInstance(r).debug("Finished rendering"),De.destroy(r),be.destroy(r),[2,d]}})})},zs=function(A){return!!A.parentNode&&(A.parentNode.removeChild(A),!0)};return function(A,e){return void 0===e&&(e={}),Vs(A,e)}});
\ No newline at end of file
diff --git a/components/dyw-html2image/html2image.js b/components/dyw-html2image/html2image.js
new file mode 100644
index 0000000..b33f842
--- /dev/null
+++ b/components/dyw-html2image/html2image.js
@@ -0,0 +1,34 @@
+import html2canvas from '@/components/dyw-html2image/html2canvas.min.js'
+import canvas2Image from '@/components/dyw-html2image/canvas2image.js' // canvas源码不支持import导入，在源码的最后添加export default使得可以将canvas2image对象import进来
+
+/**
+ * html2image: 将canvas2iamge以及html2canvas结合，将html转化为image. 方便大家使用，也可以自己去下载这两个插件，单独使用。
+ * @param {Object} element : html元素，如document.body, document.getElementById('elementId')
+ * @param {Object} html2canvasObject : html2canvas所需要的参数， 具体参数可访问html2canvas网站： http://html2canvas.hertzen.com/configuration
+ * @param {String} saveType :'download'和'src'两种类型，第一种直接下载（微信中不可直接下载，被拦截）第二种返回src,可放入image标签中使用    canvas转image:  git地址： https://github.com/hongru/canvas2image
+ * @param {String} imageName : 导出的图片命名, 只有type为'download'才会生效
+ * @param {String}  type: 图片的类型： png， jpeg，gif，bmp，四种类型
+ * **/
+ var htmlToCavas =  function(element, html2canvasObject, saveType='src', type='png', imageName) {
+	 var result = new Promise(function(resolve, reject){
+		 html2canvas(element, html2canvasObject).then(canvas => {
+		 									   var imageWidth = canvas.width
+		 									   var imageHeight = canvas.height
+											   console.log(canvas.toDataURL('image/jpeg'))
+											   console.log('测试')
+		 									   if(saveType=== 'download'){
+		 										   canvas2Image.saveAsImage(canvas, imageWidth, imageHeight, imageName, type)
+													resolve()
+											   } else if(saveType === 'src'){
+		 										   var result = canvas2Image.convertToImage(canvas, imageWidth, imageHeight,type)
+		 										   console.log(result)
+												   resolve(result)
+		 									   }	   
+		 }).catch(err=> {
+			 reject(err)
+		 })
+	 })
+	return result
+ }
+ 
+export default htmlToCavas
\ No newline at end of file
diff --git a/components/dyw-html2image/readme.md b/components/dyw-html2image/readme.md
new file mode 100644
index 0000000..0d16d5a
--- /dev/null
+++ b/components/dyw-html2image/readme.md
@@ -0,0 +1,19 @@
+# html2canvas
+
+### 使用方法
+
+```
+	import htmlToCavas from '@/components/html2image/html2image'
+	
+	htmlToCavas(element, {
+						useCORS: true,
+						logging: true, 
+						backgroundColor: '#982121', 
+						scale: 2, 
+						dpi: 350}).then(res=> {
+						this.imageSrc = res.src
+					}).catch(err=> {
+						console.log(err)
+					})
+```
+
diff --git a/components/messageBox.vue b/components/messageBox.vue
new file mode 100644
index 0000000..b9bbd64
--- /dev/null
+++ b/components/messageBox.vue
@@ -0,0 +1,318 @@
+<template>
+	<view class="msgbox">
+		<!-- <view class="quick" :style="[{ background: quick ? '#fff' : 'none' }]">
+      <view class="justify-between section_7" v-if="quick">
+        <view class="flex-row">
+          <view class="flex-col items-center text-wrapper_2">
+            <text class="text">交换信息</text>
+          </view>
+          <view class="flex-col items-end text-wrapper_3">
+            <text class="text">交换联系方式</text>
+          </view>
+        </view>
+        <image
+          @click="quick = false"
+          src="/static/common/img/msgclose.png"
+          class="image_13"
+        />
+      </view>
+      <view style="display: flex; justify-content: flex-end" v-else>
+        <image
+          style="margin: 0.08rem; width: 0.2rem; height: 0.2rem"
+          @click="quick = true"
+          src="/static/common/img/msgopen.png"
+          class="image_13"
+        />
+      </view>
+    </view> -->
+		<view class="flex-row section_1">
+			<text  class="text" v-if="!isCommonWords" @click="CommonWords = !CommonWords;emoji = false;">常用语</text>
+
+			<view class="input-container">
+				<image @click="emoji = !emoji;CommonWords = false;emojicurrent = 0;" src="/static/common/img/homepage/icon-message.png" class="input-icon" />
+				<u-input class="input" :type="'textarea'" v-model="message" :auto-height="true" @click="shuru"
+					@blur="inputBlur" @focus="inputFocus" :placeholder='placeholder'/>
+			</view>
+			<!-- <u-input class="input" :type="'textarea'" v-model="message" :auto-height="true" @click="shuru"
+				@blur="inputBlur" @focus="inputFocus" :placeholder='placeholder'/> -->
+			<!-- <view class="icon" @click="emoji = !emoji;CommonWords = false;emojicurrent = 0;">
+				<image src="/static/common/img/icon.png" class="image" />
+			</view> -->
+			<view class="btn" v-if="message != ''">
+				<!-- <u-button size="mini" class="sendOut" @click="send">发送</u-button> -->
+				<image
+					src="/static/common/img/homepage/icon-send.png"
+					class="image_send"
+					@click="send"
+				/>
+			</view>
+		</view>
+		<!-- 常用语 -->
+		<view class="CommonWords">
+			<scroll-view scroll-y="true" style="transition: all 0.3s; height: 0rem" :class="CommonWords ? 'open' : ''">
+				<text v-for="(v, i) in commonWords" :key="i" @click="choice(v)">{{v}}</text>
+			</scroll-view>
+		</view>
+		<!-- emoji 表情 -->
+		<swiper class="slider" :current="emojicurrent" :class="emoji ? 'emojishow' : ''">
+			<swiper-item v-for="(item, key) in emojiData" :key="key" class="slider-emoji"
+				:class="[key == emojiData.length - 1 ? 'lastbox' : '']">
+				<text v-for="(emoji, index) in item" :key="index" @click="selemoji(emoji)"
+					class="slider-emoji-icon">{{ emoji }}</text>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	import emoji from "../static/common/js/emoji";
+	export default {
+		name: "messageBox",
+		props:['isCommonWords'],
+		data() {
+			return {
+				commonWords: [
+					'您好，很高兴认识你！',
+					'您好，有空聊一聊吗？',
+					'嗨，你好呀！',
+					'好的，我知道了。',
+					'我们下次再聊，拜拜。'
+				],
+				CommonWords: false,
+				quick: false,
+				message: "",
+				emojiData: [],
+				emoji: false,
+				inputShow: false,
+				emojicurrent: 0,
+				placeholder:"",
+			};
+		},
+		// props:['placeholder'],
+		mounted() {
+			// console.log(this.placeholder)
+			this.emojiInit();
+		},
+		created(){
+			// console.log(this.placeholder)
+		},
+		methods: {
+			outbox() {
+				alert("out");
+			},
+			emojiInit() {
+				var number = 60;
+				var page = Math.ceil(emoji.length / number);
+				for (let i = 0; i < page; i++) {
+					this.emojiData[i] = [];
+					for (let k = 0; k < number; k++) {
+						emoji[i * number + k] ?
+							this.emojiData[i].push(emoji[i * number + k]) :
+							"";
+					}
+				}
+			},
+			inputFocus() {
+				this.CommonWords = false;
+				this.emoji = false;
+				setTimeout(() => {
+					this.scrollTop += 1;
+				}, 100);
+				// console.log("inputFocus");
+			},
+			inputBlur() {
+				// console.log("inputBlur");
+			},
+			shuru() {
+				setTimeout(() => {
+					this.scrollTop += 1;
+				}, 100);
+			},
+			choice(txt) {
+				this.message = txt;
+			},
+			close() {
+				this.CommonWords = false;
+				this.emoji = false;
+			},
+			sendOut() {
+				this.close();
+			},
+			selemoji(m) {
+				this.message += m;
+			},
+			send(){
+				this.$emit('onsend',this.message)
+				this.message = ""
+				this.$emit('onmsgShow',false)
+			}
+		},
+	};
+</script>
+
+<style lang="scss">
+	.msgbox {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+
+		.section_1 {
+			width: 100%;
+			display: flex;
+			// height: 0.52rem;
+			background-color: #ffffff;
+			border: solid 0.01rem #eeeeee;
+			padding: 0.11rem 0.1rem 0.11rem 0.1rem;
+		}
+
+		.text {
+			font-size: 0.14rem;
+			line-height: 0.15rem;
+			color: #505051;
+			margin: 0 0.1rem;
+			line-height: 0.36rem;
+		}
+
+		.input {
+			width: 100%;
+			min-height: 0.36rem !important;
+			line-height: 0.36rem;
+			background-color: #f7f7f7;
+			border-radius: 0.1rem;
+			font-size: 0.14rem;
+			padding-right: 0.1rem !important;
+
+			::v-deep .u-input__input {
+				padding: 0.05rem;
+				min-height: 0.16rem !important;
+				transform: translateY(0.03rem);
+			}
+		}
+
+		.icon {
+			margin-left: 0.05rem;
+			padding: 0.03rem 0;
+		}
+
+		.btn {
+			padding: 0.03rem 0;
+
+			.sendOut {
+				height: 0.3rem;
+				line-height: 0.3rem;
+				width: 0.5rem;
+				margin-left: 0.05rem;
+				background-color: #2e9bff;
+				color: #ffffff;
+			}
+
+			.image_send {
+				width: 0.25rem;
+				height: 0.25rem;
+				margin-left: 0.05rem;
+				transform: translateY(0.03rem);
+			}
+		}
+
+		.image {
+			width: 0.26rem;
+			height: 0.26rem;
+		}
+
+		.CommonWords {
+			width: 100%;
+			background-color: #f6f7fa;
+
+			text {
+				transition: all 0.3s;
+				display: block;
+				padding: 0.1rem 0 0.1rem 0.2rem;
+				font-size: 0.14rem;
+				line-height: 0.2rem;
+				height: 0.4rem;
+				overflow: hidden;
+				color: #505051;
+			}
+
+			text:active {
+				background: #ccc;
+			}
+		}
+
+		.open {
+			height: 3rem !important;
+			transition: all 0.3s;
+		}
+
+		.input-container{
+			position: relative;
+			// width: 90%;
+			display: flex;
+			align-items: center;
+			flex: 1;
+
+			
+			.input-icon {
+				width: 0.2rem;
+				height: 0.2rem;
+				position: absolute;
+				left: 0.1rem;
+				z-index: 1;
+			}
+
+			.input {
+				width: 100%;
+				min-height: 0.36rem !important;
+				line-height: 0.36rem;
+				// background-color: #f7f7f7;
+				border-radius: 0.1rem;
+				font-size: 0.14rem;
+				padding-right: 0.1rem !important;
+				padding-left: 0.35rem !important;  /* 为左侧图标留出空间 */
+
+				::v-deep .u-input__input {
+					padding: 0.05rem;
+					min-height: 0.16rem !important;
+					transform: translateY(0.03rem);
+				}
+			}
+		}
+	}
+
+	.emojishow {
+		height: 3rem !important;
+	}
+
+	.slider {
+		background: #fff;
+		width: 7.75rem;
+		height: 0rem;
+		transition: all 0.3s;
+
+		.slider-emoji {
+			overflow-y: scroll;
+			width: 100vw !important;
+		}
+
+		&-emoji {
+			width: 6.75rem;
+			flex-direction: row;
+			flex-wrap: wrap;
+			justify-content: center;
+
+			&-icon {
+				font-size: 0.265rem;
+				display: inline-block;
+				width: 0.4rem;
+				text-align: center;
+				padding: 0.05rem 0;
+				border-radius: 0.1rem;
+				//   border-bottom: 1px solid #ccc;
+			}
+
+			&-icon:active {
+				background: #ccc;
+			}
+		}
+	}
+</style>
diff --git a/components/page-nav/page-nav.vue b/components/page-nav/page-nav.vue
new file mode 100644
index 0000000..39f118a
--- /dev/null
+++ b/components/page-nav/page-nav.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="nav-wrap">
+		<view class="nav-title">
+			<image class="logo" src="https://cdn.uviewui.com/uview/common/logo.png" mode="widthFix"></image>
+			<view class="nav-info">
+				<view class="nav-title__text">
+					{{$t('common.title')}}
+				</view>
+				<view class="nav-slogan">
+					 {{$t('common.intro')}}
+				</view>
+			</view>
+		</view>
+		<view class="nav-desc">
+			{{desc}}
+		</view>
+		<view class="lang" @tap="switchLang">
+			<u-icon size="46" color="warning" :name="lang"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			desc: String,
+			title: String,
+		},
+		computed: {
+			lang() {
+				return this.$i18n.locale == 'zh' ? 'zh' : 'en';
+			}
+		},
+		
+		methods: {
+			switchLang() {
+				this.$i18n.locale = this.$i18n.locale == 'en' ? 'zh' : 'en';
+				this.vuex_tabbar[0].text = this.$t('nav.components')
+				this.vuex_tabbar[1].text = this.$t('nav.js')
+				this.vuex_tabbar[2].text = this.$t('nav.template')
+				uni.setNavigationBarTitle({
+					title: this.$t(this.title)
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.nav-wrap {
+		padding: 15px;
+		position: relative;
+	}
+	
+	.lang {
+		position: absolute;
+		top: 15px;
+		right: 15px;
+	}
+	
+	.nav-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.nav-info {
+		margin-left: 15px;
+	}
+	
+	.nav-title__text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		color: $u-main-color;
+		font-size: 25px;
+		font-weight: bold;
+	}
+	
+	.logo {
+		width: 70px;
+		/* #ifndef APP-NVUE */
+		height: auto;
+		/* #endif */
+	}
+	
+	.nav-slogan {
+		color: $u-tips-color;
+		font-size: 14px;
+	}
+	
+	.nav-desc {
+		margin-top: 10px;
+		font-size: 14px;
+		color: $u-content-color;
+	}
+</style>
diff --git a/enums/index.js b/enums/index.js
new file mode 100644
index 0000000..e922c5d
--- /dev/null
+++ b/enums/index.js
@@ -0,0 +1,24 @@
+// 返校核验状态枚举
+
+export const AuditStateEnumMap = new Map([
+  [0, '待审核'],
+  [1, '通过'],
+  [2, '未通过'],
+])
+
+//  
+export const PrebookStateEnumMap = new Map([
+  [0, '待核验'],
+  [1, '已取消'],
+  [2, '已驳回'],
+  [3, '已核验'],
+  [4, '未返校'],
+])
+
+// 彭剑提供的枚举
+export const glyTypeEnumMap = new Map([
+  [0,'校级管理员'],
+  [1,'教职工管理员'],
+  [2,'学生管理员'],
+  [3,'普通人员'],
+])
\ No newline at end of file
diff --git a/js_sdk/wxmp-qqmap/qqmap-wx-jssdk.js b/js_sdk/wxmp-qqmap/qqmap-wx-jssdk.js
new file mode 100644
index 0000000..298e1dc
--- /dev/null
+++ b/js_sdk/wxmp-qqmap/qqmap-wx-jssdk.js
@@ -0,0 +1,462 @@
+/**
+ * 微信小程序JavaScriptSDK
+ * 
+ * @version 1.0
+ * @date 2017-01-10
+ * @author jaysonzhou@tencent.com
+ */
+
+var ERROR_CONF = {
+    KEY_ERR: 311,
+    KEY_ERR_MSG: 'key格式错误',
+    PARAM_ERR: 310,
+    PARAM_ERR_MSG: '请求参数信息有误',
+    SYSTEM_ERR: 600,
+    SYSTEM_ERR_MSG: '系统错误',
+    WX_ERR_CODE: 1000,
+    WX_OK_CODE: 200
+};
+var BASE_URL = 'https://apis.map.qq.com/ws/';
+var URL_SEARCH = BASE_URL + 'place/v1/search';
+var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion';
+var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/';
+var URL_CITY_LIST = BASE_URL + 'district/v1/list';
+var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren';
+var URL_DISTANCE = BASE_URL + 'distance/v1/';
+var Utils = {
+    /**
+     * 得到终点query字符串
+     * @param {Array|String} 检索数据
+     */
+    location2query(data) {
+        if (typeof data == 'string') {
+            return data;
+        }
+        var query = '';
+        for (var i = 0; i < data.length; i++) {
+            var d = data[i];
+            if (!!query) {
+                query += ';';
+            }
+            if (d.location) {
+                query = query + d.location.lat + ',' + d.location.lng;
+            }
+            if (d.latitude && d.longitude) {
+                query = query + d.latitude + ',' + d.longitude;
+            }
+        }
+        return query;
+    },
+
+    /**
+     * 使用微信接口进行定位
+     */
+    getWXLocation(success, fail, complete) {
+        wx.getLocation({
+            type: 'gcj02',
+            success: success,
+            fail: fail,
+            complete: complete
+        });
+    },
+
+    /**
+     * 获取location参数
+     */
+    getLocationParam(location) {
+        if (typeof location == 'string') {
+            var locationArr = location.split(',');
+            if (locationArr.length === 2) {
+                location = {
+                    latitude: location.split(',')[0],
+                    longitude: location.split(',')[1]
+                };
+            } else {
+                location = {};
+            }
+        }
+        return location;
+    },
+
+    /**
+     * 回调函数默认处理
+     */
+    polyfillParam(param) {
+        param.success = param.success || function () { };
+        param.fail = param.fail || function () { };
+        param.complete = param.complete || function () { };
+    },
+
+    /**
+     * 验证param对应的key值是否为空
+     * 
+     * @param {Object} param 接口参数
+     * @param {String} key 对应参数的key
+     */
+    checkParamKeyEmpty(param, key) {
+        if (!param[key]) {
+            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key +'参数格式有误');
+            param.fail(errconf);
+            param.complete(errconf);
+            return true;
+        }
+        return false;
+    },
+
+    /**
+     * 验证参数中是否存在检索词keyword
+     * 
+     * @param {Object} param 接口参数
+     */
+    checkKeyword(param){
+        return !this.checkParamKeyEmpty(param, 'keyword');
+    },
+
+    /**
+     * 验证location值
+     * 
+     * @param {Object} param 接口参数
+     */
+    checkLocation(param) {
+        var location = this.getLocationParam(param.location);
+        if (!location || !location.latitude || !location.longitude) {
+            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误')
+            param.fail(errconf);
+            param.complete(errconf);
+            return false;
+        }
+        return true;
+    },
+
+    /**
+     * 构造错误数据结构
+     * @param {Number} errCode 错误码
+     * @param {Number} errMsg 错误描述
+     */
+    buildErrorConfig(errCode, errMsg) {
+        return {
+            status: errCode,
+            message: errMsg
+        };
+    },
+
+    /**
+     * 构造微信请求参数，公共属性处理
+     * 
+     * @param {Object} param 接口参数
+     * @param {Object} param 配置项
+     */
+    buildWxRequestConfig(param, options) {
+        var that = this;
+        options.header = { "content-type": "application/json" };
+        options.method = 'GET';
+        options.success = function (res) {
+            var data = res.data;
+            if (data.status === 0) {
+                param.success(data);
+            } else {
+                param.fail(data);
+            }
+        };
+        options.fail = function (res) {
+            res.statusCode = ERROR_CONF.WX_ERR_CODE;
+            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, result.errMsg));
+        };
+        options.complete = function (res) {
+            var statusCode = +res.statusCode;
+            switch(statusCode) {
+                case ERROR_CONF.WX_ERR_CODE: {
+                    param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+                    break;
+                }
+                case ERROR_CONF.WX_OK_CODE: {
+                    var data = res.data;
+                    if (data.status === 0) {
+                        param.complete(data);
+                    } else {
+                        param.complete(that.buildErrorConfig(data.status, data.message));
+                    }
+                    break;
+                }
+                default:{
+                    param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG));
+                }
+
+            }
+        }
+        return options;
+    },
+
+    /**
+     * 处理用户参数是否传入坐标进行不同的处理
+     */
+    locationProcess(param, locationsuccess, locationfail, locationcomplete) {
+        var that = this;
+        locationfail = locationfail || function (res) {
+            res.statusCode = ERROR_CONF.WX_ERR_CODE;
+            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+        };
+        locationcomplete = locationcomplete || function (res) {
+            if (res.statusCode == ERROR_CONF.WX_ERR_CODE) {
+                param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+            }
+        };
+        if (!param.location) {
+            that.getWXLocation(locationsuccess, locationfail, locationcomplete);
+        } else if (that.checkLocation(param)) {
+            var location = Utils.getLocationParam(param.location);
+            locationsuccess(location);
+        }
+    }
+}
+
+
+class QQMapWX {
+
+    /**
+     * 构造函数
+     * 
+     * @param {Object} options 接口参数,key 为必选参数
+     */
+    constructor(options) {
+        if (!options.key) {
+            throw Error('key值不能为空');
+        }
+        this.key = options.key;
+    }
+
+    /**
+     * POI周边检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * @see http://lbs.qq.com/webservice_v1/guide-search.html
+     */
+    search(options) {
+        var that = this;
+        options = options || {};
+
+        Utils.polyfillParam(options);
+
+        if (!Utils.checkKeyword(options)) {
+            return;
+        }
+
+        var requestParam = {
+            keyword: options.keyword,
+            orderby: options.orderby || '_distance',
+            page_size: options.page_size || 10,
+            page_index: options.page_index || 1,
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.address_format) {
+            requestParam.address_format = options.address_format;
+        }
+
+        if (options.filter) {
+            requestParam.filter = options.filter;
+        }
+
+        var distance = options.distance || "1000";
+        var auto_extend = options.auto_extend || 1;
+
+        var locationsuccess = function (result) {
+            requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend +")";
+            wx.request(Utils.buildWxRequestConfig(options, {
+                url: URL_SEARCH,
+                data: requestParam
+            }));
+        }
+        Utils.locationProcess(options, locationsuccess);
+    }
+
+    /**
+     * sug模糊检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-suggestion.html
+     */
+    getSuggestion(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (!Utils.checkKeyword(options)) {
+            return;
+        }
+
+        var requestParam = {
+            keyword: options.keyword,
+            region: options.region || '全国',
+            region_fix: options.region_fix || 0,
+            policy: options.policy || 0,
+            output: 'json',
+            key: that.key
+        };
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_SUGGESTION,
+            data: requestParam
+        }));
+    }
+
+    /**
+     * 逆地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-gcoder.html
+     */
+    reverseGeocoder(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+        var requestParam = {
+            coord_type: options.coord_type || 5,
+            get_poi: options.get_poi || 0,
+            output: 'json',
+            key: that.key
+        };
+        if (options.poi_options) {
+            requestParam.poi_options = options.poi_options
+        }
+
+        var locationsuccess = function (result) {
+            requestParam.location = result.latitude + ',' + result.longitude;
+            wx.request(Utils.buildWxRequestConfig(options, {
+                url: URL_GET_GEOCODER,
+                data: requestParam
+            }));
+        };
+        Utils.locationProcess(options, locationsuccess);
+    }
+
+    /**
+     * 地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-geocoder.html
+     */
+    geocoder(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'address')) {
+            return;
+        }
+
+        var requestParam = {
+            address: options.address,
+            output: 'json',
+            key: that.key
+        };
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_GET_GEOCODER,
+            data: requestParam
+        }));
+    }
+
+
+    /**
+     * 获取城市列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    getCityList(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+        var requestParam = {
+            output: 'json',
+            key: that.key
+        };
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_CITY_LIST,
+            data: requestParam
+        }));
+    }
+
+    /**
+     * 获取对应城市ID的区县列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    getDistrictByCityId(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'id')) {
+            return;
+        }
+
+        var requestParam = {
+            id: options.id || '',
+            output: 'json',
+            key: that.key
+        };
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_AREA_LIST,
+            data: requestParam
+        }));
+    }
+
+    /**
+     * 用于单起点到多终点的路线距离(非直线距离)计算：
+     * 支持两种距离计算方式：步行和驾车。
+     * 起点到终点最大限制直线距离10公里。
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-distance.html
+     */
+    calculateDistance(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'to')) {
+            return;
+        }
+
+        var requestParam = {
+            mode: options.mode || 'walking',
+            to: Utils.location2query(options.to),
+            output: 'json',
+            key: that.key
+        };
+
+        var locationsuccess = function (result) {
+            requestParam.from = result.latitude + ',' + result.longitude;
+            wx.request(Utils.buildWxRequestConfig(options, {
+                url: URL_DISTANCE,
+                data: requestParam
+            }));
+        }
+        if (options.from) {
+            options.location = options.from;
+        }
+        
+        Utils.locationProcess(options, locationsuccess);
+    }
+}
+
+module.exports = QQMapWX;
\ No newline at end of file
diff --git a/js_sdk/wxmp-qqmap/qqmap-wx-jssdk.min.js b/js_sdk/wxmp-qqmap/qqmap-wx-jssdk.min.js
new file mode 100644
index 0000000..3323249
--- /dev/null
+++ b/js_sdk/wxmp-qqmap/qqmap-wx-jssdk.min.js
@@ -0,0 +1,2 @@
+var _createClass=function(){function a(e,c){for(var b=0;b<c.length;b++){var d=c[b];d.enumerable=d.enumerable||false;d.configurable=true;if("value" in d){d.writable=true}Object.defineProperty(e,d.key,d)}}return function(d,b,c){if(b){a(d.prototype,b)}if(c){a(d,c)}return d}}();function _classCallCheck(a,b){if(!(a instanceof b)){throw new TypeError("Cannot call a class as a function")}}var ERROR_CONF={KEY_ERR:311,KEY_ERR_MSG:"key格式错误",PARAM_ERR:310,PARAM_ERR_MSG:"请求参数信息有误",SYSTEM_ERR:600,SYSTEM_ERR_MSG:"系统错误",WX_ERR_CODE:1000,WX_OK_CODE:200};var BASE_URL="https://apis.map.qq.com/ws/";var URL_SEARCH=BASE_URL+"place/v1/search";var URL_SUGGESTION=BASE_URL+"place/v1/suggestion";var URL_GET_GEOCODER=BASE_URL+"geocoder/v1/";var URL_CITY_LIST=BASE_URL+"district/v1/list";var URL_AREA_LIST=BASE_URL+"district/v1/getchildren";var URL_DISTANCE=BASE_URL+"distance/v1/";var Utils={location2query:function location2query(c){if(typeof c=="string"){return c}var b="";for(var a=0;a<c.length;a++){var e=c[a];if(!!b){b+=";"}if(e.location){b=b+e.location.lat+","+e.location.lng}if(e.latitude&&e.longitude){b=b+e.latitude+","+e.longitude}}return b},getWXLocation:function getWXLocation(c,b,a){wx.getLocation({type:"gcj02",success:c,fail:b,complete:a})},getLocationParam:function getLocationParam(b){if(typeof b=="string"){var a=b.split(",");if(a.length===2){b={latitude:b.split(",")[0],longitude:b.split(",")[1]}}else{b={}}}return b},polyfillParam:function polyfillParam(a){a.success=a.success||function(){};a.fail=a.fail||function(){};a.complete=a.complete||function(){}},checkParamKeyEmpty:function checkParamKeyEmpty(c,b){if(!c[b]){var a=this.buildErrorConfig(ERROR_CONF.PARAM_ERR,ERROR_CONF.PARAM_ERR_MSG+b+"参数格式有误");c.fail(a);c.complete(a);return true}return false},checkKeyword:function checkKeyword(a){return !this.checkParamKeyEmpty(a,"keyword")},checkLocation:function checkLocation(c){var a=this.getLocationParam(c.location);if(!a||!a.latitude||!a.longitude){var b=this.buildErrorConfig(ERROR_CONF.PARAM_ERR,ERROR_CONF.PARAM_ERR_MSG+" location参数格式有误");c.fail(b);c.complete(b);return false}return true},buildErrorConfig:function buildErrorConfig(a,b){return{status:a,message:b}},buildWxRequestConfig:function buildWxRequestConfig(c,a){var b=this;a.header={"content-type":"application/json"};a.method="GET";a.success=function(d){var e=d.data;if(e.status===0){c.success(e)}else{c.fail(e)}};a.fail=function(d){d.statusCode=ERROR_CONF.WX_ERR_CODE;c.fail(b.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,result.errMsg))};a.complete=function(d){var e=+d.statusCode;switch(e){case ERROR_CONF.WX_ERR_CODE:c.complete(b.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,d.errMsg));break;case ERROR_CONF.WX_OK_CODE:var f=d.data;if(f.status===0){c.complete(f)}else{c.complete(b.buildErrorConfig(f.status,f.message))}break;default:c.complete(b.buildErrorConfig(ERROR_CONF.SYSTEM_ERR,ERROR_CONF.SYSTEM_ERR_MSG))}};return a},locationProcess:function locationProcess(f,e,c,a){var d=this;c=c||function(g){g.statusCode=ERROR_CONF.WX_ERR_CODE;f.fail(d.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,g.errMsg))};a=a||function(g){if(g.statusCode==ERROR_CONF.WX_ERR_CODE){f.complete(d.buildErrorConfig(ERROR_CONF.WX_ERR_CODE,g.errMsg))}};if(!f.location){d.getWXLocation(e,c,a)}else{if(d.checkLocation(f)){var b=Utils.getLocationParam(f.location);e(b)}}}};var QQMapWX=function(){function b(i){_classCallCheck(this,b);if(!i.key){throw Error("key值不能为空")}this.key=i.key}_createClass(b,[{key:"search",value:function f(i){var l=this;i=i||{};Utils.polyfillParam(i);if(!Utils.checkKeyword(i)){return}var k={keyword:i.keyword,orderby:i.orderby||"_distance",page_size:i.page_size||10,page_index:i.page_index||1,output:"json",key:l.key};if(i.address_format){k.address_format=i.address_format}if(i.filter){k.filter=i.filter}var n=i.distance||"1000";var j=i.auto_extend||1;var m=function m(o){k.boundary="nearby("+o.latitude+","+o.longitude+","+n+","+j+")";wx.request(Utils.buildWxRequestConfig(i,{url:URL_SEARCH,data:k}))};Utils.locationProcess(i,m)}},{key:"getSuggestion",value:function h(i){var k=this;i=i||{};Utils.polyfillParam(i);if(!Utils.checkKeyword(i)){return}var j={keyword:i.keyword,region:i.region||"全国",region_fix:i.region_fix||0,policy:i.policy||0,output:"json",key:k.key};wx.request(Utils.buildWxRequestConfig(i,{url:URL_SUGGESTION,data:j}))}},{key:"reverseGeocoder",value:function a(i){var k=this;i=i||{};Utils.polyfillParam(i);var j={coord_type:i.coord_type||5,get_poi:i.get_poi||0,output:"json",key:k.key};if(i.poi_options){j.poi_options=i.poi_options}var l=function l(m){j.location=m.latitude+","+m.longitude;wx.request(Utils.buildWxRequestConfig(i,{url:URL_GET_GEOCODER,data:j}))};Utils.locationProcess(i,l)}},{key:"geocoder",value:function g(i){var k=this;i=i||{};Utils.polyfillParam(i);if(Utils.checkParamKeyEmpty(i,"address")){return}var j={address:i.address,output:"json",key:k.key};wx.request(Utils.buildWxRequestConfig(i,{url:URL_GET_GEOCODER,data:j}))}},{key:"getCityList",value:function c(i){var k=this;i=i||{};Utils.polyfillParam(i);var j={output:"json",key:k.key};
+wx.request(Utils.buildWxRequestConfig(i,{url:URL_CITY_LIST,data:j}))}},{key:"getDistrictByCityId",value:function d(i){var k=this;i=i||{};Utils.polyfillParam(i);if(Utils.checkParamKeyEmpty(i,"id")){return}var j={id:i.id||"",output:"json",key:k.key};wx.request(Utils.buildWxRequestConfig(i,{url:URL_AREA_LIST,data:j}))}},{key:"calculateDistance",value:function e(i){var k=this;i=i||{};Utils.polyfillParam(i);if(Utils.checkParamKeyEmpty(i,"to")){return}var j={mode:i.mode||"walking",to:Utils.location2query(i.to),output:"json",key:k.key};var l=function l(m){j.from=m.latitude+","+m.longitude;wx.request(Utils.buildWxRequestConfig(i,{url:URL_DISTANCE,data:j}))};if(i.from){i.location=i.from}Utils.locationProcess(i,l)}}]);return b}();module.exports=QQMapWX;
\ No newline at end of file
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..441c69a
--- /dev/null
+++ b/main.js
@@ -0,0 +1,106 @@
+import Vue from 'vue';
+import App from './App';
+import "./static/common/css/font.css"
+import common from './static/common/js/common'
+import jweixin from 'jweixin-module'
+import {
+	HubConnectionBuilder,
+	LogLevel,
+} from "./uni_modules/Lyuan-SignalR/js_sdk/signalr";
+
+
+
+Vue.config.productionTip = false;
+
+App.mpType = 'app';
+// 提示
+var tips = function(title, type, time) {
+	this.$refs.uTips.show({
+		title: title ? title : "",
+		type: type ? type : "success",
+		duration: time ? time + "" : "1000",
+	});
+}
+
+// 导入公用js
+Vue.prototype.$tips = tips
+Vue.prototype.common = common
+// 导入微信sdk
+Vue.prototype.jweixin = jweixin
+// 引入全局uView
+import uView from 'uview-ui';
+Vue.use(uView);
+
+// 此处为演示vuex使用，非uView的功能部分
+import store from '@/store';
+
+// 引入uView提供的对vuex的简写法文件
+let vuexStore = require('@/store/$u.mixin.js');
+Vue.mixin(vuexStore);
+
+// 引入uView对小程序分享的mixin封装
+let mpShare = require('uview-ui/libs/mixin/mpShare.js');
+Vue.mixin(mpShare);
+
+// 引入 jsonp
+import {VueJsonp} from 'vue-jsonp'   //中间有忘记大括号出现install undefind问题
+Vue.use(VueJsonp)
+
+// i18n部分的配置
+// 引入语言包，注意路径
+import Chinese from '@/common/locales/zh.js';
+import English from '@/common/locales/en.js';
+
+// VueI18n
+import VueI18n from '@/common/vue-i18n.min.js';
+
+// VueI18n
+Vue.use(VueI18n);
+
+const i18n = new VueI18n({
+	// 默认语言
+	locale: 'zh',
+	// 引入语言文件
+	messages: {
+		'zh': Chinese,
+		'en': English,
+	}
+});
+
+// 由于微信小程序的运行机制问题，需声明如下一行，H5和APP非必填
+Vue.prototype._i18n = i18n;
+
+
+const app = new Vue({
+	i18n,
+	store,
+	...App
+});
+
+// http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用
+import httpInterceptor from '@/common/http.interceptor.js';
+Vue.use(httpInterceptor, app);
+
+// http接口API抽离，免于写url或者一些固定的参数
+import httpApi from '@/common/http.api.js';
+Vue.use(httpApi, app);
+
+import httpApiList from '@/common/http.apiList.js';
+Vue.use(httpApiList, app);
+
+var connection = new HubConnectionBuilder()
+	// .withUrl("https://xy.apps.service.zheke.com/ChatHub",)
+	.withUrl("http://sl.vrgon.com:8003/ChatHub",)
+	.configureLogging(LogLevel.Error)
+	.build();
+
+
+
+
+
+Vue.prototype.$connection = connection
+
+
+
+
+app.$mount();
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..a0c4787
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,176 @@
+{
+    "name" : "Dl Chat",
+    "appid" : "__UNI__D70D15E",
+    "description" : "",
+    "versionName" : "1.8.4",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "sassImplementationName" : "node-sass",
+    "app-plus" : {
+        "optimization" : {
+            "subPackages" : true
+        },
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
+            }
+        },
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "modules" : {},
+        "distribute" : {
+            "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.READ_CONTACTS\"/>",
+                    "<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.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<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.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+            },
+            "ios" : {},
+            "sdkConfigs" : {
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : true,
+            "es6" : false,
+            "minified" : true,
+            "postcss" : true
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "usingComponents" : true,
+        "permission" : {},
+        "secureNetwork" : {
+            "enable" : false
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true,
+        "component2" : true
+    },
+    "mp-qq" : {
+        "optimization" : {
+            "subPackages" : true
+        },
+        "appid" : "15646153"
+    },
+    "mp-baidu" : {
+        "usingComponents" : true,
+        "appid" : ""
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true,
+        "appid" : ""
+    },
+    "h5" : {
+        "devServer" : {
+            "port" : 8080,
+            "disableHostCheck" : true,
+            // "proxy" : {
+            //     "/api" : {
+            //         "target" : "https://apis.map.qq.com",
+            //         "changeOrigin" : true,
+            //         "secure" : false,
+            //         "pathRewrite" : {
+            //             "^/api" : ""
+            //         }
+            //     },
+            //     "/dpa" : {
+            //         "target" : "http://pv.sohu.com",
+            //         "changeOrigin" : true,
+            //         "secure" : false,
+            //         "pathRewrite" : {
+            //             "^/dpa" : ""
+            //         }
+            //     }
+            // },
+            "https" : false
+        },
+        "template" : "template.h5.html",
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        },
+        "title" : "笑柚",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "2OLBZ-OOSRQ-RYZ5A-GMCM2-DJ43O-3QFLS"
+                },
+                "tencent" : {
+                    "key" : "2OLBZ-OOSRQ-RYZ5A-GMCM2-DJ43O-3QFLS"
+                }
+            }
+        }
+    }
+}
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
new file mode 100644
index 0000000..4d5b8eb
--- /dev/null
+++ b/node_modules/.package-lock.json
@@ -0,0 +1,77 @@
+{
+  "name": "uView",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/js-md5": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz",
+      "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
+    },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
+    "node_modules/vue-i18n": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
+      "integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg=="
+    },
+    "node_modules/vue-jsonp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
+      "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
+    }
+  }
+}
diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md
new file mode 100644
index 0000000..7c91d7b
--- /dev/null
+++ b/node_modules/jweixin-module/README.md
@@ -0,0 +1,30 @@
+# jweixin-module
+
+微信JS-SDK
+
+## 安装
+
+### NPM
+
+```shell
+npm install jweixin-module --save
+```
+
+### UMD
+
+```http
+https://unpkg.com/jweixin-module/out/index.js
+```
+
+## 使用
+
+```js
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
+    // TODO
+});
+```
+
+## 完整API
+
+>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115)
diff --git a/node_modules/jweixin-module/lib/index.js b/node_modules/jweixin-module/lib/index.js
new file mode 100644
index 0000000..1b5014b
--- /dev/null
+++ b/node_modules/jweixin-module/lib/index.js
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();S._completes=[]},S}()),g.preVerifyStartTime=L();else{y.state=1;for(var e=S._completes,n=0,i=e.length;n<i;++n)e[n]();S._completes=[]}}),w.invoke||(w.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,x(n),i)},w.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=y.state?e():(S._completes.push(e),!l&&v.debug&&e())},error:function(e){m<"6.0.2"||(-1==y.state?e(y.data):S._fail=e)},checkJsApi:function(e){M("checkJsApi",{jsApiList:C(e.jsApiList)},(e._complete=function(e){if(p){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=a[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){P(c.onMenuShareTimeline,{complete:function(){M("shareTimeline",{title:e.title||t,desc:e.title||t,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){P(c.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){P(c.onMenuShareQQ,{complete:function(){M("shareQQ",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){P(c.onMenuShareWeibo,{complete:function(){M("shareWeiboApp",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){P(c.onMenuShareQZone,{complete:function(){M("shareQZone",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){M("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){M("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){M("startRecord",{},e)},stopRecord:function(e){M("stopRecord",{},e)},onVoiceRecordEnd:function(e){P("onVoiceRecordEnd",e)},playVoice:function(e){M("playVoice",{localId:e.localId},e)},pauseVoice:function(e){M("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){M("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){P("onVoicePlayEnd",e)},uploadVoice:function(e){M("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){M("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){M("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){M("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(p){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){M(c.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){M("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){M("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===I?(I=!0,M("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(I=!1,0<_.length){var n=_.shift();wx.getLocalImgData(n)}},e))):_.push(e)},getNetworkType:function(e){M("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){M("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){M(c.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){M("hideOptionMenu",{},e)},showOptionMenu:function(e){M("showOptionMenu",{},e)},closeWindow:function(e){M("closeWindow",{},e=e||{})},hideMenuItems:function(e){M("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){M("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){M("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){M("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){M("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(f){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){M(c.openAddress,{},(e._complete=function(e){e=function(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}(e)},e))},openProductSpecificView:function(e){M(c.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}M(c.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){M("chooseCard",{app_id:v.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}M(c.openCard,{card_list:i},e)},consumeAndShareCard:function(e){M(c.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){M(c.chooseWXPay,V(e),e)},openEnterpriseRedPacket:function(e){M(c.openEnterpriseRedPacket,V(e),e)},startSearchBeacons:function(e){M(c.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){M(c.stopSearchBeacons,{},e)},onSearchBeacons:function(e){P(c.onSearchBeacons,e)},openEnterpriseChat:function(e){M("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){M("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},openBusinessView:function(e){M("openBusinessView",{businessType:e.businessType,queryString:e.queryString||"",envVersion:e.envVersion},(e._complete=function(n){if(p){var e=n.extraData;if(e)try{n.extraData=JSON.parse(e)}catch(e){n.extraData={}}}},e))},miniProgram:{navigateBack:function(e){e=e||{},O(function(){M("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){O(function(){M("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){O(function(){M("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){O(function(){M("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){O(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},T=1,k={};return i.addEventListener("error",function(e){if(!p){var n=e.target,i=n.tagName,t=n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)if(-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=T++,n["wx-id"]=o),k[o])return;k[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),i.addEventListener("load",function(e){if(!p){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(k[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=w),w}function M(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,x(e),function(e){A(n,e,i)}):B(n,i)}function P(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):B(n,t||i)}function x(e){return(e=e||{}).appId=v.appId,e.verifyAppId=v.appId,e.verifySignType="sha1",e.verifyTimestamp=v.timestamp+"",e.verifyNonceStr=v.nonceStr,e.verifySignature=v.signature,e}function V(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"!=e&&"openBusinessView"!==e||(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=a[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",v.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function C(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=c[t];o&&(e[n]=o)}return e}}function B(e,n){if(!(!v.debug||n&&n.isInnerInvoke)){var i=a[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function L(){return(new Date).getTime()}function O(e){l&&(o.WeixinJSBridge?e():i.addEventListener&&i.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json
new file mode 100644
index 0000000..6629c68
--- /dev/null
+++ b/node_modules/jweixin-module/package.json
@@ -0,0 +1,54 @@
+{
+  "_from": "jweixin-module",
+  "_id": "jweixin-module@1.6.0",
+  "_inBundle": false,
+  "_integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+  "_location": "/jweixin-module",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "jweixin-module",
+    "name": "jweixin-module",
+    "escapedName": "jweixin-module",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+  "_shasum": "4a7ea614083e3c9c3f49e2fdc2bb882cfa58dfcd",
+  "_spec": "jweixin-module",
+  "_where": "C:\\Users\\Administrator\\Documents\\HBuilderProjects\\笑柚",
+  "author": {
+    "name": "Shengqiang Guo"
+  },
+  "bugs": {
+    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "微信JS-SDK",
+  "devDependencies": {},
+  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "keywords": [
+    "wxjssdk",
+    "weixin",
+    "jweixin",
+    "wechat",
+    "jssdk",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "lib/index.js",
+  "name": "jweixin-module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+  },
+  "scripts": {},
+  "version": "1.6.0"
+}
diff --git a/node_modules/vue-i18n/CHANGELOG.md b/node_modules/vue-i18n/CHANGELOG.md
new file mode 100644
index 0000000..50a63cc
--- /dev/null
+++ b/node_modules/vue-i18n/CHANGELOG.md
@@ -0,0 +1,1631 @@
+
+## v8.20.0 (2020-07-30)
+
+#### :star: New Features
+* [#959](https://github.com/kazupon/vue-i18n/pull/959) i18n-n component local components passing ([@kazupon](https://github.com/kazupon))
+* [#928](https://github.com/kazupon/vue-i18n/pull/928) :zap: improvement(interpolation): enable passage of local components to tag prop ([@vhoyer](https://github.com/vhoyer))
+
+#### Committers: 2
+- Vinícius Hoyer ([@vhoyer](https://github.com/vhoyer))
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+
+## v8.19.0 (2020-07-25)
+
+#### :star: New Features
+* [#942](https://github.com/kazupon/vue-i18n/pull/942) Add vetur support for tags and attributes ([@phiter](https://github.com/phiter))
+
+#### :pencil: Documentation
+* [#925](https://github.com/kazupon/vue-i18n/pull/925) Added missing quote ([@fschlag](https://github.com/fschlag))
+* [#921](https://github.com/kazupon/vue-i18n/pull/921) Add lost pluralizationRules option to documentation ([@AleksandrSl](https://github.com/AleksandrSl))
+* [#920](https://github.com/kazupon/vue-i18n/pull/920) Make link to API and Guide top level ([@AleksandrSl](https://github.com/AleksandrSl))
+
+#### Committers: 3
+- Aleksandr ([@AleksandrSl](https://github.com/AleksandrSl))
+- Florian Schlag ([@fschlag](https://github.com/fschlag))
+- Phiter Fernandes ([@phiter](https://github.com/phiter))
+
+
+## v8.18.2 (2020-06-08)
+
+#### :zap: Improved Features
+* [#917](https://github.com/kazupon/vue-i18n/pull/917) fix: improve IVueI18n interface ([@kazupon](https://github.com/kazupon))
+
+#### :pencil: Documentation
+* [#902](https://github.com/kazupon/vue-i18n/pull/902) docs: [RU] Translation update ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+* [#901](https://github.com/kazupon/vue-i18n/pull/901) docs: (zh) inverse $d $n ([@stan-chen](https://github.com/stan-chen))
+
+#### Committers: 4
+- Alexander Sokolov ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+- Rafał Chłodnicki ([@rchl](https://github.com/rchl))
+- Stanley Chen ([@stan-chen](https://github.com/stan-chen))
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+
+## v8.18.1 (2020-05-27)
+
+#### :bug: Bug Fixes
+* [#896](https://github.com/kazupon/vue-i18n/pull/896) Fix flow types and enable flow types testing on CI ([@rchl](https://github.com/rchl))
+
+#### Committers: 1
+- Rafał Chłodnicki ([@rchl](https://github.com/rchl))
+
+
+## v8.18.0 (2020-05-26)
+
+#### :star: New Features
+* [#892](https://github.com/kazupon/vue-i18n/pull/892) Add onComponentInstanceCreated constructor option ([@rchl](https://github.com/rchl))
+
+#### :zap: Improved Features
+* [#890](https://github.com/kazupon/vue-i18n/pull/890) chore: set up linting for typescript definitions ([@rchl](https://github.com/rchl))
+
+#### Committers: 1
+- Rafał Chłodnicki ([@rchl](https://github.com/rchl))
+
+
+## v8.17.7 (2020-05-19)
+
+#### :bug: Bug Fixes
+* [#882](https://github.com/kazupon/vue-i18n/pull/882) fix v-t pluralisation when choice is 0 ([@mikejacoutot](https://github.com/mikejacoutot))
+
+#### Committers: 1
+- [@mikejacoutot](https://github.com/mikejacoutot)
+
+
+## v8.17.6 (2020-05-15)
+
+#### :bug: Bug Fixes
+* [#880](https://github.com/kazupon/vue-i18n/pull/880) Don't delete _i18n in beforeDestroy ([@danimoh](https://github.com/danimoh))
+
+#### :zap: Improved Features
+* [#878](https://github.com/kazupon/vue-i18n/pull/878) Allow component interpolation without root element ([@danimoh](https://github.com/danimoh))
+
+#### :pencil: Documentation
+* [#875](https://github.com/kazupon/vue-i18n/pull/875) Add new 3rd party tool ([@danigayosog](https://github.com/danigayosog))
+* [#872](https://github.com/kazupon/vue-i18n/pull/872) docs: fixes ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+* [#871](https://github.com/kazupon/vue-i18n/pull/871) update pluralization.md ([@Timibadass](https://github.com/Timibadass))
+
+#### Committers: 4
+- Alexander Sokolov ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+- Daniel ([@danigayosog](https://github.com/danigayosog))
+- Timi Omoyeni ([@Timibadass](https://github.com/Timibadass))
+- [@danimoh](https://github.com/danimoh)
+
+
+## v8.17.5 (2020-05-10)
+
+#### :bug: Bug Fixes
+* [#869](https://github.com/kazupon/vue-i18n/pull/869) fix: not string method access error ([@kazupon](https://github.com/kazupon))
+
+#### :pencil: Documentation
+* [#867](https://github.com/kazupon/vue-i18n/pull/867) docs: [RU] Translation ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+* [#865](https://github.com/kazupon/vue-i18n/pull/865) improvement(docs): extend Hot reloading section ([@caugner](https://github.com/caugner))
+
+#### Committers: 3
+- Alexander Sokolov ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+- Claas Augner ([@caugner](https://github.com/caugner))
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+
+## v8.17.4 (2020-04-26)
+
+#### :bug: Bug Fixes
+* [#859](https://github.com/kazupon/vue-i18n/pull/859) fix datetime format cache ([@kazupon](https://github.com/kazupon))
+* [#858](https://github.com/kazupon/vue-i18n/pull/858) fix datetime and number format fallbacking ([@kazupon](https://github.com/kazupon))
+* [#857](https://github.com/kazupon/vue-i18n/pull/857) fix: alternative array includes ([@kazupon](https://github.com/kazupon))
+
+#### Committers: 1
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+
+## v8.17.3 (2020-04-19)
+
+#### :zap: Improved Features
+* [#846](https://github.com/kazupon/vue-i18n/pull/846) add key to postTranslation ([@dmitryuk](https://github.com/dmitryuk))
+
+#### :pencil: Documentation
+* [#847](https://github.com/kazupon/vue-i18n/pull/847) docs: Update /api/README.md ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+
+#### Committers: 2
+- Alexander Dmitryuk ([@dmitryuk](https://github.com/dmitryuk))
+- Alexander Sokolov ([@Alex-Sokolov](https://github.com/Alex-Sokolov))
+
+
+## v8.17.2 (2020-04-18)
+
+#### :zap: Improved Features
+* [#844](https://github.com/kazupon/vue-i18n/pull/844) Use plain object instead of Map, which is not supported in IE9/10 ([@exoego](https://github.com/exoego))
+
+#### Committers: 1
+- TATSUNO Yasuhiro ([@exoego](https://github.com/exoego))
+
+
+## v8.17.1 (2020-04-16)
+
+#### :bug: Bug Fixes
+* [#840](https://github.com/kazupon/vue-i18n/pull/840) fix: altnative endsWidth ([@kazupon](https://github.com/kazupon))
+
+#### :pencil: Documentation
+* [#837](https://github.com/kazupon/vue-i18n/pull/837) Fix typo ([@ninofiliu](https://github.com/ninofiliu))
+
+#### Committers: 2
+- Nino Filiu ([@ninofiliu](https://github.com/ninofiliu))
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+
+## v8.17.0 (2020-04-11)
+
+#### :star: New Features
+* [#829](https://github.com/kazupon/vue-i18n/pull/829) #138 Fallback Locale as array for cascading fallbacks ([@mmokross](https://github.com/mmokross))
+
+#### :pencil: Documentation
+* [#834](https://github.com/kazupon/vue-i18n/pull/834) Add capitalize default modifier in doc ([@alexandreDavid](https://github.com/alexandreDavid))
+* [#832](https://github.com/kazupon/vue-i18n/pull/832) fix in examples of "Custom pluralization" ([@Perlover](https://github.com/Perlover))
+
+#### Committers: 4
+- Alexandre David ([@alexandreDavid](https://github.com/alexandreDavid))
+- Kobayashi Kazuhiro ([@kzhrk](https://github.com/kzhrk))
+- Michael Mokroß ([@mmokross](https://github.com/mmokross))
+- Perlover ([@Perlover](https://github.com/Perlover))
+
+
+## v8.16.0 (2020-03-27)
+
+#### :star: New Features
+* [#822](https://github.com/kazupon/vue-i18n/pull/822) post translation hooking feature ([@kazupon](https://github.com/kazupon))
+
+#### Committers: 1
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+
+## v8.15.7 (2020-03-25)
+
+#### :bug: Bug Fixes
+* [#819](https://github.com/kazupon/vue-i18n/pull/819) Fixed bug when changing number format runtime ([@slischka](https://github.com/slischka))
+
+#### Committers: 1
+- Jiří Slischka ([@slischka](https://github.com/slischka))
+
+
+## v8.15.6 (2020-03-23)
+
+#### :bug: Bug Fixes
+* [#817](https://github.com/kazupon/vue-i18n/pull/817) Bugfix : 'setLocaleMessage' / 'mergeLocaleMessage' doesn't work if 'warnHtmlInMessage' is set to 'error'  ([@aym3nb](https://github.com/aym3nb))
+
+#### :pencil: Documentation
+* [#816](https://github.com/kazupon/vue-i18n/pull/816) Update fallback.md ([@scoutrul](https://github.com/scoutrul))
+
+#### Committers: 3
+- Anton ([@scoutrul](https://github.com/scoutrul))
+- Aymen Bareche ([@aym3nb](https://github.com/aym3nb))
+- TATSUNO Yasuhiro ([@exoego](https://github.com/exoego))
+
+
+## v8.15.5 (2020-03-07)
+
+#### :star: Features
+* [#787](https://github.com/kazupon/vue-i18n/pull/787) Add a 'capitalize' default modifier for linked message ([@charlesmass](https://github.com/charlesmass))
+
+#### :zap: Improvement Features
+* [#794](https://github.com/kazupon/vue-i18n/pull/794) Support returning 'string' type for customized interpolation ([@sihyeonn](https://github.com/sihyeonn))
+
+#### :pencil: Documentation
+* [#791](https://github.com/kazupon/vue-i18n/pull/791) Revise fallback.md ([@jlebar](https://github.com/jlebar))
+
+#### Committers: 4
+- Justin Lebar ([@jlebar](https://github.com/jlebar))
+- L M ([@charlesmass](https://github.com/charlesmass))
+- Sihyeon Jang ([@sihyeonn](https://github.com/sihyeonn))
+- kazuya kawaguchi ([@kazupon](https://github.com/kazupon))
+
+<a name="8.15.4"></a>
+## [8.15.4](https://github.com/kazupon/vue-i18n/compare/v8.15.3...v8.15.4) (2020-02-25)
+
+
+### :bug: Bug Fixes
+
+* **index:** improve formatFallbackMessages code (#779) (#783) by [@masongzhi](https://github.com/masongzhi) ([53895b9](https://github.com/kazupon/vue-i18n/commit/53895b9)))
+
+### :up: Updates
+
+* some fixes ([8a9a950](https://github.com/kazupon/vue-i18n/commit/8a9a950))
+
+
+
+<a name="8.15.3"></a>
+## [8.15.3](https://github.com/kazupon/vue-i18n/compare/v8.15.2...v8.15.3) (2019-12-18)
+
+
+### :zap: Improvements
+
+* **index:** fix mergeLocaleMessage. add changes notification on merging with an empty target object ([#752](https://github.com/kazupon/vue-i18n/issues/752)) by [@jekill](https://github.com/jekill) ([048eac5](https://github.com/kazupon/vue-i18n/commit/048eac5)), closes [#752](https://github.com/kazupon/vue-i18n/issues/752)
+
+
+
+<a name="8.15.2"></a>
+## [8.15.2](https://github.com/kazupon/vue-i18n/compare/v8.15.1...v8.15.2) (2019-12-18)
+
+
+### :bug: Bug Fixes
+
+* **index:** Fix exception when using unit number formatting by [@simonjodet](https://github.com/simonjodet) ([194b801](https://github.com/kazupon/vue-i18n/commit/194b801)), closes [#750](https://github.com/kazupon/vue-i18n/issues/750) [#751](https://github.com/kazupon/vue-i18n/issues/751)
+
+
+
+<a name="8.15.1"></a>
+## [8.15.1](https://github.com/kazupon/vue-i18n/compare/v8.15.0...v8.15.1) (2019-11-27)
+
+
+### :zap: Improvements
+
+* **mixin:** change to custom blocks parse error ([a9858be](https://github.com/kazupon/vue-i18n/commit/a9858be))
+
+
+
+<a name="8.15.0"></a>
+# [8.15.0](https://github.com/kazupon/vue-i18n/compare/v8.14.1...v8.15.0) (2019-10-16)
+
+
+### :star: New Features
+
+* Add constructor option for custom modifiers ([#724](https://github.com/kazupon/vue-i18n/issues/724)) by [@epaezrubio](https://github.com/epaezrubio) ([3217212](https://github.com/kazupon/vue-i18n/commit/3217212)), closes [#724](https://github.com/kazupon/vue-i18n/issues/724)
+
+
+
+<a name="8.14.1"></a>
+## [8.14.1](https://github.com/kazupon/vue-i18n/compare/v8.14.0...v8.14.1) (2019-09-12)
+
+
+### :bug: Bug Fixes
+
+* **path:** fix branket key error ([8d2aba7](https://github.com/kazupon/vue-i18n/commit/8d2aba7))
+* **component:** Fix interpolation component when there are empty text nodes ([547cdd1](https://github.com/kazupon/vue-i18n/commit/547cdd1)) by [@Demivan](https://github.com/Demivan)
+
+
+
+<a name="8.14.0"></a>
+# [8.14.0](https://github.com/kazupon/vue-i18n/compare/v8.13.0...v8.14.0) (2019-08-12)
+
+
+### :star: New Features
+
+* fallback formatting ([#637](https://github.com/kazupon/vue-i18n/issues/637)) by [@sebwas](https://github.com/sebwas) ([bf9929c](https://github.com/kazupon/vue-i18n/commit/bf9929c)), closes [#637](https://github.com/kazupon/vue-i18n/issues/637)
+* support slots syntax for component interpolation ([#685](https://github.com/kazupon/vue-i18n/issues/685)) by [@aavondet](https://github.com/aavondet) ([71ca843](https://github.com/kazupon/vue-i18n/commit/71ca843)), closes [#685](https://github.com/kazupon/vue-i18n/issues/685)
+
+
+
+<a name="8.13.0"></a>
+# [8.13.0](https://github.com/kazupon/vue-i18n/compare/v8.12.0...v8.13.0) (2019-08-09)
+
+
+### :star: New Features
+
+* datetime/number formats fallback warning filter ([46de19e](https://github.com/kazupon/vue-i18n/commit/46de19e)), closes [#558](https://github.com/kazupon/vue-i18n/issues/558)
+* fallback translation warning filter ([69fc798](https://github.com/kazupon/vue-i18n/commit/69fc798))
+* translation missing warning filter ([666dc9d](https://github.com/kazupon/vue-i18n/commit/666dc9d))
+
+
+
+<a name="8.12.0"></a>
+# [8.12.0](https://github.com/kazupon/vue-i18n/compare/v8.11.2...v8.12.0) (2019-07-09)
+
+
+### :star: New Features
+
+* **mixin:** shared locale messages feature ([82543de](https://github.com/kazupon/vue-i18n/commit/82543de))
+
+
+### :zap: Improvements
+
+* **typing:** sharedMessages option type ([6967a15](https://github.com/kazupon/vue-i18n/commit/6967a15))
+
+
+
+<a name="8.11.2"></a>
+## [8.11.2](https://github.com/kazupon/vue-i18n/compare/v8.11.1...v8.11.2) (2019-04-30)
+
+
+### :bug: Bug Fixes
+
+* bug(mixin): fix SSR memory leak by moving subscribeDataChanging calls into beforeMount ([#572](https://github.com/kazupon/vue-i18n/issues/572)) by [@Pindar](https://github.com/Pindar) ([32b5795](https://github.com/kazupon/vue-i18n/commit/32b5795)), closes [#572](https://github.com/kazupon/vue-i18n/issues/572)
+
+
+
+<a name="8.11.1"></a>
+## [8.11.1](https://github.com/kazupon/vue-i18n/compare/v8.11.0...v8.11.1) (2019-04-26)
+
+
+### :bug: Bug Fixes
+
+* fix ES Modules distribution ([bb631a1](https://github.com/kazupon/vue-i18n/commit/bb631a1))
+
+
+
+<a name="8.11.0"></a>
+# [8.11.0](https://github.com/kazupon/vue-i18n/compare/v8.10.0...v8.11.0) (2019-04-26)
+
+
+### :star: New Features
+
+* ES modules for browser ([#561](https://github.com/kazupon/vue-i18n/issues/561)) ([c9b9adf](https://github.com/kazupon/vue-i18n/commit/c9b9adf)), closes [#561](https://github.com/kazupon/vue-i18n/issues/561)
+* HTML locale message warning option ([#567](https://github.com/kazupon/vue-i18n/issues/567)) ([4aecf03](https://github.com/kazupon/vue-i18n/commit/4aecf03)), closes [#567](https://github.com/kazupon/vue-i18n/issues/567)
+
+
+
+<a name="8.10.0"></a>
+# [8.10.0](https://github.com/kazupon/vue-i18n/compare/v8.9.0...v8.10.0) (2019-03-28)
+
+
+### :star: New Features
+
+* **number:** i18n-n functional component ([#541](https://github.com/kazupon/vue-i18n/issues/541)) by [@bponomarenko](https://github.com/bponomarenko) ([b33579d](https://github.com/kazupon/vue-i18n/commit/b33579d)), closes [#541](https://github.com/kazupon/vue-i18n/issues/541)
+* **path:** Keypath should parse if sub path contains spaces. ([#533](https://github.com/kazupon/vue-i18n/issues/533)) by [@exoego](https://github.com/exoego) ([640daaf](https://github.com/kazupon/vue-i18n/commit/640daaf)), closes [#533](https://github.com/kazupon/vue-i18n/issues/533)
+
+
+### :zap: Improvements
+
+* **number:** support data fall through in i18n-n ([#545](https://github.com/kazupon/vue-i18n/issues/545)) ([71cadbf](https://github.com/kazupon/vue-i18n/commit/71cadbf)), closes [#545](https://github.com/kazupon/vue-i18n/issues/545)
+
+
+### :pencil: docs
+
+* **vuepress:** translate documents for chinese ([#536](https://github.com/kazupon/vue-i18n/issues/536)) by [@xuhongbo](https://github.com/xuhongbo) ([ccf29f8](https://github.com/kazupon/vue-i18n/commit/ccf29f8)), closes [#536](https://github.com/kazupon/vue-i18n/issues/536) [#531](https://github.com/kazupon/vue-i18n/issues/531) [#1](https://github.com/kazupon/vue-i18n/issues/1) [#533](https://github.com/kazupon/vue-i18n/issues/533) [#540](https://github.com/kazupon/vue-i18n/issues/540) [#541](https://github.com/kazupon/vue-i18n/issues/541) [#1](https://github.com/kazupon/vue-i18n/issues/1) [#2](https://github.com/kazupon/vue-i18n/issues/2)
+
+
+<a name="8.9.0"></a>
+# [8.9.0](https://github.com/kazupon/vue-i18n/compare/v8.8.2...v8.9.0) (2019-03-08)
+
+
+### :bug: Bug Fixes
+
+* **index:** Fix [#515](https://github.com/kazupon/vue-i18n/issues/515) empty string not returning true ([#525](https://github.com/kazupon/vue-i18n/issues/525)) by [@kimuraz](https://github.com/kimuraz) ([396c5ca](https://github.com/kazupon/vue-i18n/commit/396c5ca)), closes [#515](https://github.com/kazupon/vue-i18n/issues/515) [#525](https://github.com/kazupon/vue-i18n/issues/525) [#515](https://github.com/kazupon/vue-i18n/issues/515)
+
+
+### :star: New Features
+
+* **index:** add availableLocales (related issue [#193](https://github.com/kazupon/vue-i18n/issues/193), PR [#528](https://github.com/kazupon/vue-i18n/issues/528)) by [@exoego](https://github.com/exoego) ([8f75b1f](https://github.com/kazupon/vue-i18n/commit/8f75b1f)), closes [#193](https://github.com/kazupon/vue-i18n/issues/193) [#528](https://github.com/kazupon/vue-i18n/issues/528) [#193](https://github.com/kazupon/vue-i18n/issues/193) [#193](https://github.com/kazupon/vue-i18n/issues/193) [#193](https://github.com/kazupon/vue-i18n/issues/193) [#193](https://github.com/kazupon/vue-i18n/issues/193)
+
+
+### :zap: Improvements
+
+* **flowtype:** Fix missing type declarations in flow type ([#529](https://github.com/kazupon/vue-i18n/issues/529)) by [@exoego](https://github.com/exoego) ([4173764](https://github.com/kazupon/vue-i18n/commit/4173764)), closes [#529](https://github.com/kazupon/vue-i18n/issues/529)
+
+
+
+<a name="8.8.2"></a>
+## [8.8.2](https://github.com/kazupon/vue-i18n/compare/v8.8.1...v8.8.2) (2019-02-17)
+
+
+### :bug: Bug Fixes
+
+* **mixin:** fix memory leak ([135058d](https://github.com/kazupon/vue-i18n/commit/135058d)), closes [#514](https://github.com/kazupon/vue-i18n/issues/514)
+
+
+
+<a name="8.8.1"></a>
+## [8.8.1](https://github.com/kazupon/vue-i18n/compare/v8.8.0...v8.8.1) (2019-02-10)
+
+
+### :bug: Bug Fixes
+
+* **index:** fixed [#478](https://github.com/kazupon/vue-i18n/issues/478) ([#518](https://github.com/kazupon/vue-i18n/issues/518)) by [@stroncium](https://github.com/stroncium) ([469edd9](https://github.com/kazupon/vue-i18n/commit/469edd9)), closes [#478](https://github.com/kazupon/vue-i18n/issues/478) [#518](https://github.com/kazupon/vue-i18n/issues/518) [#478](https://github.com/kazupon/vue-i18n/issues/478)
+
+
+### :zap: Improvements
+
+* **flowtype:** update typings ([44e04e7](https://github.com/kazupon/vue-i18n/commit/44e04e7))
+* **typescript:** update typings ([dee35b9](https://github.com/kazupon/vue-i18n/commit/dee35b9))
+
+
+
+<a name="8.8.0"></a>
+# [8.8.0](https://github.com/kazupon/vue-i18n/compare/v8.7.0...v8.8.0) (2019-01-29)
+
+
+### :bug: Bug Fixes
+
+* **index:** fix flat path based key issue ([bed9c39](https://github.com/kazupon/vue-i18n/commit/bed9c39)), closes [#349](https://github.com/kazupon/vue-i18n/issues/349)
+* **mixin:** fix beforeDestroy can not find this.$t ([#500](https://github.com/kazupon/vue-i18n/issues/500)) by [@masongzhi](https://github.com/masongzhi) ([311b8f3](https://github.com/kazupon/vue-i18n/commit/311b8f3)), closes [#500](https://github.com/kazupon/vue-i18n/issues/500)
+
+
+### :zap: Improvements
+
+* **directive:** Fix typo on warning message ([#509](https://github.com/kazupon/vue-i18n/issues/509)) by [@kimuraz](https://github.com/kimuraz) ([e879024](https://github.com/kazupon/vue-i18n/commit/e879024)), closes [#509](https://github.com/kazupon/vue-i18n/issues/509)
+* **index:** silence fallback warnings ([#510](https://github.com/kazupon/vue-i18n/issues/510)) by [@SzNagyMisu](https://github.com/SzNagyMisu) ([ddc0c79](https://github.com/kazupon/vue-i18n/commit/ddc0c79)), closes [#510](https://github.com/kazupon/vue-i18n/issues/510) [#139](https://github.com/kazupon/vue-i18n/issues/139)
+
+
+
+<a name="8.7.0"></a>
+# [8.7.0](https://github.com/kazupon/vue-i18n/compare/v8.6.0...v8.7.0) (2019-01-02)
+
+
+### :zap: Improvements
+
+* **directive:** Preserve directive content ([#495](https://github.com/kazupon/vue-i18n/issues/495)) by [@bponomarenko](https://github.com/bponomarenko) ([c29edba](https://github.com/kazupon/vue-i18n/commit/c29edba)), closes [#495](https://github.com/kazupon/vue-i18n/issues/495) [#408](https://github.com/kazupon/vue-i18n/issues/408) [#408](https://github.com/kazupon/vue-i18n/issues/408)
+
+
+
+<a name="8.6.0"></a>
+# [8.6.0](https://github.com/kazupon/vue-i18n/compare/v8.5.0...v8.6.0) (2018-12-25)
+
+
+### :bug: Bug Fixes
+
+* **pluralization:** inherit pluralization rules ⚠ ([#493](https://github.com/kazupon/vue-i18n/issues/493)) by [@Raiondesu](https://github.com/Raiondesu) ([7a23f32](https://github.com/kazupon/vue-i18n/commit/7a23f32)), closes [#493](https://github.com/kazupon/vue-i18n/issues/493)
+
+
+### :zap: Improvements
+
+* **format:** Add the path as argument to the custom formatter ([#489](https://github.com/kazupon/vue-i18n/issues/489)) by [@Raiondesu](https://github.com/Raiondesu) ([b9437ea](https://github.com/kazupon/vue-i18n/commit/b9437ea)), closes [#489](https://github.com/kazupon/vue-i18n/issues/489) [#484](https://github.com/kazupon/vue-i18n/issues/484) [#484](https://github.com/kazupon/vue-i18n/issues/484)
+
+
+
+<a name="8.5.0"></a>
+# [8.5.0](https://github.com/kazupon/vue-i18n/compare/v8.4.0...v8.5.0) (2018-12-17)
+
+
+### :bug: Bug Fixes
+
+* **index:** evaluate availabilities lazily (fix [#477](https://github.com/kazupon/vue-i18n/issues/477)) ([#483](https://github.com/kazupon/vue-i18n/issues/483)) by [@gamtiq](https://github.com/gamtiq) ([b66f02e](https://github.com/kazupon/vue-i18n/commit/b66f02e)), closes [#477](https://github.com/kazupon/vue-i18n/issues/477) [#483](https://github.com/kazupon/vue-i18n/issues/483)
+
+
+### :zap: Improvements
+
+* **index:** Allow pluralization customization via constructor options (closes [#464](https://github.com/kazupon/vue-i18n/issues/464)) ([#482](https://github.com/kazupon/vue-i18n/issues/482)) by [@Raiondesu](https://github.com/Raiondesu) ([ef4b1a6](https://github.com/kazupon/vue-i18n/commit/ef4b1a6)), closes [#464](https://github.com/kazupon/vue-i18n/issues/464) [#482](https://github.com/kazupon/vue-i18n/issues/482) [#464](https://github.com/kazupon/vue-i18n/issues/464) [#464](https://github.com/kazupon/vue-i18n/issues/464) [#464](https://github.com/kazupon/vue-i18n/issues/464) [#464](https://github.com/kazupon/vue-i18n/issues/464) [#451](https://github.com/kazupon/vue-i18n/issues/451)
+* **index:** make silentTranslationWarn work for dates and numbers too ([#481](https://github.com/kazupon/vue-i18n/issues/481)) by [@Raiondesu](https://github.com/Raiondesu) ([402092b](https://github.com/kazupon/vue-i18n/commit/402092b)), closes [#481](https://github.com/kazupon/vue-i18n/issues/481)
+* **types:** typed autocomplete in date and number format options ([#485](https://github.com/kazupon/vue-i18n/issues/485)) by [@Raiondesu](https://github.com/Raiondesu) ([e2e5993](https://github.com/kazupon/vue-i18n/commit/e2e5993)), closes [#485](https://github.com/kazupon/vue-i18n/issues/485)
+
+
+
+<a name="8.4.0"></a>
+# [8.4.0](https://github.com/kazupon/vue-i18n/compare/v8.3.2...v8.4.0) (2018-11-30)
+
+
+### :star: New Features
+
+* **index:** Add linked message formatting ([#467](https://github.com/kazupon/vue-i18n/issues/467)) by [@exoego](https://github.com/exoego) ([776b81b](https://github.com/kazupon/vue-i18n/commit/776b81b)), closes [#467](https://github.com/kazupon/vue-i18n/issues/467)
+
+
+
+<a name="8.3.2"></a>
+## [8.3.2](https://github.com/kazupon/vue-i18n/compare/v8.3.1...v8.3.2) (2018-11-16)
+
+
+### :chart_with_upwards_trend: Performance Fixes
+
+* **index:** Optimize unnecessary capturing. ([#462](https://github.com/kazupon/vue-i18n/issues/462)) by [@exoego](https://github.com/exoego) ([116845e](https://github.com/kazupon/vue-i18n/commit/116845e)), closes [#462](https://github.com/kazupon/vue-i18n/issues/462)
+
+
+
+<a name="8.3.1"></a>
+## [8.3.1](https://github.com/kazupon/vue-i18n/compare/v8.3.0...v8.3.1) (2018-11-08)
+
+
+### :bug: Bug Fixes
+
+* **directive:** fix cannnot update with v-t when had been changed locale message ([4895a2e](https://github.com/kazupon/vue-i18n/commit/4895a2e)), closes [#450](https://github.com/kazupon/vue-i18n/issues/450)
+* **index:** fix merge bug ([1798490](https://github.com/kazupon/vue-i18n/commit/1798490)), closes [#458](https://github.com/kazupon/vue-i18n/issues/458)
+* **missing:** fix vm argument passing ([dc48099](https://github.com/kazupon/vue-i18n/commit/dc48099)), closes [#453](https://github.com/kazupon/vue-i18n/issues/453)
+
+
+### :zap: Improvements
+
+* Optimize path.js and format.js ([#456](https://github.com/kazupon/vue-i18n/issues/456)) by [@exoego](https://github.com/exoego) ([639453c](https://github.com/kazupon/vue-i18n/commit/639453c)), closes [#456](https://github.com/kazupon/vue-i18n/issues/456)
+
+
+
+<a name="8.3.0"></a>
+# [8.3.0](https://github.com/kazupon/vue-i18n/compare/v8.2.1...v8.3.0) (2018-10-29)
+
+
+### :zap: Improvements
+
+* **pluralization:** Extendable pluralization by [@Raiondesu](https://github.com/Raiondesu) ([bbab90b](https://github.com/kazupon/vue-i18n/commit/bbab90b))
+
+
+
+<a name="8.2.1"></a>
+## [8.2.1](https://github.com/kazupon/vue-i18n/compare/v8.2.0...v8.2.1) (2018-10-15)
+
+
+### :bug: Bug Fixes
+
+* **extend:** fix TypeError: Cannot redefine property: $i18n ([#422](https://github.com/kazupon/vue-i18n/issues/422)) by [@HadiChen](https://github.com/HadiChen) ([cb19082](https://github.com/kazupon/vue-i18n/commit/cb19082)), closes [#422](https://github.com/kazupon/vue-i18n/issues/422)
+
+
+### :zap: Improvements
+
+* **index:** Suppress some warnings in production: smaller min.js and performance gain. ([#441](https://github.com/kazupon/vue-i18n/issues/441)) by @	exoego ([43931f5](https://github.com/kazupon/vue-i18n/commit/43931f5)), closes [#441](https://github.com/kazupon/vue-i18n/issues/441)
+
+
+
+<a name="8.2.0"></a>
+# [8.2.0](https://github.com/kazupon/vue-i18n/compare/v8.1.1...v8.2.0) (2018-10-13)
+
+
+### :bug: Bug Fixes
+
+* **index:** Add warning for circular reference in linked message ([#438](https://github.com/kazupon/vue-i18n/issues/438)) by [@exoego](https://github.com/exoego) ([7583485](https://github.com/kazupon/vue-i18n/commit/7583485)), closes [#438](https://github.com/kazupon/vue-i18n/issues/438)
+
+
+### :zap: Improvements
+
+* **index:** Allow escaping link key like @:(foo.bar). ([#437](https://github.com/kazupon/vue-i18n/issues/437)) by [@exoego](https://github.com/exoego) ([acfc458](https://github.com/kazupon/vue-i18n/commit/acfc458)), closes [#437](https://github.com/kazupon/vue-i18n/issues/437)
+* **index:** Pre-defined named arguments for Pluraization ([#440](https://github.com/kazupon/vue-i18n/issues/440)) by [@exoego](https://github.com/exoego) ([e84f0fb](https://github.com/kazupon/vue-i18n/commit/e84f0fb)), closes [#440](https://github.com/kazupon/vue-i18n/issues/440)
+* **path:** Allow non-ascii chars including numbers. ([#436](https://github.com/kazupon/vue-i18n/issues/436)) by [@exoego](https://github.com/exoego) ([a556c58](https://github.com/kazupon/vue-i18n/commit/a556c58)), closes [#436](https://github.com/kazupon/vue-i18n/issues/436)
+
+
+
+<a name="8.1.1"></a>
+## [8.1.1](https://github.com/kazupon/vue-i18n/compare/v8.1.0...v8.1.1) (2018-10-12)
+
+
+### :bug: Bug Fixes
+
+* **build:** fix rollup building issues ([1a1958a](https://github.com/kazupon/vue-i18n/commit/1a1958a))
+* **format:** Should warn as unknown if named format is not closed. ([#435](https://github.com/kazupon/vue-i18n/issues/435)) by [@exoego](https://github.com/exoego) ([d1f6ed0](https://github.com/kazupon/vue-i18n/commit/d1f6ed0)), closes [#435](https://github.com/kazupon/vue-i18n/issues/435)
+* **install:** fix cannot redfine error ([6d5ec61](https://github.com/kazupon/vue-i18n/commit/6d5ec61))
+
+
+### :zap: Improvements
+
+* **package.json:** tree shaking optimization ([38948c5](https://github.com/kazupon/vue-i18n/commit/38948c5))
+
+
+
+<a name="8.1.0"></a>
+# [8.1.0](https://github.com/kazupon/vue-i18n/compare/v8.0.0...v8.1.0) (2018-09-03)
+
+
+### :bug: Bug Fixes
+
+* **install:** add support for Vue.extend vue-i18n instance ([#420](https://github.com/kazupon/vue-i18n/issues/420)) by [@jaredzhu1993](https://github.com/jaredzhu1993) ([a60ea8b](https://github.com/kazupon/vue-i18n/commit/a60ea8b)), closes [#420](https://github.com/kazupon/vue-i18n/issues/420)
+
+
+### :zap: Improvements
+
+* **warnings:** make warning messages clearer ([#396](https://github.com/kazupon/vue-i18n/issues/396)) by [@kimuraz](https://github.com/kimuraz) ([79eee1b](https://github.com/kazupon/vue-i18n/commit/79eee1b)), closes [#396](https://github.com/kazupon/vue-i18n/issues/396)
+
+
+
+<a name="8.0.0"></a>
+# [8.0.0](https://github.com/kazupon/vue-i18n/compare/v7.8.1...v8.0.0) (2018-06-23)
+
+
+### :boom: Breaking changes
+
+* **extend:** fix this context binding ([aa0e831](https://github.com/kazupon/vue-i18n/commit/aa0e831)), closes [#306](https://github.com/kazupon/vue-i18n/issues/306) [#286](https://github.com/kazupon/vue-i18n/issues/286) [#259](https://github.com/kazupon/vue-i18n/issues/259), revert [#260](https://github.com/kazupon/vue-i18n/issues/260)
+
+Note that you need to guarantee this context equal to component instance in lifecycle methods (e.g. in `data` options, `const $t = this.$t.bind(this)`).
+
+```js
+export default {
+  data () {
+    const $t = this.$t.bind(this)
+    return { msg: $t('msg') }
+  }
+}
+```
+
+see the [API docs](https://kazupon.github.io/vue-i18n/api/)
+
+### :bug: Bug Fixes
+
+* bug(directive): fix guard checking at unbind ([c74888c](https://github.com/kazupon/vue-i18n/commit/c74888c)), closes [#340](https://github.com/kazupon/vue-i18n/issues/340)
+
+
+### NOTE
+
+* extend:
+
+
+
+<a name="7.8.1"></a>
+## [7.8.1](https://github.com/kazupon/vue-i18n/compare/v7.8.0...v7.8.1) (2018-06-18)
+
+
+### :bug: Bug Fixes
+
+* **directive:** fix cannot unbind bug ([105888d](https://github.com/kazupon/vue-i18n/commit/105888d)), closes [#377](https://github.com/kazupon/vue-i18n/issues/377)
+
+
+
+<a name="7.8.0"></a>
+# [7.8.0](https://github.com/kazupon/vue-i18n/compare/v7.7.0...v7.8.0) (2018-06-01)
+
+
+### :zap: Improvements
+
+* **typescript:** add type exportings ([a7cb8da](https://github.com/kazupon/vue-i18n/commit/a7cb8da))
+
+
+
+<a name="7.7.0"></a>
+# [7.7.0](https://github.com/kazupon/vue-i18n/compare/v7.6.0...v7.7.0) (2018-05-20)
+
+
+### :zap: Improvements
+
+* **index:** resource reactivity ([887a137](https://github.com/kazupon/vue-i18n/commit/887a137)), closes [#253](https://github.com/kazupon/vue-i18n/issues/253)
+* **typescript:** Fix typings in components ([#344](https://github.com/kazupon/vue-i18n/issues/344)) by [@Demivan](https://github.com/Demivan) ([2402893](https://github.com/kazupon/vue-i18n/commit/2402893)), closes [#344](https://github.com/kazupon/vue-i18n/issues/344)
+
+
+
+<a name="7.6.0"></a>
+# [7.6.0](https://github.com/kazupon/vue-i18n/compare/v7.5.0...v7.6.0) (2018-03-13)
+
+
+### :zap: Improvements
+
+* **index:** support retunable missing handler ([#256](https://github.com/kazupon/vue-i18n/issues/256)) by [@houd1ni](https://github.com/houd1ni) ([9fbe467](https://github.com/kazupon/vue-i18n/commit/9fbe467))
+* **typescript:** update TranslateResult type interface ([dffc678](https://github.com/kazupon/vue-i18n/commit/dffc678))
+
+
+
+<a name="7.5.0"></a>
+# [7.5.0](https://github.com/kazupon/vue-i18n/compare/v7.4.2...v7.5.0) (2018-03-11)
+
+
+### :star: New Features
+
+* **directive:** Add pluralization feature to directive ([#304](https://github.com/kazupon/vue-i18n/issues/304)) by [@SirLamer](https://github.com/SirLamer) ([8378859](https://github.com/kazupon/vue-i18n/commit/8378859))
+
+
+### :zap: Improvements
+
+* **flow:** update TranslateResult type interface ([59f4658](https://github.com/kazupon/vue-i18n/commit/59f4658))
+* **index:** support object localization ([#311](https://github.com/kazupon/vue-i18n/issues/311)) by [@manniL](https://github.com/manniL) ([99e5006](https://github.com/kazupon/vue-i18n/commit/99e5006))
+* **missing:** Add interpolation values to missing handler ([#308](https://github.com/kazupon/vue-i18n/issues/308)) by [@sebwas](https://github.com/sebwas) ([b912d8a](https://github.com/kazupon/vue-i18n/commit/b912d8a))
+* **numberformat:** Explicit number format options ([#305](https://github.com/kazupon/vue-i18n/issues/305)) by [@bponomarenko](https://github.com/bponomarenko) ([aa07450](https://github.com/kazupon/vue-i18n/commit/aa07450))
+
+
+
+<a name="7.4.2"></a>
+## [7.4.2](https://github.com/kazupon/vue-i18n/compare/v7.4.1...v7.4.2) (2018-02-01)
+
+
+### :zap: Improvements
+
+* **index:** Fixes global auto installation ([#291](https://github.com/kazupon/vue-i18n/issues/291)) by [@emileber](https://github.com/emileber) ([2f016ff](https://github.com/kazupon/vue-i18n/commit/2f016ff)), closes [#291](https://github.com/kazupon/vue-i18n/issues/291)
+
+
+
+<a name="7.4.1"></a>
+## [7.4.1](https://github.com/kazupon/vue-i18n/compare/v7.4.0...v7.4.1) (2018-01-25)
+
+
+### :bug: Bug Fixes
+
+* fix cannot react ([2a8ea1c](https://github.com/kazupon/vue-i18n/commit/2a8ea1c)), closes [#261](https://github.com/kazupon/vue-i18n/issues/261)
+
+
+### :zap: Improvements
+
+* **formatter:** interpolate messages without values ([#282](https://github.com/kazupon/vue-i18n/issues/282)) by [@cb8](https://github.com/cb8) ([b792ce2](https://github.com/kazupon/vue-i18n/commit/b792ce2))
+
+
+
+<a name="7.4.0"></a>
+# [7.4.0](https://github.com/kazupon/vue-i18n/compare/v7.3.4...v7.4.0) (2018-01-10)
+
+
+### :star: New Features
+
+* **typescript:** Allow module augmentation ([#273](https://github.com/kazupon/vue-i18n/issues/273)) by [@CKGrafico](https://github.com/CKGrafico) ([4371344](https://github.com/kazupon/vue-i18n/commit/4371344))
+
+
+
+<a name="7.3.4"></a>
+## [7.3.4](https://github.com/kazupon/vue-i18n/compare/v7.3.3...v7.3.4) (2018-01-07)
+
+
+### :bug: Bug Fixes
+
+* **formatter:** Inherit formatter ([#269](https://github.com/kazupon/vue-i18n/issues/269)) by [@podkot](https://github.com/podkot) ([26a33ad](https://github.com/kazupon/vue-i18n/commit/26a33ad))
+
+
+
+<a name="7.3.3"></a>
+## [7.3.3](https://github.com/kazupon/vue-i18n/compare/v7.3.2...v7.3.3) (2017-12-19)
+
+
+### :bug: Bug Fixes
+
+* **extend:** Fix this not found [#259](https://github.com/kazupon/vue-i18n/issues/259) ([#260](https://github.com/kazupon/vue-i18n/issues/260)) by [@lzxb](https://github.com/lzxb) ([c29007e](https://github.com/kazupon/vue-i18n/commit/c29007e)), closes [#259](https://github.com/kazupon/vue-i18n/issues/259) [#260](https://github.com/kazupon/vue-i18n/issues/260)
+* **types:** fix using old export ([#263](https://github.com/kazupon/vue-i18n/issues/263)) by [@jmigual](https://github.com/jmigual) ([b295fee](https://github.com/kazupon/vue-i18n/commit/b295fee)), closes [#263](https://github.com/kazupon/vue-i18n/issues/263)
+
+
+<a name="7.3.2"></a>
+## [7.3.2](https://github.com/kazupon/vue-i18n/compare/v7.3.1...v7.3.2) (2017-10-19)
+
+
+### :zap: Improvements
+
+* **typescript:** fix import problem of vue2.5 because of the types update ([#238](https://github.com/kazupon/vue-i18n/issues/238)) by [@peterchealse](https://github.com/peterchealse) ([cb98347](https://github.com/kazupon/vue-i18n/commit/cb98347)), closes [#238](https://github.com/kazupon/vue-i18n/issues/238)
+
+
+
+<a name="7.3.1"></a>
+## [7.3.1](https://github.com/kazupon/vue-i18n/compare/v7.3.0...v7.3.1) (2017-10-04)
+
+
+### :bug: Bug Fixes
+
+* **directive:** fix cannot locale reactivity ([e1fc12e](https://github.com/kazupon/vue-i18n/commit/e1fc12e)), closes [#227](https://github.com/kazupon/vue-i18n/issues/227)
+
+
+
+<a name="7.3.0"></a>
+# [7.3.0](https://github.com/kazupon/vue-i18n/compare/v7.2.0...v7.3.0) (2017-09-22)
+
+
+### :star: New Features
+
+* **directives:** support v-t custom directive (welcome back!) ([af9a2e7](https://github.com/kazupon/vue-i18n/commit/af9a2e7))
+
+
+### :up: Updates
+
+* **typing:** fix flowtype ([fa06f44](https://github.com/kazupon/vue-i18n/commit/fa06f44))
+
+
+
+<a name="7.2.0"></a>
+# [7.2.0](https://github.com/kazupon/vue-i18n/compare/v7.1.2...v7.2.0) (2017-08-28)
+
+
+### :star: New Features
+
+* **interpolation:** list formatting refactor and places/place feature ([#218](https://github.com/kazupon/vue-i18n/issues/218)) by [@myst729](https://github.com/myst729) ([0f0f3ff](https://github.com/kazupon/vue-i18n/commit/0f0f3ff))
+
+
+
+<a name="7.1.2"></a>
+## [7.1.2](https://github.com/kazupon/vue-i18n/compare/v7.1.1...v7.1.2) (2017-08-25)
+
+
+### :zap: Improvements
+
+* **interpolation:** skip non-element VNode in interpolation ([#211](https://github.com/kazupon/vue-i18n/issues/211)) by [@myst729](https://github.com/myst729) ([6be1756](https://github.com/kazupon/vue-i18n/commit/6be1756))
+
+
+
+<a name="7.1.1"></a>
+## [7.1.1](https://github.com/kazupon/vue-i18n/compare/v7.1.0...v7.1.1) (2017-08-03)
+
+
+### :bug: Bug Fixes
+
+* **mixin:** fix cannot setup VueI18n instance ([13585a4](https://github.com/kazupon/vue-i18n/commit/13585a4)), closes [#203](https://github.com/kazupon/vue-i18n/issues/203)
+
+
+
+<a name="7.1.0"></a>
+# [7.1.0](https://github.com/kazupon/vue-i18n/compare/v7.0.5...v7.1.0) (2017-07-30)
+
+
+### :zap: Improvements
+
+* **custom-block:** support multiple custom blocks ([ab955a5](https://github.com/kazupon/vue-i18n/commit/ab955a5)), closes [#189](https://github.com/kazupon/vue-i18n/issues/189)
+
+
+
+<a name="7.0.5"></a>
+## [7.0.5](https://github.com/kazupon/vue-i18n/compare/v7.0.4...v7.0.5) (2017-07-08)
+
+
+### :bug: Bug Fixes
+
+* **format:** fix cannot collectly parse percent ([fc71eda](https://github.com/kazupon/vue-i18n/commit/fc71eda)), closes [#191](https://github.com/kazupon/vue-i18n/issues/191)
+
+
+
+<a name="7.0.4"></a>
+## [7.0.4](https://github.com/kazupon/vue-i18n/compare/v7.0.3...v7.0.4) (2017-07-01)
+
+
+### :bug: Bug Fixes
+
+* **link:** fix ie traverse custom Array.prototype method ([#188](https://github.com/kazupon/vue-i18n/issues/188)) by [@632781460](https://github.com/632781460) ([d3b308b](https://github.com/kazupon/vue-i18n/commit/d3b308b)), closes [#188](https://github.com/kazupon/vue-i18n/issues/188)
+
+
+### :chart_with_upwards_trend: Performance Fixes
+
+* fix blocking at beforeDestroy ([570b215](https://github.com/kazupon/vue-i18n/commit/570b215)), closes [#187](https://github.com/kazupon/vue-i18n/issues/187)
+
+
+
+<a name="7.0.3"></a>
+## [7.0.3](https://github.com/kazupon/vue-i18n/compare/v7.0.2...v7.0.3) (2017-06-13)
+
+
+### :bug: Bug Fixes
+
+* **fallback:** fix cannot fallabck localization ([694e6f2](https://github.com/kazupon/vue-i18n/commit/694e6f2)), closes [#176](https://github.com/kazupon/vue-i18n/issues/176)
+* **fallback:** fix fallback locale issue ([d9ceddc](https://github.com/kazupon/vue-i18n/commit/d9ceddc)), closes [#174](https://github.com/kazupon/vue-i18n/issues/174)
+* **linked:** fix cannot fallback linked localization ([0c572f3](https://github.com/kazupon/vue-i18n/commit/0c572f3)), closes [#172](https://github.com/kazupon/vue-i18n/issues/172)
+
+
+
+<a name="7.0.2"></a>
+## [7.0.2](https://github.com/kazupon/vue-i18n/compare/v7.0.1...v7.0.2) (2017-06-10)
+
+
+### :bug: Bug Fixes
+
+* **sfc:** fix cannot parse custom block locale messages ([32eb3a7](https://github.com/kazupon/vue-i18n/commit/32eb3a7)), closes [#173](https://github.com/kazupon/vue-i18n/issues/173)
+
+
+
+<a name="7.0.1"></a>
+## [7.0.1](https://github.com/kazupon/vue-i18n/compare/v7.0.0...v7.0.1) (2017-06-04)
+
+
+### :bug: Bug Fixes
+
+* fix cannat single file component translation ([687d406](https://github.com/kazupon/vue-i18n/commit/687d406)), closes [#169](https://github.com/kazupon/vue-i18n/issues/169)
+* fix cannnot resolve linked localization with component interpolation ([c973619](https://github.com/kazupon/vue-i18n/commit/c973619)), closes [#171](https://github.com/kazupon/vue-i18n/issues/171)
+* fix datetime and number fallback localization ([be9e1bd](https://github.com/kazupon/vue-i18n/commit/be9e1bd)), closes [#168](https://github.com/kazupon/vue-i18n/issues/168)
+* fix linked translation with using hyphen or underscore keypath ([6e9f151](https://github.com/kazupon/vue-i18n/commit/6e9f151)), closes [#170](https://github.com/kazupon/vue-i18n/issues/170)
+
+
+<a name="7.0.0"></a>
+# [7.0.0](https://github.com/kazupon/vue-i18n/compare/v7.0.0-rc.1...v7.0.0) (2017-05-29)
+
+:tada: :tada: :tada:
+
+See the [docs](https://kazupon.github.io/vue-i18n/en/)
+
+
+### :star: New Features
+
+* **datetime localization:**
+    * [documentation](https://github.com/kazupon/vue-i18n/blob/dev/gitbook/en/datetime.md)
+    * [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/datetime)
+* **number localization:**
+    * [documentation](https://github.com/kazupon/vue-i18n/blob/dev/gitbook/en/number.md)
+    * [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/number)
+* **component interpolation:**
+    * [documentation](https://github.com/kazupon/vue-i18n/blob/dev/gitbook/en/interpolation.md)
+    * [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/interpolation)
+* **typescript:**
+    * [type definitions](https://github.com/kazupon/vue-i18n/blob/dev/types/index.d.ts)
+
+
+### :chart_with_upwards_trend: Performance Fixes
+
+* fix translation performance issue ([6032a51](https://github.com/kazupon/vue-i18n/commit/6032a51))
+
+
+### :zap: Improvements
+
+* **path:** tweak for ssr
+
+
+### :boom: Breaking changes
+
+* **format:** re-impelement formatter
+* **formatter:** change method nam
+* **flowtype:** fix locale message related type changing and remove underscore type
+
+
+### :bug: Bug Fixes
+
+* **examples:** fix ssr demo ([059034f](https://github.com/kazupon/vue-i18n/commit/059034f))
+* **pluralization:** fix default choice ([240cfed](https://github.com/kazupon/vue-i18n/commit/240cfed))
+
+
+<a name="7.0.0-rc.1"></a>
+# [7.0.0-rc.1](https://github.com/kazupon/vue-i18n/compare/v7.0.0-beta.4...v7.0.0-rc.1) (2017-05-26)
+
+
+### :chart_with_upwards_trend: Performance Fixes
+
+* fix translation performance issue ([6032a51](https://github.com/kazupon/vue-i18n/commit/6032a51)), closes [#165](https://github.com/kazupon/vue-i18n/issues/165)
+
+
+### :up: Updates
+
+* **flowtype:** remove unneccesary type ([eb60156](https://github.com/kazupon/vue-i18n/commit/eb60156))
+
+
+
+<a name="7.0.0-beta.4"></a>
+# [7.0.0-beta.4](https://github.com/kazupon/vue-i18n/compare/v7.0.0-beta.3...v7.0.0-beta.4) (2017-05-23)
+
+
+### :bug: Bug Fixes
+
+* **pluralization:** fix default choice ([240cfed](https://github.com/kazupon/vue-i18n/commit/240cfed)), closes [#164](https://github.com/kazupon/vue-i18n/issues/164)
+
+
+
+<a name="7.0.0-beta.3"></a>
+# [7.0.0-beta.3](https://github.com/kazupon/vue-i18n/compare/v7.0.0-beta.2...v7.0.0-beta.3) (2017-05-15)
+
+### :up: Updates
+
+* bring back from bug fix ([95be4ea](https://github.com/kazupon/vue-i18n/commit/95be4ea))
+
+
+<a name="7.0.0-beta.2"></a>
+# [7.0.0-beta.2](https://github.com/kazupon/vue-i18n/compare/v7.0.0-beta.1...v7.0.0-beta.2) (2017-05-14)
+
+
+### :zap: Improvements
+
+* **path:** tweak for ssr ([eb21921](https://github.com/kazupon/vue-i18n/commit/eb21921))
+* **typescript:** change custom formatter method name ([c5f043f](https://github.com/kazupon/vue-i18n/commit/c5f043f))
+
+
+
+<a name="7.0.0-beta.1"></a>
+# [7.0.0-beta.1](https://github.com/kazupon/vue-i18n/compare/v6.1.1...v7.0.0-beta.1) (2017-05-11)
+
+### :star: New Features
+
+* **datetime localization:** add datetime localization ([3282075](https://github.com/kazupon/vue-i18n/commit/3282075))
+    * [documentation](https://github.com/kazupon/vue-i18n/blob/dev/gitbook/en/datetime.md)
+    * [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/datetime)
+* **number localization:** add number localization ([87ee7b3](https://github.com/kazupon/vue-i18n/commit/87ee7b3))
+    * [documentation](https://github.com/kazupon/vue-i18n/blob/dev/gitbook/en/number.md)
+    * [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/number)
+* **component interpolation:** ([23f7d34](https://github.com/kazupon/vue-i18n/commit/23f7d34)), closes [#145](https://github.com/kazupon/vue-i18n/issues/145) [#144](https://github.com/kazupon/vue-i18n/issues/144) [#37](https://github.com/kazupon/vue-i18n/issues/37)
+    * [documentation](https://github.com/kazupon/vue-i18n/blob/dev/gitbook/en/interpolation.md)
+    * [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/interpolation)
+* **typescript:** add TypeScript type definitions ([#161](https://github.com/kazupon/vue-i18n/issues/161)) by [@aicest](https://github.com/aicest) ([61cebca](https://github.com/kazupon/vue-i18n/commit/61cebca))
+    * [type definitions](https://github.com/kazupon/vue-i18n/blob/dev/types/index.d.ts)
+
+
+### :boom: Breaking changes
+
+* **format:** re-impelement formatter ([a8c046d](https://github.com/kazupon/vue-i18n/commit/a8c046d))
+* **formatter:** change method name ([6eed51c](https://github.com/kazupon/vue-i18n/commit/6eed51c))
+* **flowtype:** fix locale message related type changing ([c30d576](https://github.com/kazupon/vue-i18n/commit/c30d576))
+
+
+### :bug: Bug Fixes
+
+* **examples:** fix ssr demo ([059034f](https://github.com/kazupon/vue-i18n/commit/059034f)), closes [#151](https://github.com/kazupon/vue-i18n/issues/151)
+
+
+<a name="6.1.3"></a>
+## [6.1.3](https://github.com/kazupon/vue-i18n/compare/v6.1.1...v6.1.3) (2017-05-15)
+
+
+### :bug: Bug Fixes
+
+* fix memory leaks ([95be4ea](https://github.com/kazupon/vue-i18n/commit/95be4ea)), closes [#162](https://github.com/kazupon/vue-i18n/issues/162)
+
+
+
+<a name="6.1.2"></a>
+## [6.1.2](https://github.com/kazupon/vue-i18n/compare/v6.1.1...v6.1.2) (2017-05-15)
+
+
+<a name="6.1.1"></a>
+## [6.1.1](https://github.com/kazupon/vue-i18n/compare/v6.1.0...v6.1.1) (2017-04-19)
+
+
+### :bug: Bug Fixes
+
+* **te:** Fix `te()` that always uses `this.locale`, even when `locale` supplied ([#147](https://github.com/kazupon/vue-i18n/issues/147)) by [@aicest](https://github.com/aicest) ([bf15eeb](https://github.com/kazupon/vue-i18n/commit/bf15eeb)), closes [#147](https://github.com/kazupon/vue-i18n/issues/147)
+
+
+
+<a name="6.1.0"></a>
+# [6.1.0](https://github.com/kazupon/vue-i18n/compare/v6.0.0...v6.1.0) (2017-04-14)
+
+
+### :star: New Features
+
+* **api:** add 'mergeLocaleMessage' method ([ef21621](https://github.com/kazupon/vue-i18n/commit/ef21621)), closes [#131](https://github.com/kazupon/vue-i18n/issues/131)
+* **silent:** add silent translation missing option ([29b3a17](https://github.com/kazupon/vue-i18n/commit/29b3a17)), closes [#139](https://github.com/kazupon/vue-i18n/issues/139)
+
+
+### :zap: Improvements
+
+* change to method from computed property ([9135a59](https://github.com/kazupon/vue-i18n/commit/9135a59)), closes [#141](https://github.com/kazupon/vue-i18n/issues/141)
+
+
+
+<a name="6.0.0"></a>
+# [6.0.0](https://github.com/kazupon/vue-i18n/compare/v6.0.0-beta.1...v6.0.0) (2017-04-05)
+
+:tada: :tada: :tada:
+
+See the [docs](https://kazupon.github.io/vue-i18n/en/)
+
+### :zap: Improvements
+
+- Server-Side Rendering: [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/ssr)
+- Custom formatter: [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/formatting/custom)
+
+
+### :star: NEW Features
+
+- Single File Components: [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/sfc)
+
+
+### :boom: Breaking changes
+
+- API
+- Dynamic locale <sup>DEPRECATED</sup>
+
+
+<a name="6.0.0-beta.1"></a>
+# [6.0.0-beta.1](https://github.com/kazupon/vue-i18n/compare/v6.0.0-alpha.6...v6.0.0-beta.1) (2017-03-22)
+
+
+### :boom: Breaking changes
+
+* change `fallbackRoot` and `sync` option default `true` value ([0890b44](https://github.com/kazupon/vue-i18n/commit/0890b44))
+* remove messages settter, and add getLocaleMessage API ([0f0914d](https://github.com/kazupon/vue-i18n/commit/0f0914d))
+
+
+### :bug: Bug Fixes
+
+* **mixin:** fix computed props errors ([a6b7e37](https://github.com/kazupon/vue-i18n/commit/a6b7e37))
+
+
+### :up: Updates
+
+* **flowtype:** argument names ([cf14425](https://github.com/kazupon/vue-i18n/commit/cf14425))
+
+
+### :zap: Improvements
+
+* **fallbackLocale:** support reactivity ([ed758be](https://github.com/kazupon/vue-i18n/commit/ed758be))
+* **warn:** suppress warning messages for production ([6e417d2](https://github.com/kazupon/vue-i18n/commit/6e417d2))
+
+
+
+<a name="6.0.0-alpha.6"></a>
+# [6.0.0-alpha.6](https://github.com/kazupon/vue-i18n/compare/v6.0.0-alpha.5...v6.0.0-alpha.6) (2017-03-16)
+
+
+### :star: New Features
+
+* add 'setLocaleMessage' API ([8b71eda](https://github.com/kazupon/vue-i18n/commit/8b71eda))
+
+
+
+<a name="6.0.0-alpha.5"></a>
+# [6.0.0-alpha.5](https://github.com/kazupon/vue-i18n/compare/v6.0.0-alpha.3...v6.0.0-alpha.5) (2017-03-11)
+
+
+### :bug: Bug Fixes
+
+* **mixin:** fix cannot create VueI18n instance error for minify production ([7eeb29f](https://github.com/kazupon/vue-i18n/commit/7eeb29f))
+
+
+
+<a name="6.0.0-alpha.4"></a>
+# [6.0.0-alpha.4](https://github.com/kazupon/vue-i18n/compare/v6.0.0-alpha.3...v6.0.0-alpha.4) (2017-03-11)
+
+
+
+<a name="6.0.0-alpha.3"></a>
+# [6.0.0-alpha.3](https://github.com/kazupon/vue-i18n/compare/v6.0.0-alpha.2...v6.0.0-alpha.3) (2017-03-08)
+
+
+### :star: New Features
+
+* add `sync` option ([5c46c07](https://github.com/kazupon/vue-i18n/commit/5c46c07))
+
+
+### :zap: Improvements
+
+* **mixin:** add error throwings and a warning ([0e4ac39](https://github.com/kazupon/vue-i18n/commit/0e4ac39))
+
+
+
+<a name="6.0.0-alpha.2"></a>
+# [6.0.0-alpha.2](https://github.com/kazupon/vue-i18n/compare/v6.0.0-alpha.1...v6.0.0-alpha.2) (2017-02-27)
+
+
+### :zap: Improvements
+
+* **mixin:** release i18n instance ([cc362a3](https://github.com/kazupon/vue-i18n/commit/cc362a3))
+* **vue:** support vue 2.2 ([5e7bf5e](https://github.com/kazupon/vue-i18n/commit/5e7bf5e))
+
+
+
+<a name="6.0.0-alpha.1"></a>
+# [6.0.0-alpha.1](https://github.com/kazupon/vue-i18n/compare/v5.0.2...v6.0.0-alpha.1) (2017-02-23)
+
+This is the first release of 6.0.
+In this version, we are some big breaking changes.
+
+- Recommended for: experiments, prototypes, upgrading small, non-critical apps
+- **NOT** recommended for: production use, upgrading production apps
+
+:warning: Documentation still needs to be worked on. And also, we might change some APIs and features.
+
+In the examples, please refer to this [examples](https://github.com/kazupon/vue-i18n/tree/dev/examples) directory.
+
+
+## Improvements
+- Server-Side Rendering: [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/formatting/custom)
+- Custom formatter: [example](https://github.com/kazupon/vue-i18n/tree/dev/examples/ssr)
+
+## Features
+- Formatting <sup>support</sup>
+- Pluralization <sup>support</sup>
+- Locale and KeyPath Syntax <sup>support</sup>
+- Linked translation <sup>support</sup>
+- Fallback translation <sup>support</sup>
+- Component locale <sup>support</sup>
+- Dynamic locale <sup>DEPRECATED</sup>
+- Hot reload <sup>support</sup>
+
+## API
+
+### Global Config
+- Vue.config.lang <sup>DEPRECATED, use VueI18n constructor `locale` option, or VueI18n#locale</sup>
+- Vue.config.fallbackLang <sup>DEPRECATED, use VueI18n constructor `fallbackLocale` option, or VueI18n#fallbackLocale</sup>
+- Vue.config.missingHandler <sup>DEPRECATED, use VueI18n constructor `missing` option, or VueI18n#missing</sup>
+- Vue.config.i18nFormatter <sup>DEPRECATED, use VueI18n constructor `formatter` option, or VueI18n#formatter</sup>
+
+### Global Method
+- Vue.locale <sup>DEPRECATED, use VueI18n constructor `messages` option, or VueI18n#messages</sup>
+- Vue.t <sup>DEPRECATED, use VueI18n#t</sup>
+- Vue.tc <sup>DEPRECATED, use VueI18n#tc</sup>
+- Vue.te <sup>DEPRECATED, use VueI18n#te</sup>
+
+### Constructor Options
+- locales <sup>DEPRECATED, use `messages` of `i18n` option (e.g `{ i18n: { messaes: ... } }`)</sup>
+
+### Instance Properties
+- $lang <sup>DEPRECATED, use `locale` of Vue instance property `$i18n` (e.g `vm.$i18n.locale = 'en'`)
+
+### VueI18n class <sup>NEW</sup>
+- constructor options: See the [`I18nOptions` type](https://github.com/kazupon/vue-i18n/blob/dev/decls/i18n.js#L7-L15) of flowtype.
+- methods / properties: See the [`I18n` interface definition](https://github.com/kazupon/vue-i18n/blob/dev/decls/i18n.js#L17-L33) of flowtype.
+
+
+<a name="5.0.2"></a>
+## [5.0.2](https://github.com/kazupon/vue-i18n/compare/v5.0.1...v5.0.2) (2017-02-18)
+
+
+### :zap: Improvements
+
+* **npm:** revert node >= 6.0 engine restriction ([#110](https://github.com/kazupon/vue-i18n/issues/110)) by [@syxolk](https://github.com/syxolk) ([92b1bd1](https://github.com/kazupon/vue-i18n/commit/92b1bd1)), closes [#109](https://github.com/kazupon/vue-i18n/issues/109)
+
+
+
+<a name="5.0.1"></a>
+## [5.0.1](https://github.com/kazupon/vue-i18n/compare/v5.0.0...v5.0.1) (2017-02-16)
+
+
+### :zap: Improvements
+
+* **asset:** update locale reactivity setting ([b42fd9a](https://github.com/kazupon/vue-i18n/commit/b42fd9a))
+
+
+
+<a name="5.0.0"></a>
+# [5.0.0](https://github.com/kazupon/vue-i18n/compare/v4.10.0...v5.0.0) (2017-02-04)
+
+
+### :boom: Breaking changes
+
+* drop vue 1.0 supporting ([4da26cf](https://github.com/kazupon/vue-i18n/commit/4da26cf)), closes [#105](https://github.com/kazupon/vue-i18n/issues/105)
+
+
+
+<a name="4.10.0"></a>
+# [4.10.0](https://github.com/kazupon/vue-i18n/compare/v4.9.0...v4.10.0) (2017-01-01)
+
+
+### :star: New Features
+
+* `$lang` property for all component ([#99](https://github.com/kazupon/vue-i18n/issues/99)) by [@albert](https://github.com/albert)-zhang ([5ed69f8](https://github.com/kazupon/vue-i18n/commit/5ed69f8))
+
+
+### :up: Updates
+
+* **override:** change langVM keeping variable name ([3ec1bb2](https://github.com/kazupon/vue-i18n/commit/3ec1bb2))
+
+
+
+<a name="4.9.0"></a>
+# [4.9.0](https://github.com/kazupon/vue-i18n/compare/v4.8.0...v4.9.0) (2016-12-17)
+
+
+### :bug: Bug Fixes
+
+* **path:** fix nested key translation ([e15ead4](https://github.com/kazupon/vue-i18n/commit/e15ead4)), closes [#97](https://github.com/kazupon/vue-i18n/issues/97)
+
+
+### :star: New Features
+
+* add globally locale checking ([4cac8b9](https://github.com/kazupon/vue-i18n/commit/4cac8b9))
+* locale checking ([#98](https://github.com/kazupon/vue-i18n/issues/98)) by [@long](https://github.com/long)-long-float ([0bc0a6b](https://github.com/kazupon/vue-i18n/commit/0bc0a6b))
+
+
+<a name="4.8.0"></a>
+# [4.8.0](https://github.com/kazupon/vue-i18n/compare/v4.7.4...v4.8.0) (2016-12-08)
+
+
+### :zap: Improvements
+
+* **extend:** disable no translation warning when set missingHandler ([168a97c](https://github.com/kazupon/vue-i18n/commit/168a97c)), closes [#96](https://github.com/kazupon/vue-i18n/issues/96)
+
+
+
+<a name="4.7.4"></a>
+## [4.7.4](https://github.com/kazupon/vue-i18n/compare/v4.7.3...v4.7.4) (2016-11-29)
+
+
+### :bug: Bug Fixes
+
+* **extend:** fix interpolate error [@tariq86](https://github.com/tariq86) ([5f24e17](https://github.com/kazupon/vue-i18n/commit/5f24e17))
+
+
+
+<a name="4.7.3"></a>
+## [4.7.3](https://github.com/kazupon/vue-i18n/compare/v4.7.2...v4.7.3) (2016-11-24)
+
+
+### :bug: Bug Fixes
+
+* **extend:** fix array local ([35c268a](https://github.com/kazupon/vue-i18n/commit/35c268a)), closes [#91](https://github.com/kazupon/vue-i18n/issues/91) [#59](https://github.com/kazupon/vue-i18n/issues/59)
+
+
+
+<a name="4.7.2"></a>
+## [4.7.2](https://github.com/kazupon/vue-i18n/compare/v4.7.1...v4.7.2) (2016-11-19)
+
+
+### :bug: Bug Fixes
+
+* **observer:** fix dep undefined error ([#88](https://github.com/kazupon/vue-i18n/issues/88)) by [@fandaa](https://github.com/fandaa) ([724974e](https://github.com/kazupon/vue-i18n/commit/724974e)), closes [#88](https://github.com/kazupon/vue-i18n/issues/88)
+
+
+### :zap: Improvements
+
+* **extend:** support translate empty string ([#86](https://github.com/kazupon/vue-i18n/issues/86)) by [@QingWei](https://github.com/QingWei)-Li ([8e6d154](https://github.com/kazupon/vue-i18n/commit/8e6d154))
+
+
+
+<a name="4.7.1"></a>
+## [4.7.1](https://github.com/kazupon/vue-i18n/compare/v4.7.0...v4.7.1) (2016-10-29)
+
+
+### :bug: Bug Fixes
+
+* **interpolate:** named formatting: use name if value is missing ([#77](https://github.com/kazupon/vue-i18n/issues/77)) by [@SebastianS90](https://github.com/SebastianS90) ([a0cc343](https://github.com/kazupon/vue-i18n/commit/a0cc343))
+
+
+### :zap: Improvements
+
+* **named:** using default use nmae when value is missing ([c34e8f1](https://github.com/kazupon/vue-i18n/commit/c34e8f1))
+
+
+
+<a name="4.7.0"></a>
+# [4.7.0](https://github.com/kazupon/vue-i18n/compare/v4.6.0...v4.7.0) (2016-10-28)
+
+
+### :star: New Features
+
+* hot reloading ([#71](https://github.com/kazupon/vue-i18n/issues/71)) by [@gglnx](https://github.com/gglnx) ([7bb94ac](https://github.com/kazupon/vue-i18n/commit/7bb94ac))
+
+
+### :zap: Improvements
+
+* **pluralization:** zero choice ([#70](https://github.com/kazupon/vue-i18n/issues/70)) by [@sebwas](https://github.com/sebwas) ([5f0004f](https://github.com/kazupon/vue-i18n/commit/5f0004f))
+
+
+
+<a name="4.6.0"></a>
+# [4.6.0](https://github.com/kazupon/vue-i18n/compare/v4.5.0...v4.6.0) (2016-09-24)
+
+
+### :star: New Features
+
+* **config:** custom message formatter ([#57](https://github.com/kazupon/vue-i18n/issues/57)) by [@jvmccarthy](https://github.com/jvmccarthy) ([2748eb4](https://github.com/kazupon/vue-i18n/commit/2748eb4))
+
+
+
+<a name="4.5.0"></a>
+# [4.5.0](https://github.com/kazupon/vue-i18n/compare/v4.4.1...v4.5.0) (2016-09-15)
+
+
+### :star: New Features
+
+* **config:** translation miss capturing configration ([aca0ed6](https://github.com/kazupon/vue-i18n/commit/aca0ed6)), closes [#54](https://github.com/kazupon/vue-i18n/issues/54)
+
+
+
+<a name="4.4.1"></a>
+## [4.4.1](https://github.com/kazupon/vue-i18n/compare/v4.4.0...v4.4.1) (2016-09-10)
+
+
+### :zap: Improvements
+
+* **translate:** support hyphenated key ([#52](https://github.com/kazupon/vue-i18n/issues/52)) by [@tariq86](https://github.com/tariq86) ([a40acfd](https://github.com/kazupon/vue-i18n/commit/a40acfd))
+
+
+
+<a name="4.4.0"></a>
+# [4.4.0](https://github.com/kazupon/vue-i18n/compare/v4.3.1...v4.4.0) (2016-08-29)
+
+
+### :star: New Features
+
+* add linked translations ([#50](https://github.com/kazupon/vue-i18n/issues/50)) by [@mmochetti](https://github.com/mmochetti) ([f7ae073](https://github.com/kazupon/vue-i18n/commit/f7ae073))
+
+
+
+<a name="4.3.1"></a>
+## [4.3.1](https://github.com/kazupon/vue-i18n/compare/v4.3.0...v4.3.1) (2016-08-26)
+
+
+### :bug: Bug Fixes
+
+* **npm:** fix installing bug ([57e66aa](https://github.com/kazupon/vue-i18n/commit/57e66aa)), closes [#46](https://github.com/kazupon/vue-i18n/issues/46)
+
+
+
+<a name="4.3.0"></a>
+# [4.3.0](https://github.com/kazupon/vue-i18n/compare/v4.2.3...v4.3.0) (2016-08-26)
+
+
+### :star: New Features
+
+* add pluralization ([#44](https://github.com/kazupon/vue-i18n/issues/44)) by [@mmochetti](https://github.com/mmochetti) ([b5b84d8](https://github.com/kazupon/vue-i18n/commit/b5b84d8))
+
+
+
+<a name="4.2.3"></a>
+## [4.2.3](https://github.com/kazupon/vue-i18n/compare/v4.2.2...v4.2.3) (2016-08-23)
+
+
+### :chart_with_upwards_trend: Performance Fixes
+
+* improve re-rendering cost when change the lang ([0707338](https://github.com/kazupon/vue-i18n/commit/0707338))
+
+
+
+<a name="4.2.2"></a>
+## [4.2.2](https://github.com/kazupon/vue-i18n/compare/v4.2.1...v4.2.2) (2016-08-15)
+
+
+### :bug: Bug Fixes
+
+* **path:** fix array path syntax error ([bc9dbee](https://github.com/kazupon/vue-i18n/commit/bc9dbee)), closes [#42](https://github.com/kazupon/vue-i18n/issues/42) [#43](https://github.com/kazupon/vue-i18n/issues/43)
+
+
+
+<a name="4.2.1"></a>
+## [4.2.1](https://github.com/kazupon/vue-i18n/compare/v4.2.0...v4.2.1) (2016-08-13)
+
+
+### :zap: Improvements
+
+* **translate:** fallback translation warning ([5f6b271](https://github.com/kazupon/vue-i18n/commit/5f6b271))
+
+
+
+<a name="4.2.0"></a>
+# [4.2.0](https://github.com/kazupon/vue-i18n/compare/v4.1.0...v4.2.0) (2016-08-12)
+
+
+### :chart_with_upwards_trend: Performance Fixes
+
+* **format:** use hasOwn function of Vue.util ([a8a19a0](https://github.com/kazupon/vue-i18n/commit/a8a19a0))
+
+
+### :star: New Features
+
+* **fallback:** add fallback translation feature ([1d1f0f2](https://github.com/kazupon/vue-i18n/commit/1d1f0f2)), closes [#36](https://github.com/kazupon/vue-i18n/issues/36)
+
+
+
+<a name="4.1.0"></a>
+# [4.1.0](https://github.com/kazupon/vue-i18n/compare/v4.0.1...v4.1.0) (2016-07-25)
+
+
+### :bug: Bug Fixes
+
+* **util:** fixed isArray reference errors ([0c6f6a0](https://github.com/kazupon/vue-i18n/commit/0c6f6a0))
+
+
+### :star: New Features
+
+* support vue 2.0.0.beta later ([0e1d2f7](https://github.com/kazupon/vue-i18n/commit/0e1d2f7))
+
+
+
+<a name="4.0.1"></a>
+## [4.0.1](https://github.com/kazupon/vue-i18n/compare/v4.0.0...v4.0.1) (2016-06-06)
+
+
+### :bug: Bug Fixes
+
+* **translate:** fix underscore named argument translate issue ([eeaf936](https://github.com/kazupon/vue-i18n/commit/eeaf936))
+
+
+
+<a name="4.0.0"></a>
+# [4.0.0](https://github.com/kazupon/vue-i18n/compare/v3.1.1...v4.0.0) (2016-05-10)
+
+
+### :zap: Improvements
+
+* support vue 2.0-pre-alpha ([f6517bc](https://github.com/kazupon/vue-i18n/commit/f6517bc))
+
+
+
+<a name="3.1.1"></a>
+## [3.1.1](https://github.com/kazupon/vue-i18n/compare/v3.1.0...v3.1.1) (2016-05-09)
+
+
+### :star: New Features
+
+* auto installation for standalone ([2b0dc09](https://github.com/kazupon/vue-i18n/commit/2b0dc09))
+
+
+
+<a name="3.1.0"></a>
+# [3.1.0](https://github.com/kazupon/vue-i18n/compare/v3.0.0...v3.1.0) (2016-05-09)
+
+
+### :star: New Features
+
+* component locales ([12fe695](https://github.com/kazupon/vue-i18n/commit/12fe695)), closes [#29](https://github.com/kazupon/vue-i18n/issues/29)
+
+
+### :warning: Depcreted
+
+* **options:** remove Vue.use options ([d87b59b](https://github.com/kazupon/vue-i18n/commit/d87b59b))
+
+
+### :zap: Improvements
+
+* **keypath:** port the object path parser ([3ae04b7](https://github.com/kazupon/vue-i18n/commit/3ae04b7))
+* **translation:** fix hypenate included key translating ([d0a415f](https://github.com/kazupon/vue-i18n/commit/d0a415f)), closes [#24](https://github.com/kazupon/vue-i18n/issues/24)
+* **translation:** warning outputing when cannot translate with keypath ([b4c7c0e](https://github.com/kazupon/vue-i18n/commit/b4c7c0e)), closes [#22](https://github.com/kazupon/vue-i18n/issues/22)
+
+
+
+<a name="3.0.0"></a>
+# [3.0.0](https://github.com/kazupon/vue-i18n/compare/v2.4.1...v3.0.0) (2016-04-18)
+
+
+### Features
+
+* **lang:** support lang reactive changing ([203ee85](https://github.com/kazupon/vue-i18n/commit/203ee85)), closes [#2](https://github.com/kazupon/vue-i18n/issues/2) [#15](https://github.com/kazupon/vue-i18n/issues/15)
+* **locale:** support dynamic local ([4d61e8d](https://github.com/kazupon/vue-i18n/commit/4d61e8d)), closes [#6](https://github.com/kazupon/vue-i18n/issues/6) [#21](https://github.com/kazupon/vue-i18n/issues/21)
+
+### DEPRECATED
+
+* **index:** plugin install `Vue.use` options (`options.locales`, `options.lang`). See [README](https://github.com/kazupon/vue-i18n/blob/dev/README.md)
+
+
+<a name="2.4.1"></a>
+## [2.4.1](https://github.com/kazupon/vue-i18n/compare/v2.4.0...v2.4.1) (2016-02-29)
+
+### Features
+
+* **i18n:** support ruby on rails i18n interpolation format ([b6b2490](https://github.com/kazupon/vue-i18n/commit/b6b2490))
+
+
+
+<a name="2.4.0"></a>
+# [2.4.0](https://github.com/kazupon/vue-i18n/compare/v2.3.3...v2.4.0) (2016-02-06)
+
+
+### Features
+
+* **i18n:** add Vue.t function ([68935e3](https://github.com/kazupon/vue-i18n/commit/68935e3)), closes [#17](https://github.com/kazupon/vue-i18n/issues/17)
+
+
+
+<a name="2.3.3"></a>
+## [2.3.3](https://github.com/kazupon/vue-i18n/compare/v2.3.2...v2.3.3) (2015-12-09)
+
+
+### Bug Fixes
+
+* **npm:** npm install error ([e31e89e](https://github.com/kazupon/vue-i18n/commit/e31e89e))
+
+### Features
+
+* **bower:** good-bye bower :wink: ([d99eb15](https://github.com/kazupon/vue-i18n/commit/d99eb15))
+
+
+### BREAKING CHANGES
+
+* bower: not support `bower` package manager
+
+I think that bower is dead. :no_good:
+
+
+
+<a name="2.3.2"></a>
+## [2.3.2](https://github.com/kazupon/vue-i18n/compare/v2.3.1...v2.3.2) (2015-12-09)
+
+
+### Features
+
+* **bundle:** more compact the vue-i18n distribution file ([2f32ecc](https://github.com/kazupon/vue-i18n/commit/2f32ecc))
+
+
+
+<a name="2.3.1"></a>
+## [2.3.1](https://github.com/kazupon/vue-i18n/compare/v2.3.0...v2.3.1) (2015-12-01)
+
+### Reverts
+
+* **index:** automatically install for standalone ([25b8059](https://github.com/kazupon/vue-i18n/commit/25b8059))
+
+
+
+<a name="2.3.0"></a>
+# [2.3.0](https://github.com/kazupon/vue-i18n/compare/v2.2.0...v2.3.0) (2015-11-26)
+
+
+### Bug Fixes
+
+* **index:** cannot work at Vue 1.0.10 later ([6fd543e](https://github.com/kazupon/vue-i18n/commit/6fd543e)), closes [#9](https://github.com/kazupon/vue-i18n/issues/9)
+
+### Features
+
+* **index:** support automatically install for standalone ([ada2673](https://github.com/kazupon/vue-i18n/commit/ada2673))
+
+
+
+# v2.2.0 / 2015-09-16
+
+* Re-implemetation with ES6 (babel)
+
+# v2.1.0 / 2015-07-03
+
+* Add global local language setting with `Vue.config.lang`
+
+# v2.0.0 / 2015-06-29
+
+* Support Vue.js 0.12
+* Remove the followings (Breaking Changes)
+    * `Vue.t` function
+    * `v-t` directive
+
+# v1.1.1 / 2015-04-21
+
+* Fix unit test error
+
+# v1.1.0 / 2015-01-10
+
+* Support template string in `$t` method
+* Support language changing in `$t` method
+
+# v1.0.0 / 2015-01-10
+
+* Add `$t` method
+
+# v0.11.0 / 2014-11-07
+
+* Bump to 0.11.0
+
+# v0.2.0 / 2014-10-08
+
+* Support Vue.js 0.11.0-rc
+
+# v0.1.2 / 2014-10-07
+
+* Support bower
+
+# v0.1.1 / 2014-10-06
+
+* Add `Vue.t` function
+
+# v0.1.0 / 2014-05-06
+
+* Release first
+
+# v0.0.0 / 2014-05-03
+
+* Initial project
diff --git a/node_modules/vue-i18n/LICENSE b/node_modules/vue-i18n/LICENSE
new file mode 100644
index 0000000..398540b
--- /dev/null
+++ b/node_modules/vue-i18n/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 kazuya kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/node_modules/vue-i18n/README.md b/node_modules/vue-i18n/README.md
new file mode 100644
index 0000000..cbc79b7
--- /dev/null
+++ b/node_modules/vue-i18n/README.md
@@ -0,0 +1,73 @@
+<p align="center"><img width="128px" height="112px" src="./assets/vue-i18n-logo.png" alt="Vue I18n logo"></p>
+<h1 align="center">vue-i18n</h1>
+<p align="center">
+  <a href="https://circleci.com/gh/kazupon/vue-i18n/tree/dev"><img src="https://circleci.com/gh/kazupon/vue-i18n/tree/dev.svg?style=shield" alt="Build Status"></a>
+  <a href="https://codecov.io/gh/kazupon/vue-i18n"><img src="https://codecov.io/gh/kazupon/vue-i18n/branch/dev/graph/badge.svg" alt="Coverage Status"></a>
+  <a href="http://badge.fury.io/js/vue-i18n"><img src="https://badge.fury.io/js/vue-i18n.svg" alt="NPM version"></a>
+  <a href="https://discord.gg/4yCnk2m"><img src="https://img.shields.io/badge/Discord-join%20chat-738bd7.svg" alt="vue-i18n channel on Discord"></a>
+  <a href="https://devtoken.rocks/package/vue-i18n"><img src="https://badge.devtoken.rocks/vue-i18n" alt="vue-i18n Dev Token"></a>
+</p>
+
+<p align="center">Internationalization plugin for Vue.js</p>
+
+<br/>
+
+<h3 align="center">Silver Sponsors</h3>
+
+<p align="center">
+  <a href="https://www.codeandweb.com/babeledit?utm_campaign=vue-i18n-2019-01" target="_blank">
+    <img src="https://raw.githubusercontent.com/kazupon/vue-i18n/dev/vuepress/.vuepress/public/patrons/babeledit.png">
+  </a>
+</p>
+
+<h3 align="center">Bronze Sponsors</h3>
+
+<p align="center">
+  <a href="https://zenarchitects.co.jp/" target="_blank">
+    <img src="https://raw.githubusercontent.com/kazupon/vue-i18n/v8.x/vuepress/.vuepress/public/patrons/zenarchitects.png">
+  </a>
+</p>
+
+<br/>
+
+<p align="center">
+  <a href="https://www.patreon.com/kazupon" target="_blank">
+    <img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Become a Patreon">
+  </a>
+</p>
+
+<br/>
+
+## :loudspeaker: Notice
+
+vue-i18n will soon be transferred to [intlify organization](https://github.com/intlify). After that, it will be developed and maintained on intlify.
+
+The `vue-i18n` that has been released on npm will be released as `@intlify/vue-i18n` in near future.
+
+`@intlify/vue-i18n` repo is [here](https://github.com/intlify/vue-i18n-next)
+
+Intlify is a new i18n project kickoff by @kazupon. 😉
+
+## :book: Documentation
+
+See [here](http://kazupon.github.io/vue-i18n/)
+
+
+## :scroll: Changelog
+
+Detailed changes for each release are documented in the [CHANGELOG.md](https://github.com/kazupon/vue-i18n/blob/dev/CHANGELOG.md).
+
+
+## :exclamation: Issues
+
+Please make sure to read the [Issue Reporting Checklist](https://github.com/kazupon/vue-i18n/blob/dev/CONTRIBUTING.md#issue-reporting-guidelines) before opening an issue. Issues not conforming to the guidelines may be closed immediately.
+
+
+## :muscle: Contribution
+
+Please make sure to read the [Contributing Guide](https://github.com/kazupon/vue-i18n/blob/dev/CONTRIBUTING.md) before making a pull request.
+
+
+## :copyright: License
+
+[MIT](http://opensource.org/licenses/MIT)
diff --git a/node_modules/vue-i18n/decls/i18n.js b/node_modules/vue-i18n/decls/i18n.js
new file mode 100644
index 0000000..d89ba9a
--- /dev/null
+++ b/node_modules/vue-i18n/decls/i18n.js
@@ -0,0 +1,155 @@
+declare var Intl: any;
+
+declare type Path = string;
+declare type Locale = string;
+declare type FallbackLocale = string | string[] | false | { [locale: string]: string[] };
+declare type LocaleMessage = string | LocaleMessageObject | LocaleMessageArray;
+declare type LocaleMessageObject = { [key: Path]: LocaleMessage };
+declare type LocaleMessageArray = Array<LocaleMessage>;
+declare type LocaleMessages = { [key: Locale]: LocaleMessageObject };
+
+// This options is the same as Intl.DateTimeFormat constructor options:
+// http://www.ecma-international.org/ecma-402/2.0/#sec-intl-datetimeformat-constructor
+declare type DateTimeFormatOptions = {
+  year?: 'numeric' | '2-digit',
+  month?: 'numeric' | '2-digit' | 'narrow' | 'short' | 'long',
+  day?: 'numeric' | '2-digit',
+  hour?: 'numeric' | '2-digit',
+  minute?: 'numeric' | '2-digit',
+  second?: 'numeric' | '2-digit',
+  weekday?: 'narrow' | 'short' | 'long',
+  hour12?: boolean,
+  era?: 'narrow' | 'short' | 'long',
+  timeZone?: string, // IANA time zone
+  timeZoneName?: 'short' | 'long',
+  localeMatcher?: 'lookup' | 'best fit',
+  formatMatcher?: 'basic' | 'best fit'
+};
+declare type DateTimeFormat = { [key: string]: DateTimeFormatOptions };
+declare type DateTimeFormats = { [key: Locale]: DateTimeFormat };
+
+// This options is the same as Intl.NumberFormat constructor options:
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat
+declare type NumberFormatOptions = {
+  style?: 'decimal' | 'currency' | 'percent',
+  currency?: string, // ISO 4217 currency codes
+  currencyDisplay?: 'symbol' | 'code' | 'name',
+  useGrouping?: boolean,
+  minimumIntegerDigits?: number,
+  minimumFractionDigits?: number,
+  maximumFractionDigits?: number,
+  minimumSignificantDigits?: number,
+  maximumSignificantDigits?: number,
+  localeMatcher?: 'lookup' | 'best fit',
+  formatMatcher?: 'basic' | 'best fit'
+};
+declare type NumberFormat = { [key: string]: NumberFormatOptions };
+declare type NumberFormats = { [key: Locale]: NumberFormat };
+declare type Modifiers = { [key: string]: (str: string) => string };
+
+declare type TranslateResult = string | LocaleMessages;
+declare type DateTimeFormatResult = string;
+declare type NumberFormatResult = string;
+declare type MissingHandler = (locale: Locale, key: Path, vm?: any) => string | void;
+declare type PostTranslationHandler = (str: string, key?: string) => string;
+declare type GetChoiceIndex = (choice: number, choicesLength: number) => number
+declare type ComponentInstanceCreatedListener = (newI18n: I18n, rootI18n: I18n) => void;
+
+declare type FormattedNumberPartType = 'currency' | 'decimal' | 'fraction' | 'group' | 'infinity' | 'integer' | 'literal' | 'minusSign' | 'nan' | 'plusSign' | 'percentSign';
+declare type FormattedNumberPart = {
+  type: FormattedNumberPartType,
+  value: string,
+};
+// This array is the same as Intl.NumberFormat.formatToParts() return value:
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat/formatToParts#Return_value
+declare type NumberFormatToPartsResult = Array<FormattedNumberPart>;
+
+declare type WarnHtmlInMessageLevel = 'off' | 'warn' | 'error';
+
+declare type I18nOptions = {
+  locale?: Locale,
+  fallbackLocale?: FallbackLocale,
+  messages?: LocaleMessages,
+  dateTimeFormats?: DateTimeFormats,
+  numberFormats?: NumberFormats,
+  formatter?: Formatter,
+  missing?: MissingHandler,
+  modifiers?: Modifiers,
+  root?: I18n, // for internal
+  fallbackRoot?: boolean,
+  formatFallbackMessages?: boolean,
+  sync?: boolean,
+  silentTranslationWarn?: boolean | RegExp,
+  silentFallbackWarn?: boolean | RegExp,
+  pluralizationRules?: PluralizationRules,
+  preserveDirectiveContent?: boolean,
+  warnHtmlInMessage?: WarnHtmlInMessageLevel,
+  sharedMessages?: LocaleMessage,
+  postTranslation?: PostTranslationHandler,
+  componentInstanceCreatedListener?: ComponentInstanceCreatedListener,
+};
+
+declare type IntlAvailability = {
+  dateTimeFormat: boolean,
+  numberFormat: boolean
+};
+
+declare type PluralizationRules = {
+  [lang: string]: GetChoiceIndex,
+}
+
+declare interface I18n {
+  static install: () => void, // for Vue plugin interface
+  static version: string,
+  static availabilities: IntlAvailability,
+  get vm (): any, // for internal
+  get locale (): Locale,
+  set locale (locale: Locale): void,
+  get fallbackLocale (): FallbackLocale,
+  set fallbackLocale (locale: FallbackLocale): void,
+  get messages (): LocaleMessages,
+  get dateTimeFormats (): DateTimeFormats,
+  get numberFormats (): NumberFormats,
+  get availableLocales (): Locale[],
+  get missing (): ?MissingHandler,
+  set missing (handler: MissingHandler): void,
+  get formatter (): Formatter,
+  set formatter (formatter: Formatter): void,
+  get formatFallbackMessages (): boolean,
+  set formatFallbackMessages (fallback: boolean): void,
+  get silentTranslationWarn (): boolean | RegExp,
+  set silentTranslationWarn (silent: boolean | RegExp): void,
+  get silentFallbackWarn (): boolean | RegExp,
+  set silentFallbackWarn (slient: boolean | RegExp): void,
+  get pluralizationRules (): PluralizationRules,
+  set pluralizationRules (rules: PluralizationRules): void,
+  get preserveDirectiveContent (): boolean,
+  set preserveDirectiveContent (preserve: boolean): void,
+  get warnHtmlInMessage (): WarnHtmlInMessageLevel,
+  set warnHtmlInMessage (level: WarnHtmlInMessageLevel): void,
+  get postTranslation (): ?PostTranslationHandler,
+  set postTranslation (handler: PostTranslationHandler): void,
+
+  getLocaleMessage (locale: Locale): LocaleMessageObject,
+  setLocaleMessage (locale: Locale, message: LocaleMessageObject): void,
+  mergeLocaleMessage (locale: Locale, message: LocaleMessageObject): void,
+  t (key: Path, ...values: any): TranslateResult,
+  i (key: Path, locale: Locale, values: Object): TranslateResult,
+  tc (key: Path, choice?: number, ...values: any): TranslateResult,
+  te (key: Path, locale?: Locale): boolean,
+  getDateTimeFormat (locale: Locale): DateTimeFormat,
+  setDateTimeFormat (locale: Locale, format: DateTimeFormat): void,
+  mergeDateTimeFormat (locale: Locale, format: DateTimeFormat): void,
+  d (value: number | Date, ...args: any): DateTimeFormatResult,
+  getNumberFormat (locale: Locale): NumberFormat,
+  setNumberFormat (locale: Locale, format: NumberFormat): void,
+  mergeNumberFormat (locale: Locale, format: NumberFormat): void,
+  n (value: number, ...args: any): NumberFormatResult,
+  getChoiceIndex: GetChoiceIndex,
+  pluralizationRules: PluralizationRules,
+  preserveDirectiveContent: boolean
+};
+
+declare interface Formatter {
+  interpolate (message: string, values: any, path: string): (Array<any> | null)
+};
diff --git a/node_modules/vue-i18n/decls/module.js b/node_modules/vue-i18n/decls/module.js
new file mode 100644
index 0000000..da1873d
--- /dev/null
+++ b/node_modules/vue-i18n/decls/module.js
@@ -0,0 +1,30 @@
+declare type $npm$Vue$Dictionaly<T> = { [key: string]: T }
+
+declare type Util = {
+  extend: (to: Object, from: ?Object) => Object,
+  hasOwn: (obj: Object, key: string) => boolean,
+  isPlainObject: (obj: any) => boolean,
+  isObject: (obj: mixed) => boolean,
+}
+
+declare type Config = {
+  optionMergeStrategies: $npm$Vue$Dictionaly<Function>,
+  silent: boolean,
+  productionTip: boolean,
+  performance: boolean,
+  devtools: boolean,
+  errorHandler: ?(err: Error, vm: Vue, info: string) => void,
+  ignoredElements: Array<string>,
+  keyCodes: $npm$Vue$Dictionaly<number>,
+  isReservedTag: (x?: string) => boolean,
+  parsePlatformTagName: (x: string) => string,
+  isUnknownElement: (x?: string) => boolean,
+  getTagNamespace: (x?: string) => string | void,
+  mustUseProp: (tag: string, type: ?string, name: string) => boolean,
+}
+
+declare interface Vue {
+  static config: Config,
+  static util: Util,
+  static version: string,
+}
diff --git a/node_modules/vue-i18n/dist/vue-i18n.common.js b/node_modules/vue-i18n/dist/vue-i18n.common.js
new file mode 100644
index 0000000..48e2000
--- /dev/null
+++ b/node_modules/vue-i18n/dist/vue-i18n.common.js
@@ -0,0 +1,2132 @@
+/*!
+ * vue-i18n v8.20.0 
+ * (c) 2020 kazuya kawaguchi
+ * Released under the MIT License.
+ */
+'use strict';
+
+/*  */
+
+/**
+ * constants
+ */
+
+var numberFormatKeys = [
+  'style',
+  'currency',
+  'currencyDisplay',
+  'useGrouping',
+  'minimumIntegerDigits',
+  'minimumFractionDigits',
+  'maximumFractionDigits',
+  'minimumSignificantDigits',
+  'maximumSignificantDigits',
+  'localeMatcher',
+  'formatMatcher',
+  'unit'
+];
+
+/**
+ * utilities
+ */
+
+function warn (msg, err) {
+  if (typeof console !== 'undefined') {
+    console.warn('[vue-i18n] ' + msg);
+    /* istanbul ignore if */
+    if (err) {
+      console.warn(err.stack);
+    }
+  }
+}
+
+function error (msg, err) {
+  if (typeof console !== 'undefined') {
+    console.error('[vue-i18n] ' + msg);
+    /* istanbul ignore if */
+    if (err) {
+      console.error(err.stack);
+    }
+  }
+}
+
+var isArray = Array.isArray;
+
+function isObject (obj) {
+  return obj !== null && typeof obj === 'object'
+}
+
+function isBoolean (val) {
+  return typeof val === 'boolean'
+}
+
+function isString (val) {
+  return typeof val === 'string'
+}
+
+var toString = Object.prototype.toString;
+var OBJECT_STRING = '[object Object]';
+function isPlainObject (obj) {
+  return toString.call(obj) === OBJECT_STRING
+}
+
+function isNull (val) {
+  return val === null || val === undefined
+}
+
+function parseArgs () {
+  var args = [], len = arguments.length;
+  while ( len-- ) args[ len ] = arguments[ len ];
+
+  var locale = null;
+  var params = null;
+  if (args.length === 1) {
+    if (isObject(args[0]) || Array.isArray(args[0])) {
+      params = args[0];
+    } else if (typeof args[0] === 'string') {
+      locale = args[0];
+    }
+  } else if (args.length === 2) {
+    if (typeof args[0] === 'string') {
+      locale = args[0];
+    }
+    /* istanbul ignore if */
+    if (isObject(args[1]) || Array.isArray(args[1])) {
+      params = args[1];
+    }
+  }
+
+  return { locale: locale, params: params }
+}
+
+function looseClone (obj) {
+  return JSON.parse(JSON.stringify(obj))
+}
+
+function remove (arr, item) {
+  if (arr.length) {
+    var index = arr.indexOf(item);
+    if (index > -1) {
+      return arr.splice(index, 1)
+    }
+  }
+}
+
+function includes (arr, item) {
+  return !!~arr.indexOf(item)
+}
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+function hasOwn (obj, key) {
+  return hasOwnProperty.call(obj, key)
+}
+
+function merge (target) {
+  var arguments$1 = arguments;
+
+  var output = Object(target);
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments$1[i];
+    if (source !== undefined && source !== null) {
+      var key = (void 0);
+      for (key in source) {
+        if (hasOwn(source, key)) {
+          if (isObject(source[key])) {
+            output[key] = merge(output[key], source[key]);
+          } else {
+            output[key] = source[key];
+          }
+        }
+      }
+    }
+  }
+  return output
+}
+
+function looseEqual (a, b) {
+  if (a === b) { return true }
+  var isObjectA = isObject(a);
+  var isObjectB = isObject(b);
+  if (isObjectA && isObjectB) {
+    try {
+      var isArrayA = Array.isArray(a);
+      var isArrayB = Array.isArray(b);
+      if (isArrayA && isArrayB) {
+        return a.length === b.length && a.every(function (e, i) {
+          return looseEqual(e, b[i])
+        })
+      } else if (!isArrayA && !isArrayB) {
+        var keysA = Object.keys(a);
+        var keysB = Object.keys(b);
+        return keysA.length === keysB.length && keysA.every(function (key) {
+          return looseEqual(a[key], b[key])
+        })
+      } else {
+        /* istanbul ignore next */
+        return false
+      }
+    } catch (e) {
+      /* istanbul ignore next */
+      return false
+    }
+  } else if (!isObjectA && !isObjectB) {
+    return String(a) === String(b)
+  } else {
+    return false
+  }
+}
+
+/*  */
+
+function extend (Vue) {
+  if (!Vue.prototype.hasOwnProperty('$i18n')) {
+    // $FlowFixMe
+    Object.defineProperty(Vue.prototype, '$i18n', {
+      get: function get () { return this._i18n }
+    });
+  }
+
+  Vue.prototype.$t = function (key) {
+    var values = [], len = arguments.length - 1;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 1 ];
+
+    var i18n = this.$i18n;
+    return i18n._t.apply(i18n, [ key, i18n.locale, i18n._getMessages(), this ].concat( values ))
+  };
+
+  Vue.prototype.$tc = function (key, choice) {
+    var values = [], len = arguments.length - 2;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 2 ];
+
+    var i18n = this.$i18n;
+    return i18n._tc.apply(i18n, [ key, i18n.locale, i18n._getMessages(), this, choice ].concat( values ))
+  };
+
+  Vue.prototype.$te = function (key, locale) {
+    var i18n = this.$i18n;
+    return i18n._te(key, i18n.locale, i18n._getMessages(), locale)
+  };
+
+  Vue.prototype.$d = function (value) {
+    var ref;
+
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+    return (ref = this.$i18n).d.apply(ref, [ value ].concat( args ))
+  };
+
+  Vue.prototype.$n = function (value) {
+    var ref;
+
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+    return (ref = this.$i18n).n.apply(ref, [ value ].concat( args ))
+  };
+}
+
+/*  */
+
+var mixin = {
+  beforeCreate: function beforeCreate () {
+    var options = this.$options;
+    options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            var localeMessages = {};
+            options.__i18n.forEach(function (resource) {
+              localeMessages = merge(localeMessages, JSON.parse(resource));
+            });
+            Object.keys(localeMessages).forEach(function (locale) {
+              options.i18n.mergeLocaleMessage(locale, localeMessages[locale]);
+            });
+          } catch (e) {
+            if (process.env.NODE_ENV !== 'production') {
+              error("Cannot parse locale messages via custom blocks.", e);
+            }
+          }
+        }
+        this._i18n = options.i18n;
+        this._i18nWatcher = this._i18n.watchI18nData();
+      } else if (isPlainObject(options.i18n)) {
+        var rootI18n = this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n
+          ? this.$root.$i18n
+          : null;
+        // component local i18n
+        if (rootI18n) {
+          options.i18n.root = this.$root;
+          options.i18n.formatter = rootI18n.formatter;
+          options.i18n.fallbackLocale = rootI18n.fallbackLocale;
+          options.i18n.formatFallbackMessages = rootI18n.formatFallbackMessages;
+          options.i18n.silentTranslationWarn = rootI18n.silentTranslationWarn;
+          options.i18n.silentFallbackWarn = rootI18n.silentFallbackWarn;
+          options.i18n.pluralizationRules = rootI18n.pluralizationRules;
+          options.i18n.preserveDirectiveContent = rootI18n.preserveDirectiveContent;
+        }
+
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            var localeMessages$1 = {};
+            options.__i18n.forEach(function (resource) {
+              localeMessages$1 = merge(localeMessages$1, JSON.parse(resource));
+            });
+            options.i18n.messages = localeMessages$1;
+          } catch (e) {
+            if (process.env.NODE_ENV !== 'production') {
+              warn("Cannot parse locale messages via custom blocks.", e);
+            }
+          }
+        }
+
+        var ref = options.i18n;
+        var sharedMessages = ref.sharedMessages;
+        if (sharedMessages && isPlainObject(sharedMessages)) {
+          options.i18n.messages = merge(options.i18n.messages, sharedMessages);
+        }
+
+        this._i18n = new VueI18n(options.i18n);
+        this._i18nWatcher = this._i18n.watchI18nData();
+
+        if (options.i18n.sync === undefined || !!options.i18n.sync) {
+          this._localeWatcher = this.$i18n.watchLocale();
+        }
+
+        if (rootI18n) {
+          rootI18n.onComponentInstanceCreated(this._i18n);
+        }
+      } else {
+        if (process.env.NODE_ENV !== 'production') {
+          warn("Cannot be interpreted 'i18n' option.");
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      // root i18n
+      this._i18n = this.$root.$i18n;
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      // parent i18n
+      this._i18n = options.parent.$i18n;
+    }
+  },
+
+  beforeMount: function beforeMount () {
+    var options = this.$options;
+    options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      } else if (isPlainObject(options.i18n)) {
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      } else {
+        if (process.env.NODE_ENV !== 'production') {
+          warn("Cannot be interpreted 'i18n' option.");
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this);
+      this._subscribing = true;
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this);
+      this._subscribing = true;
+    }
+  },
+
+  beforeDestroy: function beforeDestroy () {
+    if (!this._i18n) { return }
+
+    var self = this;
+    this.$nextTick(function () {
+      if (self._subscribing) {
+        self._i18n.unsubscribeDataChanging(self);
+        delete self._subscribing;
+      }
+
+      if (self._i18nWatcher) {
+        self._i18nWatcher();
+        self._i18n.destroyVM();
+        delete self._i18nWatcher;
+      }
+
+      if (self._localeWatcher) {
+        self._localeWatcher();
+        delete self._localeWatcher;
+      }
+    });
+  }
+};
+
+/*  */
+
+var interpolationComponent = {
+  name: 'i18n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    path: {
+      type: String,
+      required: true
+    },
+    locale: {
+      type: String
+    },
+    places: {
+      type: [Array, Object]
+    }
+  },
+  render: function render (h, ref) {
+    var data = ref.data;
+    var parent = ref.parent;
+    var props = ref.props;
+    var slots = ref.slots;
+
+    var $i18n = parent.$i18n;
+    if (!$i18n) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot find VueI18n instance!');
+      }
+      return
+    }
+
+    var path = props.path;
+    var locale = props.locale;
+    var places = props.places;
+    var params = slots();
+    var children = $i18n.i(
+      path,
+      locale,
+      onlyHasDefaultPlace(params) || places
+        ? useLegacyPlaces(params.default, places)
+        : params
+    );
+
+    var tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+    return tag ? h(tag, data, children) : children
+  }
+};
+
+function onlyHasDefaultPlace (params) {
+  var prop;
+  for (prop in params) {
+    if (prop !== 'default') { return false }
+  }
+  return Boolean(prop)
+}
+
+function useLegacyPlaces (children, places) {
+  var params = places ? createParamsFromPlaces(places) : {};
+
+  if (!children) { return params }
+
+  // Filter empty text nodes
+  children = children.filter(function (child) {
+    return child.tag || child.text.trim() !== ''
+  });
+
+  var everyPlace = children.every(vnodeHasPlaceAttribute);
+  if (process.env.NODE_ENV !== 'production' && everyPlace) {
+    warn('`place` attribute is deprecated in next major version. Please switch to Vue slots.');
+  }
+
+  return children.reduce(
+    everyPlace ? assignChildPlace : assignChildIndex,
+    params
+  )
+}
+
+function createParamsFromPlaces (places) {
+  if (process.env.NODE_ENV !== 'production') {
+    warn('`places` prop is deprecated in next major version. Please switch to Vue slots.');
+  }
+
+  return Array.isArray(places)
+    ? places.reduce(assignChildIndex, {})
+    : Object.assign({}, places)
+}
+
+function assignChildPlace (params, child) {
+  if (child.data && child.data.attrs && child.data.attrs.place) {
+    params[child.data.attrs.place] = child;
+  }
+  return params
+}
+
+function assignChildIndex (params, child, index) {
+  params[index] = child;
+  return params
+}
+
+function vnodeHasPlaceAttribute (vnode) {
+  return Boolean(vnode.data && vnode.data.attrs && vnode.data.attrs.place)
+}
+
+/*  */
+
+var numberComponent = {
+  name: 'i18n-n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    value: {
+      type: Number,
+      required: true
+    },
+    format: {
+      type: [String, Object]
+    },
+    locale: {
+      type: String
+    }
+  },
+  render: function render (h, ref) {
+    var props = ref.props;
+    var parent = ref.parent;
+    var data = ref.data;
+
+    var i18n = parent.$i18n;
+
+    if (!i18n) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot find VueI18n instance!');
+      }
+      return null
+    }
+
+    var key = null;
+    var options = null;
+
+    if (isString(props.format)) {
+      key = props.format;
+    } else if (isObject(props.format)) {
+      if (props.format.key) {
+        key = props.format.key;
+      }
+
+      // Filter out number format options only
+      options = Object.keys(props.format).reduce(function (acc, prop) {
+        var obj;
+
+        if (includes(numberFormatKeys, prop)) {
+          return Object.assign({}, acc, ( obj = {}, obj[prop] = props.format[prop], obj ))
+        }
+        return acc
+      }, null);
+    }
+
+    var locale = props.locale || i18n.locale;
+    var parts = i18n._ntp(props.value, locale, key, options);
+
+    var values = parts.map(function (part, index) {
+      var obj;
+
+      var slot = data.scopedSlots && data.scopedSlots[part.type];
+      return slot ? slot(( obj = {}, obj[part.type] = part.value, obj.index = index, obj.parts = parts, obj )) : part.value
+    });
+
+    var tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+    return tag
+      ? h(tag, {
+        attrs: data.attrs,
+        'class': data['class'],
+        staticClass: data.staticClass
+      }, values)
+      : values
+  }
+};
+
+/*  */
+
+function bind (el, binding, vnode) {
+  if (!assert(el, vnode)) { return }
+
+  t(el, binding, vnode);
+}
+
+function update (el, binding, vnode, oldVNode) {
+  if (!assert(el, vnode)) { return }
+
+  var i18n = vnode.context.$i18n;
+  if (localeEqual(el, vnode) &&
+    (looseEqual(binding.value, binding.oldValue) &&
+     looseEqual(el._localeMessage, i18n.getLocaleMessage(i18n.locale)))) { return }
+
+  t(el, binding, vnode);
+}
+
+function unbind (el, binding, vnode, oldVNode) {
+  var vm = vnode.context;
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context');
+    return
+  }
+
+  var i18n = vnode.context.$i18n || {};
+  if (!binding.modifiers.preserve && !i18n.preserveDirectiveContent) {
+    el.textContent = '';
+  }
+  el._vt = undefined;
+  delete el['_vt'];
+  el._locale = undefined;
+  delete el['_locale'];
+  el._localeMessage = undefined;
+  delete el['_localeMessage'];
+}
+
+function assert (el, vnode) {
+  var vm = vnode.context;
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context');
+    return false
+  }
+
+  if (!vm.$i18n) {
+    warn('VueI18n instance does not exists in Vue instance');
+    return false
+  }
+
+  return true
+}
+
+function localeEqual (el, vnode) {
+  var vm = vnode.context;
+  return el._locale === vm.$i18n.locale
+}
+
+function t (el, binding, vnode) {
+  var ref$1, ref$2;
+
+  var value = binding.value;
+
+  var ref = parseValue(value);
+  var path = ref.path;
+  var locale = ref.locale;
+  var args = ref.args;
+  var choice = ref.choice;
+  if (!path && !locale && !args) {
+    warn('value type not supported');
+    return
+  }
+
+  if (!path) {
+    warn('`path` is required in v-t directive');
+    return
+  }
+
+  var vm = vnode.context;
+  if (choice != null) {
+    el._vt = el.textContent = (ref$1 = vm.$i18n).tc.apply(ref$1, [ path, choice ].concat( makeParams(locale, args) ));
+  } else {
+    el._vt = el.textContent = (ref$2 = vm.$i18n).t.apply(ref$2, [ path ].concat( makeParams(locale, args) ));
+  }
+  el._locale = vm.$i18n.locale;
+  el._localeMessage = vm.$i18n.getLocaleMessage(vm.$i18n.locale);
+}
+
+function parseValue (value) {
+  var path;
+  var locale;
+  var args;
+  var choice;
+
+  if (isString(value)) {
+    path = value;
+  } else if (isPlainObject(value)) {
+    path = value.path;
+    locale = value.locale;
+    args = value.args;
+    choice = value.choice;
+  }
+
+  return { path: path, locale: locale, args: args, choice: choice }
+}
+
+function makeParams (locale, args) {
+  var params = [];
+
+  locale && params.push(locale);
+  if (args && (Array.isArray(args) || isPlainObject(args))) {
+    params.push(args);
+  }
+
+  return params
+}
+
+var Vue;
+
+function install (_Vue) {
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && install.installed && _Vue === Vue) {
+    warn('already installed.');
+    return
+  }
+  install.installed = true;
+
+  Vue = _Vue;
+
+  var version = (Vue.version && Number(Vue.version.split('.')[0])) || -1;
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && version < 2) {
+    warn(("vue-i18n (" + (install.version) + ") need to use Vue 2.0 or later (Vue: " + (Vue.version) + ")."));
+    return
+  }
+
+  extend(Vue);
+  Vue.mixin(mixin);
+  Vue.directive('t', { bind: bind, update: update, unbind: unbind });
+  Vue.component(interpolationComponent.name, interpolationComponent);
+  Vue.component(numberComponent.name, numberComponent);
+
+  // use simple mergeStrategies to prevent i18n instance lose '__proto__'
+  var strats = Vue.config.optionMergeStrategies;
+  strats.i18n = function (parentVal, childVal) {
+    return childVal === undefined
+      ? parentVal
+      : childVal
+  };
+}
+
+/*  */
+
+var BaseFormatter = function BaseFormatter () {
+  this._caches = Object.create(null);
+};
+
+BaseFormatter.prototype.interpolate = function interpolate (message, values) {
+  if (!values) {
+    return [message]
+  }
+  var tokens = this._caches[message];
+  if (!tokens) {
+    tokens = parse(message);
+    this._caches[message] = tokens;
+  }
+  return compile(tokens, values)
+};
+
+
+
+var RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
+var RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
+
+function parse (format) {
+  var tokens = [];
+  var position = 0;
+
+  var text = '';
+  while (position < format.length) {
+    var char = format[position++];
+    if (char === '{') {
+      if (text) {
+        tokens.push({ type: 'text', value: text });
+      }
+
+      text = '';
+      var sub = '';
+      char = format[position++];
+      while (char !== undefined && char !== '}') {
+        sub += char;
+        char = format[position++];
+      }
+      var isClosed = char === '}';
+
+      var type = RE_TOKEN_LIST_VALUE.test(sub)
+        ? 'list'
+        : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
+          ? 'named'
+          : 'unknown';
+      tokens.push({ value: sub, type: type });
+    } else if (char === '%') {
+      // when found rails i18n syntax, skip text capture
+      if (format[(position)] !== '{') {
+        text += char;
+      }
+    } else {
+      text += char;
+    }
+  }
+
+  text && tokens.push({ type: 'text', value: text });
+
+  return tokens
+}
+
+function compile (tokens, values) {
+  var compiled = [];
+  var index = 0;
+
+  var mode = Array.isArray(values)
+    ? 'list'
+    : isObject(values)
+      ? 'named'
+      : 'unknown';
+  if (mode === 'unknown') { return compiled }
+
+  while (index < tokens.length) {
+    var token = tokens[index];
+    switch (token.type) {
+      case 'text':
+        compiled.push(token.value);
+        break
+      case 'list':
+        compiled.push(values[parseInt(token.value, 10)]);
+        break
+      case 'named':
+        if (mode === 'named') {
+          compiled.push((values)[token.value]);
+        } else {
+          if (process.env.NODE_ENV !== 'production') {
+            warn(("Type of token '" + (token.type) + "' and format of value '" + mode + "' don't match!"));
+          }
+        }
+        break
+      case 'unknown':
+        if (process.env.NODE_ENV !== 'production') {
+          warn("Detect 'unknown' type of token!");
+        }
+        break
+    }
+    index++;
+  }
+
+  return compiled
+}
+
+/*  */
+
+/**
+ *  Path parser
+ *  - Inspired:
+ *    Vue.js Path parser
+ */
+
+// actions
+var APPEND = 0;
+var PUSH = 1;
+var INC_SUB_PATH_DEPTH = 2;
+var PUSH_SUB_PATH = 3;
+
+// states
+var BEFORE_PATH = 0;
+var IN_PATH = 1;
+var BEFORE_IDENT = 2;
+var IN_IDENT = 3;
+var IN_SUB_PATH = 4;
+var IN_SINGLE_QUOTE = 5;
+var IN_DOUBLE_QUOTE = 6;
+var AFTER_PATH = 7;
+var ERROR = 8;
+
+var pathStateMachine = [];
+
+pathStateMachine[BEFORE_PATH] = {
+  'ws': [BEFORE_PATH],
+  'ident': [IN_IDENT, APPEND],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+};
+
+pathStateMachine[IN_PATH] = {
+  'ws': [IN_PATH],
+  '.': [BEFORE_IDENT],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+};
+
+pathStateMachine[BEFORE_IDENT] = {
+  'ws': [BEFORE_IDENT],
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND]
+};
+
+pathStateMachine[IN_IDENT] = {
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND],
+  'ws': [IN_PATH, PUSH],
+  '.': [BEFORE_IDENT, PUSH],
+  '[': [IN_SUB_PATH, PUSH],
+  'eof': [AFTER_PATH, PUSH]
+};
+
+pathStateMachine[IN_SUB_PATH] = {
+  "'": [IN_SINGLE_QUOTE, APPEND],
+  '"': [IN_DOUBLE_QUOTE, APPEND],
+  '[': [IN_SUB_PATH, INC_SUB_PATH_DEPTH],
+  ']': [IN_PATH, PUSH_SUB_PATH],
+  'eof': ERROR,
+  'else': [IN_SUB_PATH, APPEND]
+};
+
+pathStateMachine[IN_SINGLE_QUOTE] = {
+  "'": [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_SINGLE_QUOTE, APPEND]
+};
+
+pathStateMachine[IN_DOUBLE_QUOTE] = {
+  '"': [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_DOUBLE_QUOTE, APPEND]
+};
+
+/**
+ * Check if an expression is a literal value.
+ */
+
+var literalValueRE = /^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/;
+function isLiteral (exp) {
+  return literalValueRE.test(exp)
+}
+
+/**
+ * Strip quotes from a string
+ */
+
+function stripQuotes (str) {
+  var a = str.charCodeAt(0);
+  var b = str.charCodeAt(str.length - 1);
+  return a === b && (a === 0x22 || a === 0x27)
+    ? str.slice(1, -1)
+    : str
+}
+
+/**
+ * Determine the type of a character in a keypath.
+ */
+
+function getPathCharType (ch) {
+  if (ch === undefined || ch === null) { return 'eof' }
+
+  var code = ch.charCodeAt(0);
+
+  switch (code) {
+    case 0x5B: // [
+    case 0x5D: // ]
+    case 0x2E: // .
+    case 0x22: // "
+    case 0x27: // '
+      return ch
+
+    case 0x5F: // _
+    case 0x24: // $
+    case 0x2D: // -
+      return 'ident'
+
+    case 0x09: // Tab
+    case 0x0A: // Newline
+    case 0x0D: // Return
+    case 0xA0:  // No-break space
+    case 0xFEFF:  // Byte Order Mark
+    case 0x2028:  // Line Separator
+    case 0x2029:  // Paragraph Separator
+      return 'ws'
+  }
+
+  return 'ident'
+}
+
+/**
+ * Format a subPath, return its plain form if it is
+ * a literal string or number. Otherwise prepend the
+ * dynamic indicator (*).
+ */
+
+function formatSubPath (path) {
+  var trimmed = path.trim();
+  // invalid leading 0
+  if (path.charAt(0) === '0' && isNaN(path)) { return false }
+
+  return isLiteral(trimmed) ? stripQuotes(trimmed) : '*' + trimmed
+}
+
+/**
+ * Parse a string path into an array of segments
+ */
+
+function parse$1 (path) {
+  var keys = [];
+  var index = -1;
+  var mode = BEFORE_PATH;
+  var subPathDepth = 0;
+  var c;
+  var key;
+  var newChar;
+  var type;
+  var transition;
+  var action;
+  var typeMap;
+  var actions = [];
+
+  actions[PUSH] = function () {
+    if (key !== undefined) {
+      keys.push(key);
+      key = undefined;
+    }
+  };
+
+  actions[APPEND] = function () {
+    if (key === undefined) {
+      key = newChar;
+    } else {
+      key += newChar;
+    }
+  };
+
+  actions[INC_SUB_PATH_DEPTH] = function () {
+    actions[APPEND]();
+    subPathDepth++;
+  };
+
+  actions[PUSH_SUB_PATH] = function () {
+    if (subPathDepth > 0) {
+      subPathDepth--;
+      mode = IN_SUB_PATH;
+      actions[APPEND]();
+    } else {
+      subPathDepth = 0;
+      if (key === undefined) { return false }
+      key = formatSubPath(key);
+      if (key === false) {
+        return false
+      } else {
+        actions[PUSH]();
+      }
+    }
+  };
+
+  function maybeUnescapeQuote () {
+    var nextChar = path[index + 1];
+    if ((mode === IN_SINGLE_QUOTE && nextChar === "'") ||
+      (mode === IN_DOUBLE_QUOTE && nextChar === '"')) {
+      index++;
+      newChar = '\\' + nextChar;
+      actions[APPEND]();
+      return true
+    }
+  }
+
+  while (mode !== null) {
+    index++;
+    c = path[index];
+
+    if (c === '\\' && maybeUnescapeQuote()) {
+      continue
+    }
+
+    type = getPathCharType(c);
+    typeMap = pathStateMachine[mode];
+    transition = typeMap[type] || typeMap['else'] || ERROR;
+
+    if (transition === ERROR) {
+      return // parse error
+    }
+
+    mode = transition[0];
+    action = actions[transition[1]];
+    if (action) {
+      newChar = transition[2];
+      newChar = newChar === undefined
+        ? c
+        : newChar;
+      if (action() === false) {
+        return
+      }
+    }
+
+    if (mode === AFTER_PATH) {
+      return keys
+    }
+  }
+}
+
+
+
+
+
+var I18nPath = function I18nPath () {
+  this._cache = Object.create(null);
+};
+
+/**
+ * External parse that check for a cache hit first
+ */
+I18nPath.prototype.parsePath = function parsePath (path) {
+  var hit = this._cache[path];
+  if (!hit) {
+    hit = parse$1(path);
+    if (hit) {
+      this._cache[path] = hit;
+    }
+  }
+  return hit || []
+};
+
+/**
+ * Get path value from path string
+ */
+I18nPath.prototype.getPathValue = function getPathValue (obj, path) {
+  if (!isObject(obj)) { return null }
+
+  var paths = this.parsePath(path);
+  if (paths.length === 0) {
+    return null
+  } else {
+    var length = paths.length;
+    var last = obj;
+    var i = 0;
+    while (i < length) {
+      var value = last[paths[i]];
+      if (value === undefined) {
+        return null
+      }
+      last = value;
+      i++;
+    }
+
+    return last
+  }
+};
+
+/*  */
+
+
+
+var htmlTagMatcher = /<\/?[\w\s="/.':;#-\/]+>/;
+var linkKeyMatcher = /(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g;
+var linkKeyPrefixMatcher = /^@(?:\.([a-z]+))?:/;
+var bracketsMatcher = /[()]/g;
+var defaultModifiers = {
+  'upper': function (str) { return str.toLocaleUpperCase(); },
+  'lower': function (str) { return str.toLocaleLowerCase(); },
+  'capitalize': function (str) { return ("" + (str.charAt(0).toLocaleUpperCase()) + (str.substr(1))); }
+};
+
+var defaultFormatter = new BaseFormatter();
+
+var VueI18n = function VueI18n (options) {
+  var this$1 = this;
+  if ( options === void 0 ) options = {};
+
+  // Auto install if it is not done yet and `window` has `Vue`.
+  // To allow users to avoid auto-installation in some cases,
+  // this code should be placed here. See #290
+  /* istanbul ignore if */
+  if (!Vue && typeof window !== 'undefined' && window.Vue) {
+    install(window.Vue);
+  }
+
+  var locale = options.locale || 'en-US';
+  var fallbackLocale = options.fallbackLocale === false
+    ? false
+    : options.fallbackLocale || 'en-US';
+  var messages = options.messages || {};
+  var dateTimeFormats = options.dateTimeFormats || {};
+  var numberFormats = options.numberFormats || {};
+
+  this._vm = null;
+  this._formatter = options.formatter || defaultFormatter;
+  this._modifiers = options.modifiers || {};
+  this._missing = options.missing || null;
+  this._root = options.root || null;
+  this._sync = options.sync === undefined ? true : !!options.sync;
+  this._fallbackRoot = options.fallbackRoot === undefined
+    ? true
+    : !!options.fallbackRoot;
+  this._formatFallbackMessages = options.formatFallbackMessages === undefined
+    ? false
+    : !!options.formatFallbackMessages;
+  this._silentTranslationWarn = options.silentTranslationWarn === undefined
+    ? false
+    : options.silentTranslationWarn;
+  this._silentFallbackWarn = options.silentFallbackWarn === undefined
+    ? false
+    : !!options.silentFallbackWarn;
+  this._dateTimeFormatters = {};
+  this._numberFormatters = {};
+  this._path = new I18nPath();
+  this._dataListeners = [];
+  this._componentInstanceCreatedListener = options.componentInstanceCreatedListener || null;
+  this._preserveDirectiveContent = options.preserveDirectiveContent === undefined
+    ? false
+    : !!options.preserveDirectiveContent;
+  this.pluralizationRules = options.pluralizationRules || {};
+  this._warnHtmlInMessage = options.warnHtmlInMessage || 'off';
+  this._postTranslation = options.postTranslation || null;
+
+  /**
+   * @param choice {number} a choice index given by the input to $tc: `$tc('path.to.rule', choiceIndex)`
+   * @param choicesLength {number} an overall amount of available choices
+   * @returns a final choice index
+  */
+  this.getChoiceIndex = function (choice, choicesLength) {
+    var thisPrototype = Object.getPrototypeOf(this$1);
+    if (thisPrototype && thisPrototype.getChoiceIndex) {
+      var prototypeGetChoiceIndex = (thisPrototype.getChoiceIndex);
+      return (prototypeGetChoiceIndex).call(this$1, choice, choicesLength)
+    }
+
+    // Default (old) getChoiceIndex implementation - english-compatible
+    var defaultImpl = function (_choice, _choicesLength) {
+      _choice = Math.abs(_choice);
+
+      if (_choicesLength === 2) {
+        return _choice
+          ? _choice > 1
+            ? 1
+            : 0
+          : 1
+      }
+
+      return _choice ? Math.min(_choice, 2) : 0
+    };
+
+    if (this$1.locale in this$1.pluralizationRules) {
+      return this$1.pluralizationRules[this$1.locale].apply(this$1, [choice, choicesLength])
+    } else {
+      return defaultImpl(choice, choicesLength)
+    }
+  };
+
+
+  this._exist = function (message, key) {
+    if (!message || !key) { return false }
+    if (!isNull(this$1._path.getPathValue(message, key))) { return true }
+    // fallback for flat key
+    if (message[key]) { return true }
+    return false
+  };
+
+  if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+    Object.keys(messages).forEach(function (locale) {
+      this$1._checkLocaleMessage(locale, this$1._warnHtmlInMessage, messages[locale]);
+    });
+  }
+
+  this._initVM({
+    locale: locale,
+    fallbackLocale: fallbackLocale,
+    messages: messages,
+    dateTimeFormats: dateTimeFormats,
+    numberFormats: numberFormats
+  });
+};
+
+var prototypeAccessors = { vm: { configurable: true },messages: { configurable: true },dateTimeFormats: { configurable: true },numberFormats: { configurable: true },availableLocales: { configurable: true },locale: { configurable: true },fallbackLocale: { configurable: true },formatFallbackMessages: { configurable: true },missing: { configurable: true },formatter: { configurable: true },silentTranslationWarn: { configurable: true },silentFallbackWarn: { configurable: true },preserveDirectiveContent: { configurable: true },warnHtmlInMessage: { configurable: true },postTranslation: { configurable: true } };
+
+VueI18n.prototype._checkLocaleMessage = function _checkLocaleMessage (locale, level, message) {
+  var paths = [];
+
+  var fn = function (level, locale, message, paths) {
+    if (isPlainObject(message)) {
+      Object.keys(message).forEach(function (key) {
+        var val = message[key];
+        if (isPlainObject(val)) {
+          paths.push(key);
+          paths.push('.');
+          fn(level, locale, val, paths);
+          paths.pop();
+          paths.pop();
+        } else {
+          paths.push(key);
+          fn(level, locale, val, paths);
+          paths.pop();
+        }
+      });
+    } else if (Array.isArray(message)) {
+      message.forEach(function (item, index) {
+        if (isPlainObject(item)) {
+          paths.push(("[" + index + "]"));
+          paths.push('.');
+          fn(level, locale, item, paths);
+          paths.pop();
+          paths.pop();
+        } else {
+          paths.push(("[" + index + "]"));
+          fn(level, locale, item, paths);
+          paths.pop();
+        }
+      });
+    } else if (isString(message)) {
+      var ret = htmlTagMatcher.test(message);
+      if (ret) {
+        var msg = "Detected HTML in message '" + message + "' of keypath '" + (paths.join('')) + "' at '" + locale + "'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp";
+        if (level === 'warn') {
+          warn(msg);
+        } else if (level === 'error') {
+          error(msg);
+        }
+      }
+    }
+  };
+
+  fn(level, locale, message, paths);
+};
+
+VueI18n.prototype._initVM = function _initVM (data) {
+  var silent = Vue.config.silent;
+  Vue.config.silent = true;
+  this._vm = new Vue({ data: data });
+  Vue.config.silent = silent;
+};
+
+VueI18n.prototype.destroyVM = function destroyVM () {
+  this._vm.$destroy();
+};
+
+VueI18n.prototype.subscribeDataChanging = function subscribeDataChanging (vm) {
+  this._dataListeners.push(vm);
+};
+
+VueI18n.prototype.unsubscribeDataChanging = function unsubscribeDataChanging (vm) {
+  remove(this._dataListeners, vm);
+};
+
+VueI18n.prototype.watchI18nData = function watchI18nData () {
+  var self = this;
+  return this._vm.$watch('$data', function () {
+    var i = self._dataListeners.length;
+    while (i--) {
+      Vue.nextTick(function () {
+        self._dataListeners[i] && self._dataListeners[i].$forceUpdate();
+      });
+    }
+  }, { deep: true })
+};
+
+VueI18n.prototype.watchLocale = function watchLocale () {
+  /* istanbul ignore if */
+  if (!this._sync || !this._root) { return null }
+  var target = this._vm;
+  return this._root.$i18n.vm.$watch('locale', function (val) {
+    target.$set(target, 'locale', val);
+    target.$forceUpdate();
+  }, { immediate: true })
+};
+
+VueI18n.prototype.onComponentInstanceCreated = function onComponentInstanceCreated (newI18n) {
+  if (this._componentInstanceCreatedListener) {
+    this._componentInstanceCreatedListener(newI18n, this);
+  }
+};
+
+prototypeAccessors.vm.get = function () { return this._vm };
+
+prototypeAccessors.messages.get = function () { return looseClone(this._getMessages()) };
+prototypeAccessors.dateTimeFormats.get = function () { return looseClone(this._getDateTimeFormats()) };
+prototypeAccessors.numberFormats.get = function () { return looseClone(this._getNumberFormats()) };
+prototypeAccessors.availableLocales.get = function () { return Object.keys(this.messages).sort() };
+
+prototypeAccessors.locale.get = function () { return this._vm.locale };
+prototypeAccessors.locale.set = function (locale) {
+  this._vm.$set(this._vm, 'locale', locale);
+};
+
+prototypeAccessors.fallbackLocale.get = function () { return this._vm.fallbackLocale };
+prototypeAccessors.fallbackLocale.set = function (locale) {
+  this._localeChainCache = {};
+  this._vm.$set(this._vm, 'fallbackLocale', locale);
+};
+
+prototypeAccessors.formatFallbackMessages.get = function () { return this._formatFallbackMessages };
+prototypeAccessors.formatFallbackMessages.set = function (fallback) { this._formatFallbackMessages = fallback; };
+
+prototypeAccessors.missing.get = function () { return this._missing };
+prototypeAccessors.missing.set = function (handler) { this._missing = handler; };
+
+prototypeAccessors.formatter.get = function () { return this._formatter };
+prototypeAccessors.formatter.set = function (formatter) { this._formatter = formatter; };
+
+prototypeAccessors.silentTranslationWarn.get = function () { return this._silentTranslationWarn };
+prototypeAccessors.silentTranslationWarn.set = function (silent) { this._silentTranslationWarn = silent; };
+
+prototypeAccessors.silentFallbackWarn.get = function () { return this._silentFallbackWarn };
+prototypeAccessors.silentFallbackWarn.set = function (silent) { this._silentFallbackWarn = silent; };
+
+prototypeAccessors.preserveDirectiveContent.get = function () { return this._preserveDirectiveContent };
+prototypeAccessors.preserveDirectiveContent.set = function (preserve) { this._preserveDirectiveContent = preserve; };
+
+prototypeAccessors.warnHtmlInMessage.get = function () { return this._warnHtmlInMessage };
+prototypeAccessors.warnHtmlInMessage.set = function (level) {
+    var this$1 = this;
+
+  var orgLevel = this._warnHtmlInMessage;
+  this._warnHtmlInMessage = level;
+  if (orgLevel !== level && (level === 'warn' || level === 'error')) {
+    var messages = this._getMessages();
+    Object.keys(messages).forEach(function (locale) {
+      this$1._checkLocaleMessage(locale, this$1._warnHtmlInMessage, messages[locale]);
+    });
+  }
+};
+
+prototypeAccessors.postTranslation.get = function () { return this._postTranslation };
+prototypeAccessors.postTranslation.set = function (handler) { this._postTranslation = handler; };
+
+VueI18n.prototype._getMessages = function _getMessages () { return this._vm.messages };
+VueI18n.prototype._getDateTimeFormats = function _getDateTimeFormats () { return this._vm.dateTimeFormats };
+VueI18n.prototype._getNumberFormats = function _getNumberFormats () { return this._vm.numberFormats };
+
+VueI18n.prototype._warnDefault = function _warnDefault (locale, key, result, vm, values, interpolateMode) {
+  if (!isNull(result)) { return result }
+  if (this._missing) {
+    var missingRet = this._missing.apply(null, [locale, key, vm, values]);
+    if (isString(missingRet)) {
+      return missingRet
+    }
+  } else {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+      warn(
+        "Cannot translate the value of keypath '" + key + "'. " +
+        'Use the value of keypath as default.'
+      );
+    }
+  }
+
+  if (this._formatFallbackMessages) {
+    var parsedArgs = parseArgs.apply(void 0, values);
+    return this._render(key, interpolateMode, parsedArgs.params, key)
+  } else {
+    return key
+  }
+};
+
+VueI18n.prototype._isFallbackRoot = function _isFallbackRoot (val) {
+  return !val && !isNull(this._root) && this._fallbackRoot
+};
+
+VueI18n.prototype._isSilentFallbackWarn = function _isSilentFallbackWarn (key) {
+  return this._silentFallbackWarn instanceof RegExp
+    ? this._silentFallbackWarn.test(key)
+    : this._silentFallbackWarn
+};
+
+VueI18n.prototype._isSilentFallback = function _isSilentFallback (locale, key) {
+  return this._isSilentFallbackWarn(key) && (this._isFallbackRoot() || locale !== this.fallbackLocale)
+};
+
+VueI18n.prototype._isSilentTranslationWarn = function _isSilentTranslationWarn (key) {
+  return this._silentTranslationWarn instanceof RegExp
+    ? this._silentTranslationWarn.test(key)
+    : this._silentTranslationWarn
+};
+
+VueI18n.prototype._interpolate = function _interpolate (
+  locale,
+  message,
+  key,
+  host,
+  interpolateMode,
+  values,
+  visitedLinkStack
+) {
+  if (!message) { return null }
+
+  var pathRet = this._path.getPathValue(message, key);
+  if (Array.isArray(pathRet) || isPlainObject(pathRet)) { return pathRet }
+
+  var ret;
+  if (isNull(pathRet)) {
+    /* istanbul ignore else */
+    if (isPlainObject(message)) {
+      ret = message[key];
+      if (!isString(ret)) {
+        if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+          warn(("Value of key '" + key + "' is not a string!"));
+        }
+        return null
+      }
+    } else {
+      return null
+    }
+  } else {
+    /* istanbul ignore else */
+    if (isString(pathRet)) {
+      ret = pathRet;
+    } else {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+        warn(("Value of key '" + key + "' is not a string!"));
+      }
+      return null
+    }
+  }
+
+  // Check for the existence of links within the translated string
+  if (ret.indexOf('@:') >= 0 || ret.indexOf('@.') >= 0) {
+    ret = this._link(locale, message, ret, host, 'raw', values, visitedLinkStack);
+  }
+
+  return this._render(ret, interpolateMode, values, key)
+};
+
+VueI18n.prototype._link = function _link (
+  locale,
+  message,
+  str,
+  host,
+  interpolateMode,
+  values,
+  visitedLinkStack
+) {
+  var ret = str;
+
+  // Match all the links within the local
+  // We are going to replace each of
+  // them with its translation
+  var matches = ret.match(linkKeyMatcher);
+  for (var idx in matches) {
+    // ie compatible: filter custom array
+    // prototype method
+    if (!matches.hasOwnProperty(idx)) {
+      continue
+    }
+    var link = matches[idx];
+    var linkKeyPrefixMatches = link.match(linkKeyPrefixMatcher);
+    var linkPrefix = linkKeyPrefixMatches[0];
+      var formatterName = linkKeyPrefixMatches[1];
+
+    // Remove the leading @:, @.case: and the brackets
+    var linkPlaceholder = link.replace(linkPrefix, '').replace(bracketsMatcher, '');
+
+    if (includes(visitedLinkStack, linkPlaceholder)) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn(("Circular reference found. \"" + link + "\" is already visited in the chain of " + (visitedLinkStack.reverse().join(' <- '))));
+      }
+      return ret
+    }
+    visitedLinkStack.push(linkPlaceholder);
+
+    // Translate the link
+    var translated = this._interpolate(
+      locale, message, linkPlaceholder, host,
+      interpolateMode === 'raw' ? 'string' : interpolateMode,
+      interpolateMode === 'raw' ? undefined : values,
+      visitedLinkStack
+    );
+
+    if (this._isFallbackRoot(translated)) {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(linkPlaceholder)) {
+        warn(("Fall back to translate the link placeholder '" + linkPlaceholder + "' with root locale."));
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      var root = this._root.$i18n;
+      translated = root._translate(
+        root._getMessages(), root.locale, root.fallbackLocale,
+        linkPlaceholder, host, interpolateMode, values
+      );
+    }
+    translated = this._warnDefault(
+      locale, linkPlaceholder, translated, host,
+      Array.isArray(values) ? values : [values],
+      interpolateMode
+    );
+
+    if (this._modifiers.hasOwnProperty(formatterName)) {
+      translated = this._modifiers[formatterName](translated);
+    } else if (defaultModifiers.hasOwnProperty(formatterName)) {
+      translated = defaultModifiers[formatterName](translated);
+    }
+
+    visitedLinkStack.pop();
+
+    // Replace the link with the translated
+    ret = !translated ? ret : ret.replace(link, translated);
+  }
+
+  return ret
+};
+
+VueI18n.prototype._render = function _render (message, interpolateMode, values, path) {
+  var ret = this._formatter.interpolate(message, values, path);
+
+  // If the custom formatter refuses to work - apply the default one
+  if (!ret) {
+    ret = defaultFormatter.interpolate(message, values, path);
+  }
+
+  // if interpolateMode is **not** 'string' ('row'),
+  // return the compiled data (e.g. ['foo', VNode, 'bar']) with formatter
+  return interpolateMode === 'string' && !isString(ret) ? ret.join('') : ret
+};
+
+VueI18n.prototype._appendItemToChain = function _appendItemToChain (chain, item, blocks) {
+  var follow = false;
+  if (!includes(chain, item)) {
+    follow = true;
+    if (item) {
+      follow = item[item.length - 1] !== '!';
+      item = item.replace(/!/g, '');
+      chain.push(item);
+      if (blocks && blocks[item]) {
+        follow = blocks[item];
+      }
+    }
+  }
+  return follow
+};
+
+VueI18n.prototype._appendLocaleToChain = function _appendLocaleToChain (chain, locale, blocks) {
+  var follow;
+  var tokens = locale.split('-');
+  do {
+    var item = tokens.join('-');
+    follow = this._appendItemToChain(chain, item, blocks);
+    tokens.splice(-1, 1);
+  } while (tokens.length && (follow === true))
+  return follow
+};
+
+VueI18n.prototype._appendBlockToChain = function _appendBlockToChain (chain, block, blocks) {
+  var follow = true;
+  for (var i = 0; (i < block.length) && (isBoolean(follow)); i++) {
+    var locale = block[i];
+    if (isString(locale)) {
+      follow = this._appendLocaleToChain(chain, locale, blocks);
+    }
+  }
+  return follow
+};
+
+VueI18n.prototype._getLocaleChain = function _getLocaleChain (start, fallbackLocale) {
+  if (start === '') { return [] }
+
+  if (!this._localeChainCache) {
+    this._localeChainCache = {};
+  }
+
+  var chain = this._localeChainCache[start];
+  if (!chain) {
+    if (!fallbackLocale) {
+      fallbackLocale = this.fallbackLocale;
+    }
+    chain = [];
+
+    // first block defined by start
+    var block = [start];
+
+    // while any intervening block found
+    while (isArray(block)) {
+      block = this._appendBlockToChain(
+        chain,
+        block,
+        fallbackLocale
+      );
+    }
+
+    // last block defined by default
+    var defaults;
+    if (isArray(fallbackLocale)) {
+      defaults = fallbackLocale;
+    } else if (isObject(fallbackLocale)) {
+      /* $FlowFixMe */
+      if (fallbackLocale['default']) {
+        defaults = fallbackLocale['default'];
+      } else {
+        defaults = null;
+      }
+    } else {
+      defaults = fallbackLocale;
+    }
+
+    // convert defaults to array
+    if (isString(defaults)) {
+      block = [defaults];
+    } else {
+      block = defaults;
+    }
+    if (block) {
+      this._appendBlockToChain(
+        chain,
+        block,
+        null
+      );
+    }
+    this._localeChainCache[start] = chain;
+  }
+  return chain
+};
+
+VueI18n.prototype._translate = function _translate (
+  messages,
+  locale,
+  fallback,
+  key,
+  host,
+  interpolateMode,
+  args
+) {
+  var chain = this._getLocaleChain(locale, fallback);
+  var res;
+  for (var i = 0; i < chain.length; i++) {
+    var step = chain[i];
+    res =
+      this._interpolate(step, messages[step], key, host, interpolateMode, args, [key]);
+    if (!isNull(res)) {
+      if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to translate the keypath '" + key + "' with '" + step + "' locale."));
+      }
+      return res
+    }
+  }
+  return null
+};
+
+VueI18n.prototype._t = function _t (key, _locale, messages, host) {
+    var ref;
+
+    var values = [], len = arguments.length - 4;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 4 ];
+  if (!key) { return '' }
+
+  var parsedArgs = parseArgs.apply(void 0, values);
+  var locale = parsedArgs.locale || _locale;
+
+  var ret = this._translate(
+    messages, locale, this.fallbackLocale, key,
+    host, 'string', parsedArgs.params
+  );
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+      warn(("Fall back to translate the keypath '" + key + "' with root locale."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return (ref = this._root).$t.apply(ref, [ key ].concat( values ))
+  } else {
+    ret = this._warnDefault(locale, key, ret, host, values, 'string');
+    if (this._postTranslation && ret !== null && ret !== undefined) {
+      ret = this._postTranslation(ret, key);
+    }
+    return ret
+  }
+};
+
+VueI18n.prototype.t = function t (key) {
+    var ref;
+
+    var values = [], len = arguments.length - 1;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 1 ];
+  return (ref = this)._t.apply(ref, [ key, this.locale, this._getMessages(), null ].concat( values ))
+};
+
+VueI18n.prototype._i = function _i (key, locale, messages, host, values) {
+  var ret =
+    this._translate(messages, locale, this.fallbackLocale, key, host, 'raw', values);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+      warn(("Fall back to interpolate the keypath '" + key + "' with root locale."));
+    }
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n.i(key, locale, values)
+  } else {
+    return this._warnDefault(locale, key, ret, host, [values], 'raw')
+  }
+};
+
+VueI18n.prototype.i = function i (key, locale, values) {
+  /* istanbul ignore if */
+  if (!key) { return '' }
+
+  if (!isString(locale)) {
+    locale = this.locale;
+  }
+
+  return this._i(key, locale, this._getMessages(), null, values)
+};
+
+VueI18n.prototype._tc = function _tc (
+  key,
+  _locale,
+  messages,
+  host,
+  choice
+) {
+    var ref;
+
+    var values = [], len = arguments.length - 5;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 5 ];
+  if (!key) { return '' }
+  if (choice === undefined) {
+    choice = 1;
+  }
+
+  var predefined = { 'count': choice, 'n': choice };
+  var parsedArgs = parseArgs.apply(void 0, values);
+  parsedArgs.params = Object.assign(predefined, parsedArgs.params);
+  values = parsedArgs.locale === null ? [parsedArgs.params] : [parsedArgs.locale, parsedArgs.params];
+  return this.fetchChoice((ref = this)._t.apply(ref, [ key, _locale, messages, host ].concat( values )), choice)
+};
+
+VueI18n.prototype.fetchChoice = function fetchChoice (message, choice) {
+  /* istanbul ignore if */
+  if (!message && !isString(message)) { return null }
+  var choices = message.split('|');
+
+  choice = this.getChoiceIndex(choice, choices.length);
+  if (!choices[choice]) { return message }
+  return choices[choice].trim()
+};
+
+VueI18n.prototype.tc = function tc (key, choice) {
+    var ref;
+
+    var values = [], len = arguments.length - 2;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 2 ];
+  return (ref = this)._tc.apply(ref, [ key, this.locale, this._getMessages(), null, choice ].concat( values ))
+};
+
+VueI18n.prototype._te = function _te (key, locale, messages) {
+    var args = [], len = arguments.length - 3;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 3 ];
+
+  var _locale = parseArgs.apply(void 0, args).locale || locale;
+  return this._exist(messages[_locale], key)
+};
+
+VueI18n.prototype.te = function te (key, locale) {
+  return this._te(key, this.locale, this._getMessages(), locale)
+};
+
+VueI18n.prototype.getLocaleMessage = function getLocaleMessage (locale) {
+  return looseClone(this._vm.messages[locale] || {})
+};
+
+VueI18n.prototype.setLocaleMessage = function setLocaleMessage (locale, message) {
+  if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+    this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+  }
+  this._vm.$set(this._vm.messages, locale, message);
+};
+
+VueI18n.prototype.mergeLocaleMessage = function mergeLocaleMessage (locale, message) {
+  if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+    this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+  }
+  this._vm.$set(this._vm.messages, locale, merge({}, this._vm.messages[locale] || {}, message));
+};
+
+VueI18n.prototype.getDateTimeFormat = function getDateTimeFormat (locale) {
+  return looseClone(this._vm.dateTimeFormats[locale] || {})
+};
+
+VueI18n.prototype.setDateTimeFormat = function setDateTimeFormat (locale, format) {
+  this._vm.$set(this._vm.dateTimeFormats, locale, format);
+  this._clearDateTimeFormat(locale, format);
+};
+
+VueI18n.prototype.mergeDateTimeFormat = function mergeDateTimeFormat (locale, format) {
+  this._vm.$set(this._vm.dateTimeFormats, locale, merge(this._vm.dateTimeFormats[locale] || {}, format));
+  this._clearDateTimeFormat(locale, format);
+};
+
+VueI18n.prototype._clearDateTimeFormat = function _clearDateTimeFormat (locale, format) {
+  for (var key in format) {
+    var id = locale + "__" + key;
+
+    if (!this._dateTimeFormatters.hasOwnProperty(id)) {
+      continue
+    }
+
+    delete this._dateTimeFormatters[id];
+  }
+};
+
+VueI18n.prototype._localizeDateTime = function _localizeDateTime (
+  value,
+  locale,
+  fallback,
+  dateTimeFormats,
+  key
+) {
+  var _locale = locale;
+  var formats = dateTimeFormats[_locale];
+
+  var chain = this._getLocaleChain(locale, fallback);
+  for (var i = 0; i < chain.length; i++) {
+    var current = _locale;
+    var step = chain[i];
+    formats = dateTimeFormats[step];
+    _locale = step;
+    // fallback locale
+    if (isNull(formats) || isNull(formats[key])) {
+      if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to '" + step + "' datetime formats from '" + current + "' datetime formats."));
+      }
+    } else {
+      break
+    }
+  }
+
+  if (isNull(formats) || isNull(formats[key])) {
+    return null
+  } else {
+    var format = formats[key];
+    var id = _locale + "__" + key;
+    var formatter = this._dateTimeFormatters[id];
+    if (!formatter) {
+      formatter = this._dateTimeFormatters[id] = new Intl.DateTimeFormat(_locale, format);
+    }
+    return formatter.format(value)
+  }
+};
+
+VueI18n.prototype._d = function _d (value, locale, key) {
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && !VueI18n.availabilities.dateTimeFormat) {
+    warn('Cannot format a Date value due to not supported Intl.DateTimeFormat.');
+    return ''
+  }
+
+  if (!key) {
+    return new Intl.DateTimeFormat(locale).format(value)
+  }
+
+  var ret =
+    this._localizeDateTime(value, locale, this.fallbackLocale, this._getDateTimeFormats(), key);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+      warn(("Fall back to datetime localization of root: key '" + key + "'."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n.d(value, key, locale)
+  } else {
+    return ret || ''
+  }
+};
+
+VueI18n.prototype.d = function d (value) {
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+  var locale = this.locale;
+  var key = null;
+
+  if (args.length === 1) {
+    if (isString(args[0])) {
+      key = args[0];
+    } else if (isObject(args[0])) {
+      if (args[0].locale) {
+        locale = args[0].locale;
+      }
+      if (args[0].key) {
+        key = args[0].key;
+      }
+    }
+  } else if (args.length === 2) {
+    if (isString(args[0])) {
+      key = args[0];
+    }
+    if (isString(args[1])) {
+      locale = args[1];
+    }
+  }
+
+  return this._d(value, locale, key)
+};
+
+VueI18n.prototype.getNumberFormat = function getNumberFormat (locale) {
+  return looseClone(this._vm.numberFormats[locale] || {})
+};
+
+VueI18n.prototype.setNumberFormat = function setNumberFormat (locale, format) {
+  this._vm.$set(this._vm.numberFormats, locale, format);
+  this._clearNumberFormat(locale, format);
+};
+
+VueI18n.prototype.mergeNumberFormat = function mergeNumberFormat (locale, format) {
+  this._vm.$set(this._vm.numberFormats, locale, merge(this._vm.numberFormats[locale] || {}, format));
+  this._clearNumberFormat(locale, format);
+};
+
+VueI18n.prototype._clearNumberFormat = function _clearNumberFormat (locale, format) {
+  for (var key in format) {
+    var id = locale + "__" + key;
+
+    if (!this._numberFormatters.hasOwnProperty(id)) {
+      continue
+    }
+
+    delete this._numberFormatters[id];
+  }
+};
+
+VueI18n.prototype._getNumberFormatter = function _getNumberFormatter (
+  value,
+  locale,
+  fallback,
+  numberFormats,
+  key,
+  options
+) {
+  var _locale = locale;
+  var formats = numberFormats[_locale];
+
+  var chain = this._getLocaleChain(locale, fallback);
+  for (var i = 0; i < chain.length; i++) {
+    var current = _locale;
+    var step = chain[i];
+    formats = numberFormats[step];
+    _locale = step;
+    // fallback locale
+    if (isNull(formats) || isNull(formats[key])) {
+      if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to '" + step + "' number formats from '" + current + "' number formats."));
+      }
+    } else {
+      break
+    }
+  }
+
+  if (isNull(formats) || isNull(formats[key])) {
+    return null
+  } else {
+    var format = formats[key];
+
+    var formatter;
+    if (options) {
+      // If options specified - create one time number formatter
+      formatter = new Intl.NumberFormat(_locale, Object.assign({}, format, options));
+    } else {
+      var id = _locale + "__" + key;
+      formatter = this._numberFormatters[id];
+      if (!formatter) {
+        formatter = this._numberFormatters[id] = new Intl.NumberFormat(_locale, format);
+      }
+    }
+    return formatter
+  }
+};
+
+VueI18n.prototype._n = function _n (value, locale, key, options) {
+  /* istanbul ignore if */
+  if (!VueI18n.availabilities.numberFormat) {
+    if (process.env.NODE_ENV !== 'production') {
+      warn('Cannot format a Number value due to not supported Intl.NumberFormat.');
+    }
+    return ''
+  }
+
+  if (!key) {
+    var nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+    return nf.format(value)
+  }
+
+  var formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+  var ret = formatter && formatter.format(value);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+      warn(("Fall back to number localization of root: key '" + key + "'."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n.n(value, Object.assign({}, { key: key, locale: locale }, options))
+  } else {
+    return ret || ''
+  }
+};
+
+VueI18n.prototype.n = function n (value) {
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+  var locale = this.locale;
+  var key = null;
+  var options = null;
+
+  if (args.length === 1) {
+    if (isString(args[0])) {
+      key = args[0];
+    } else if (isObject(args[0])) {
+      if (args[0].locale) {
+        locale = args[0].locale;
+      }
+      if (args[0].key) {
+        key = args[0].key;
+      }
+
+      // Filter out number format options only
+      options = Object.keys(args[0]).reduce(function (acc, key) {
+          var obj;
+
+        if (includes(numberFormatKeys, key)) {
+          return Object.assign({}, acc, ( obj = {}, obj[key] = args[0][key], obj ))
+        }
+        return acc
+      }, null);
+    }
+  } else if (args.length === 2) {
+    if (isString(args[0])) {
+      key = args[0];
+    }
+    if (isString(args[1])) {
+      locale = args[1];
+    }
+  }
+
+  return this._n(value, locale, key, options)
+};
+
+VueI18n.prototype._ntp = function _ntp (value, locale, key, options) {
+  /* istanbul ignore if */
+  if (!VueI18n.availabilities.numberFormat) {
+    if (process.env.NODE_ENV !== 'production') {
+      warn('Cannot format to parts a Number value due to not supported Intl.NumberFormat.');
+    }
+    return []
+  }
+
+  if (!key) {
+    var nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+    return nf.formatToParts(value)
+  }
+
+  var formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+  var ret = formatter && formatter.formatToParts(value);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+      warn(("Fall back to format number to parts of root: key '" + key + "' ."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n._ntp(value, locale, key, options)
+  } else {
+    return ret || []
+  }
+};
+
+Object.defineProperties( VueI18n.prototype, prototypeAccessors );
+
+var availabilities;
+// $FlowFixMe
+Object.defineProperty(VueI18n, 'availabilities', {
+  get: function get () {
+    if (!availabilities) {
+      var intlDefined = typeof Intl !== 'undefined';
+      availabilities = {
+        dateTimeFormat: intlDefined && typeof Intl.DateTimeFormat !== 'undefined',
+        numberFormat: intlDefined && typeof Intl.NumberFormat !== 'undefined'
+      };
+    }
+
+    return availabilities
+  }
+});
+
+VueI18n.install = install;
+VueI18n.version = '8.20.0';
+
+module.exports = VueI18n;
diff --git a/node_modules/vue-i18n/dist/vue-i18n.esm.browser.js b/node_modules/vue-i18n/dist/vue-i18n.esm.browser.js
new file mode 100644
index 0000000..d996b59
--- /dev/null
+++ b/node_modules/vue-i18n/dist/vue-i18n.esm.browser.js
@@ -0,0 +1,2085 @@
+/*  */
+
+/**
+ * constants
+ */
+
+const numberFormatKeys = [
+  'style',
+  'currency',
+  'currencyDisplay',
+  'useGrouping',
+  'minimumIntegerDigits',
+  'minimumFractionDigits',
+  'maximumFractionDigits',
+  'minimumSignificantDigits',
+  'maximumSignificantDigits',
+  'localeMatcher',
+  'formatMatcher',
+  'unit'
+];
+
+/**
+ * utilities
+ */
+
+function warn (msg, err) {
+  if (typeof console !== 'undefined') {
+    console.warn('[vue-i18n] ' + msg);
+    /* istanbul ignore if */
+    if (err) {
+      console.warn(err.stack);
+    }
+  }
+}
+
+function error (msg, err) {
+  if (typeof console !== 'undefined') {
+    console.error('[vue-i18n] ' + msg);
+    /* istanbul ignore if */
+    if (err) {
+      console.error(err.stack);
+    }
+  }
+}
+
+const isArray = Array.isArray;
+
+function isObject (obj) {
+  return obj !== null && typeof obj === 'object'
+}
+
+function isBoolean (val) {
+  return typeof val === 'boolean'
+}
+
+function isString (val) {
+  return typeof val === 'string'
+}
+
+const toString = Object.prototype.toString;
+const OBJECT_STRING = '[object Object]';
+function isPlainObject (obj) {
+  return toString.call(obj) === OBJECT_STRING
+}
+
+function isNull (val) {
+  return val === null || val === undefined
+}
+
+function parseArgs (...args) {
+  let locale = null;
+  let params = null;
+  if (args.length === 1) {
+    if (isObject(args[0]) || Array.isArray(args[0])) {
+      params = args[0];
+    } else if (typeof args[0] === 'string') {
+      locale = args[0];
+    }
+  } else if (args.length === 2) {
+    if (typeof args[0] === 'string') {
+      locale = args[0];
+    }
+    /* istanbul ignore if */
+    if (isObject(args[1]) || Array.isArray(args[1])) {
+      params = args[1];
+    }
+  }
+
+  return { locale, params }
+}
+
+function looseClone (obj) {
+  return JSON.parse(JSON.stringify(obj))
+}
+
+function remove (arr, item) {
+  if (arr.length) {
+    const index = arr.indexOf(item);
+    if (index > -1) {
+      return arr.splice(index, 1)
+    }
+  }
+}
+
+function includes (arr, item) {
+  return !!~arr.indexOf(item)
+}
+
+const hasOwnProperty = Object.prototype.hasOwnProperty;
+function hasOwn (obj, key) {
+  return hasOwnProperty.call(obj, key)
+}
+
+function merge (target) {
+  const output = Object(target);
+  for (let i = 1; i < arguments.length; i++) {
+    const source = arguments[i];
+    if (source !== undefined && source !== null) {
+      let key;
+      for (key in source) {
+        if (hasOwn(source, key)) {
+          if (isObject(source[key])) {
+            output[key] = merge(output[key], source[key]);
+          } else {
+            output[key] = source[key];
+          }
+        }
+      }
+    }
+  }
+  return output
+}
+
+function looseEqual (a, b) {
+  if (a === b) { return true }
+  const isObjectA = isObject(a);
+  const isObjectB = isObject(b);
+  if (isObjectA && isObjectB) {
+    try {
+      const isArrayA = Array.isArray(a);
+      const isArrayB = Array.isArray(b);
+      if (isArrayA && isArrayB) {
+        return a.length === b.length && a.every((e, i) => {
+          return looseEqual(e, b[i])
+        })
+      } else if (!isArrayA && !isArrayB) {
+        const keysA = Object.keys(a);
+        const keysB = Object.keys(b);
+        return keysA.length === keysB.length && keysA.every((key) => {
+          return looseEqual(a[key], b[key])
+        })
+      } else {
+        /* istanbul ignore next */
+        return false
+      }
+    } catch (e) {
+      /* istanbul ignore next */
+      return false
+    }
+  } else if (!isObjectA && !isObjectB) {
+    return String(a) === String(b)
+  } else {
+    return false
+  }
+}
+
+/*  */
+
+function extend (Vue) {
+  if (!Vue.prototype.hasOwnProperty('$i18n')) {
+    // $FlowFixMe
+    Object.defineProperty(Vue.prototype, '$i18n', {
+      get () { return this._i18n }
+    });
+  }
+
+  Vue.prototype.$t = function (key, ...values) {
+    const i18n = this.$i18n;
+    return i18n._t(key, i18n.locale, i18n._getMessages(), this, ...values)
+  };
+
+  Vue.prototype.$tc = function (key, choice, ...values) {
+    const i18n = this.$i18n;
+    return i18n._tc(key, i18n.locale, i18n._getMessages(), this, choice, ...values)
+  };
+
+  Vue.prototype.$te = function (key, locale) {
+    const i18n = this.$i18n;
+    return i18n._te(key, i18n.locale, i18n._getMessages(), locale)
+  };
+
+  Vue.prototype.$d = function (value, ...args) {
+    return this.$i18n.d(value, ...args)
+  };
+
+  Vue.prototype.$n = function (value, ...args) {
+    return this.$i18n.n(value, ...args)
+  };
+}
+
+/*  */
+
+var mixin = {
+  beforeCreate () {
+    const options = this.$options;
+    options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            let localeMessages = {};
+            options.__i18n.forEach(resource => {
+              localeMessages = merge(localeMessages, JSON.parse(resource));
+            });
+            Object.keys(localeMessages).forEach((locale) => {
+              options.i18n.mergeLocaleMessage(locale, localeMessages[locale]);
+            });
+          } catch (e) {
+            {
+              error(`Cannot parse locale messages via custom blocks.`, e);
+            }
+          }
+        }
+        this._i18n = options.i18n;
+        this._i18nWatcher = this._i18n.watchI18nData();
+      } else if (isPlainObject(options.i18n)) {
+        const rootI18n = this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n
+          ? this.$root.$i18n
+          : null;
+        // component local i18n
+        if (rootI18n) {
+          options.i18n.root = this.$root;
+          options.i18n.formatter = rootI18n.formatter;
+          options.i18n.fallbackLocale = rootI18n.fallbackLocale;
+          options.i18n.formatFallbackMessages = rootI18n.formatFallbackMessages;
+          options.i18n.silentTranslationWarn = rootI18n.silentTranslationWarn;
+          options.i18n.silentFallbackWarn = rootI18n.silentFallbackWarn;
+          options.i18n.pluralizationRules = rootI18n.pluralizationRules;
+          options.i18n.preserveDirectiveContent = rootI18n.preserveDirectiveContent;
+        }
+
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            let localeMessages = {};
+            options.__i18n.forEach(resource => {
+              localeMessages = merge(localeMessages, JSON.parse(resource));
+            });
+            options.i18n.messages = localeMessages;
+          } catch (e) {
+            {
+              warn(`Cannot parse locale messages via custom blocks.`, e);
+            }
+          }
+        }
+
+        const { sharedMessages } = options.i18n;
+        if (sharedMessages && isPlainObject(sharedMessages)) {
+          options.i18n.messages = merge(options.i18n.messages, sharedMessages);
+        }
+
+        this._i18n = new VueI18n(options.i18n);
+        this._i18nWatcher = this._i18n.watchI18nData();
+
+        if (options.i18n.sync === undefined || !!options.i18n.sync) {
+          this._localeWatcher = this.$i18n.watchLocale();
+        }
+
+        if (rootI18n) {
+          rootI18n.onComponentInstanceCreated(this._i18n);
+        }
+      } else {
+        {
+          warn(`Cannot be interpreted 'i18n' option.`);
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      // root i18n
+      this._i18n = this.$root.$i18n;
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      // parent i18n
+      this._i18n = options.parent.$i18n;
+    }
+  },
+
+  beforeMount () {
+    const options = this.$options;
+    options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      } else if (isPlainObject(options.i18n)) {
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      } else {
+        {
+          warn(`Cannot be interpreted 'i18n' option.`);
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this);
+      this._subscribing = true;
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this);
+      this._subscribing = true;
+    }
+  },
+
+  beforeDestroy () {
+    if (!this._i18n) { return }
+
+    const self = this;
+    this.$nextTick(() => {
+      if (self._subscribing) {
+        self._i18n.unsubscribeDataChanging(self);
+        delete self._subscribing;
+      }
+
+      if (self._i18nWatcher) {
+        self._i18nWatcher();
+        self._i18n.destroyVM();
+        delete self._i18nWatcher;
+      }
+
+      if (self._localeWatcher) {
+        self._localeWatcher();
+        delete self._localeWatcher;
+      }
+    });
+  }
+};
+
+/*  */
+
+var interpolationComponent = {
+  name: 'i18n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    path: {
+      type: String,
+      required: true
+    },
+    locale: {
+      type: String
+    },
+    places: {
+      type: [Array, Object]
+    }
+  },
+  render (h, { data, parent, props, slots }) {
+    const { $i18n } = parent;
+    if (!$i18n) {
+      {
+        warn('Cannot find VueI18n instance!');
+      }
+      return
+    }
+
+    const { path, locale, places } = props;
+    const params = slots();
+    const children = $i18n.i(
+      path,
+      locale,
+      onlyHasDefaultPlace(params) || places
+        ? useLegacyPlaces(params.default, places)
+        : params
+    );
+
+    const tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+    return tag ? h(tag, data, children) : children
+  }
+};
+
+function onlyHasDefaultPlace (params) {
+  let prop;
+  for (prop in params) {
+    if (prop !== 'default') { return false }
+  }
+  return Boolean(prop)
+}
+
+function useLegacyPlaces (children, places) {
+  const params = places ? createParamsFromPlaces(places) : {};
+
+  if (!children) { return params }
+
+  // Filter empty text nodes
+  children = children.filter(child => {
+    return child.tag || child.text.trim() !== ''
+  });
+
+  const everyPlace = children.every(vnodeHasPlaceAttribute);
+  if (everyPlace) {
+    warn('`place` attribute is deprecated in next major version. Please switch to Vue slots.');
+  }
+
+  return children.reduce(
+    everyPlace ? assignChildPlace : assignChildIndex,
+    params
+  )
+}
+
+function createParamsFromPlaces (places) {
+  {
+    warn('`places` prop is deprecated in next major version. Please switch to Vue slots.');
+  }
+
+  return Array.isArray(places)
+    ? places.reduce(assignChildIndex, {})
+    : Object.assign({}, places)
+}
+
+function assignChildPlace (params, child) {
+  if (child.data && child.data.attrs && child.data.attrs.place) {
+    params[child.data.attrs.place] = child;
+  }
+  return params
+}
+
+function assignChildIndex (params, child, index) {
+  params[index] = child;
+  return params
+}
+
+function vnodeHasPlaceAttribute (vnode) {
+  return Boolean(vnode.data && vnode.data.attrs && vnode.data.attrs.place)
+}
+
+/*  */
+
+var numberComponent = {
+  name: 'i18n-n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    value: {
+      type: Number,
+      required: true
+    },
+    format: {
+      type: [String, Object]
+    },
+    locale: {
+      type: String
+    }
+  },
+  render (h, { props, parent, data }) {
+    const i18n = parent.$i18n;
+
+    if (!i18n) {
+      {
+        warn('Cannot find VueI18n instance!');
+      }
+      return null
+    }
+
+    let key = null;
+    let options = null;
+
+    if (isString(props.format)) {
+      key = props.format;
+    } else if (isObject(props.format)) {
+      if (props.format.key) {
+        key = props.format.key;
+      }
+
+      // Filter out number format options only
+      options = Object.keys(props.format).reduce((acc, prop) => {
+        if (includes(numberFormatKeys, prop)) {
+          return Object.assign({}, acc, { [prop]: props.format[prop] })
+        }
+        return acc
+      }, null);
+    }
+
+    const locale = props.locale || i18n.locale;
+    const parts = i18n._ntp(props.value, locale, key, options);
+
+    const values = parts.map((part, index) => {
+      const slot = data.scopedSlots && data.scopedSlots[part.type];
+      return slot ? slot({ [part.type]: part.value, index, parts }) : part.value
+    });
+
+    const tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+    return tag
+      ? h(tag, {
+        attrs: data.attrs,
+        'class': data['class'],
+        staticClass: data.staticClass
+      }, values)
+      : values
+  }
+};
+
+/*  */
+
+function bind (el, binding, vnode) {
+  if (!assert(el, vnode)) { return }
+
+  t(el, binding, vnode);
+}
+
+function update (el, binding, vnode, oldVNode) {
+  if (!assert(el, vnode)) { return }
+
+  const i18n = vnode.context.$i18n;
+  if (localeEqual(el, vnode) &&
+    (looseEqual(binding.value, binding.oldValue) &&
+     looseEqual(el._localeMessage, i18n.getLocaleMessage(i18n.locale)))) { return }
+
+  t(el, binding, vnode);
+}
+
+function unbind (el, binding, vnode, oldVNode) {
+  const vm = vnode.context;
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context');
+    return
+  }
+
+  const i18n = vnode.context.$i18n || {};
+  if (!binding.modifiers.preserve && !i18n.preserveDirectiveContent) {
+    el.textContent = '';
+  }
+  el._vt = undefined;
+  delete el['_vt'];
+  el._locale = undefined;
+  delete el['_locale'];
+  el._localeMessage = undefined;
+  delete el['_localeMessage'];
+}
+
+function assert (el, vnode) {
+  const vm = vnode.context;
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context');
+    return false
+  }
+
+  if (!vm.$i18n) {
+    warn('VueI18n instance does not exists in Vue instance');
+    return false
+  }
+
+  return true
+}
+
+function localeEqual (el, vnode) {
+  const vm = vnode.context;
+  return el._locale === vm.$i18n.locale
+}
+
+function t (el, binding, vnode) {
+  const value = binding.value;
+
+  const { path, locale, args, choice } = parseValue(value);
+  if (!path && !locale && !args) {
+    warn('value type not supported');
+    return
+  }
+
+  if (!path) {
+    warn('`path` is required in v-t directive');
+    return
+  }
+
+  const vm = vnode.context;
+  if (choice != null) {
+    el._vt = el.textContent = vm.$i18n.tc(path, choice, ...makeParams(locale, args));
+  } else {
+    el._vt = el.textContent = vm.$i18n.t(path, ...makeParams(locale, args));
+  }
+  el._locale = vm.$i18n.locale;
+  el._localeMessage = vm.$i18n.getLocaleMessage(vm.$i18n.locale);
+}
+
+function parseValue (value) {
+  let path;
+  let locale;
+  let args;
+  let choice;
+
+  if (isString(value)) {
+    path = value;
+  } else if (isPlainObject(value)) {
+    path = value.path;
+    locale = value.locale;
+    args = value.args;
+    choice = value.choice;
+  }
+
+  return { path, locale, args, choice }
+}
+
+function makeParams (locale, args) {
+  const params = [];
+
+  locale && params.push(locale);
+  if (args && (Array.isArray(args) || isPlainObject(args))) {
+    params.push(args);
+  }
+
+  return params
+}
+
+let Vue;
+
+function install (_Vue) {
+  /* istanbul ignore if */
+  if (install.installed && _Vue === Vue) {
+    warn('already installed.');
+    return
+  }
+  install.installed = true;
+
+  Vue = _Vue;
+
+  const version = (Vue.version && Number(Vue.version.split('.')[0])) || -1;
+  /* istanbul ignore if */
+  if (version < 2) {
+    warn(`vue-i18n (${install.version}) need to use Vue 2.0 or later (Vue: ${Vue.version}).`);
+    return
+  }
+
+  extend(Vue);
+  Vue.mixin(mixin);
+  Vue.directive('t', { bind, update, unbind });
+  Vue.component(interpolationComponent.name, interpolationComponent);
+  Vue.component(numberComponent.name, numberComponent);
+
+  // use simple mergeStrategies to prevent i18n instance lose '__proto__'
+  const strats = Vue.config.optionMergeStrategies;
+  strats.i18n = function (parentVal, childVal) {
+    return childVal === undefined
+      ? parentVal
+      : childVal
+  };
+}
+
+/*  */
+
+class BaseFormatter {
+  
+
+  constructor () {
+    this._caches = Object.create(null);
+  }
+
+  interpolate (message, values) {
+    if (!values) {
+      return [message]
+    }
+    let tokens = this._caches[message];
+    if (!tokens) {
+      tokens = parse(message);
+      this._caches[message] = tokens;
+    }
+    return compile(tokens, values)
+  }
+}
+
+
+
+const RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
+const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
+
+function parse (format) {
+  const tokens = [];
+  let position = 0;
+
+  let text = '';
+  while (position < format.length) {
+    let char = format[position++];
+    if (char === '{') {
+      if (text) {
+        tokens.push({ type: 'text', value: text });
+      }
+
+      text = '';
+      let sub = '';
+      char = format[position++];
+      while (char !== undefined && char !== '}') {
+        sub += char;
+        char = format[position++];
+      }
+      const isClosed = char === '}';
+
+      const type = RE_TOKEN_LIST_VALUE.test(sub)
+        ? 'list'
+        : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
+          ? 'named'
+          : 'unknown';
+      tokens.push({ value: sub, type });
+    } else if (char === '%') {
+      // when found rails i18n syntax, skip text capture
+      if (format[(position)] !== '{') {
+        text += char;
+      }
+    } else {
+      text += char;
+    }
+  }
+
+  text && tokens.push({ type: 'text', value: text });
+
+  return tokens
+}
+
+function compile (tokens, values) {
+  const compiled = [];
+  let index = 0;
+
+  const mode = Array.isArray(values)
+    ? 'list'
+    : isObject(values)
+      ? 'named'
+      : 'unknown';
+  if (mode === 'unknown') { return compiled }
+
+  while (index < tokens.length) {
+    const token = tokens[index];
+    switch (token.type) {
+      case 'text':
+        compiled.push(token.value);
+        break
+      case 'list':
+        compiled.push(values[parseInt(token.value, 10)]);
+        break
+      case 'named':
+        if (mode === 'named') {
+          compiled.push((values)[token.value]);
+        } else {
+          {
+            warn(`Type of token '${token.type}' and format of value '${mode}' don't match!`);
+          }
+        }
+        break
+      case 'unknown':
+        {
+          warn(`Detect 'unknown' type of token!`);
+        }
+        break
+    }
+    index++;
+  }
+
+  return compiled
+}
+
+/*  */
+
+/**
+ *  Path parser
+ *  - Inspired:
+ *    Vue.js Path parser
+ */
+
+// actions
+const APPEND = 0;
+const PUSH = 1;
+const INC_SUB_PATH_DEPTH = 2;
+const PUSH_SUB_PATH = 3;
+
+// states
+const BEFORE_PATH = 0;
+const IN_PATH = 1;
+const BEFORE_IDENT = 2;
+const IN_IDENT = 3;
+const IN_SUB_PATH = 4;
+const IN_SINGLE_QUOTE = 5;
+const IN_DOUBLE_QUOTE = 6;
+const AFTER_PATH = 7;
+const ERROR = 8;
+
+const pathStateMachine = [];
+
+pathStateMachine[BEFORE_PATH] = {
+  'ws': [BEFORE_PATH],
+  'ident': [IN_IDENT, APPEND],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+};
+
+pathStateMachine[IN_PATH] = {
+  'ws': [IN_PATH],
+  '.': [BEFORE_IDENT],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+};
+
+pathStateMachine[BEFORE_IDENT] = {
+  'ws': [BEFORE_IDENT],
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND]
+};
+
+pathStateMachine[IN_IDENT] = {
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND],
+  'ws': [IN_PATH, PUSH],
+  '.': [BEFORE_IDENT, PUSH],
+  '[': [IN_SUB_PATH, PUSH],
+  'eof': [AFTER_PATH, PUSH]
+};
+
+pathStateMachine[IN_SUB_PATH] = {
+  "'": [IN_SINGLE_QUOTE, APPEND],
+  '"': [IN_DOUBLE_QUOTE, APPEND],
+  '[': [IN_SUB_PATH, INC_SUB_PATH_DEPTH],
+  ']': [IN_PATH, PUSH_SUB_PATH],
+  'eof': ERROR,
+  'else': [IN_SUB_PATH, APPEND]
+};
+
+pathStateMachine[IN_SINGLE_QUOTE] = {
+  "'": [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_SINGLE_QUOTE, APPEND]
+};
+
+pathStateMachine[IN_DOUBLE_QUOTE] = {
+  '"': [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_DOUBLE_QUOTE, APPEND]
+};
+
+/**
+ * Check if an expression is a literal value.
+ */
+
+const literalValueRE = /^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/;
+function isLiteral (exp) {
+  return literalValueRE.test(exp)
+}
+
+/**
+ * Strip quotes from a string
+ */
+
+function stripQuotes (str) {
+  const a = str.charCodeAt(0);
+  const b = str.charCodeAt(str.length - 1);
+  return a === b && (a === 0x22 || a === 0x27)
+    ? str.slice(1, -1)
+    : str
+}
+
+/**
+ * Determine the type of a character in a keypath.
+ */
+
+function getPathCharType (ch) {
+  if (ch === undefined || ch === null) { return 'eof' }
+
+  const code = ch.charCodeAt(0);
+
+  switch (code) {
+    case 0x5B: // [
+    case 0x5D: // ]
+    case 0x2E: // .
+    case 0x22: // "
+    case 0x27: // '
+      return ch
+
+    case 0x5F: // _
+    case 0x24: // $
+    case 0x2D: // -
+      return 'ident'
+
+    case 0x09: // Tab
+    case 0x0A: // Newline
+    case 0x0D: // Return
+    case 0xA0:  // No-break space
+    case 0xFEFF:  // Byte Order Mark
+    case 0x2028:  // Line Separator
+    case 0x2029:  // Paragraph Separator
+      return 'ws'
+  }
+
+  return 'ident'
+}
+
+/**
+ * Format a subPath, return its plain form if it is
+ * a literal string or number. Otherwise prepend the
+ * dynamic indicator (*).
+ */
+
+function formatSubPath (path) {
+  const trimmed = path.trim();
+  // invalid leading 0
+  if (path.charAt(0) === '0' && isNaN(path)) { return false }
+
+  return isLiteral(trimmed) ? stripQuotes(trimmed) : '*' + trimmed
+}
+
+/**
+ * Parse a string path into an array of segments
+ */
+
+function parse$1 (path) {
+  const keys = [];
+  let index = -1;
+  let mode = BEFORE_PATH;
+  let subPathDepth = 0;
+  let c;
+  let key;
+  let newChar;
+  let type;
+  let transition;
+  let action;
+  let typeMap;
+  const actions = [];
+
+  actions[PUSH] = function () {
+    if (key !== undefined) {
+      keys.push(key);
+      key = undefined;
+    }
+  };
+
+  actions[APPEND] = function () {
+    if (key === undefined) {
+      key = newChar;
+    } else {
+      key += newChar;
+    }
+  };
+
+  actions[INC_SUB_PATH_DEPTH] = function () {
+    actions[APPEND]();
+    subPathDepth++;
+  };
+
+  actions[PUSH_SUB_PATH] = function () {
+    if (subPathDepth > 0) {
+      subPathDepth--;
+      mode = IN_SUB_PATH;
+      actions[APPEND]();
+    } else {
+      subPathDepth = 0;
+      if (key === undefined) { return false }
+      key = formatSubPath(key);
+      if (key === false) {
+        return false
+      } else {
+        actions[PUSH]();
+      }
+    }
+  };
+
+  function maybeUnescapeQuote () {
+    const nextChar = path[index + 1];
+    if ((mode === IN_SINGLE_QUOTE && nextChar === "'") ||
+      (mode === IN_DOUBLE_QUOTE && nextChar === '"')) {
+      index++;
+      newChar = '\\' + nextChar;
+      actions[APPEND]();
+      return true
+    }
+  }
+
+  while (mode !== null) {
+    index++;
+    c = path[index];
+
+    if (c === '\\' && maybeUnescapeQuote()) {
+      continue
+    }
+
+    type = getPathCharType(c);
+    typeMap = pathStateMachine[mode];
+    transition = typeMap[type] || typeMap['else'] || ERROR;
+
+    if (transition === ERROR) {
+      return // parse error
+    }
+
+    mode = transition[0];
+    action = actions[transition[1]];
+    if (action) {
+      newChar = transition[2];
+      newChar = newChar === undefined
+        ? c
+        : newChar;
+      if (action() === false) {
+        return
+      }
+    }
+
+    if (mode === AFTER_PATH) {
+      return keys
+    }
+  }
+}
+
+
+
+
+
+class I18nPath {
+  
+
+  constructor () {
+    this._cache = Object.create(null);
+  }
+
+  /**
+   * External parse that check for a cache hit first
+   */
+  parsePath (path) {
+    let hit = this._cache[path];
+    if (!hit) {
+      hit = parse$1(path);
+      if (hit) {
+        this._cache[path] = hit;
+      }
+    }
+    return hit || []
+  }
+
+  /**
+   * Get path value from path string
+   */
+  getPathValue (obj, path) {
+    if (!isObject(obj)) { return null }
+
+    const paths = this.parsePath(path);
+    if (paths.length === 0) {
+      return null
+    } else {
+      const length = paths.length;
+      let last = obj;
+      let i = 0;
+      while (i < length) {
+        const value = last[paths[i]];
+        if (value === undefined) {
+          return null
+        }
+        last = value;
+        i++;
+      }
+
+      return last
+    }
+  }
+}
+
+/*  */
+
+
+
+const htmlTagMatcher = /<\/?[\w\s="/.':;#-\/]+>/;
+const linkKeyMatcher = /(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g;
+const linkKeyPrefixMatcher = /^@(?:\.([a-z]+))?:/;
+const bracketsMatcher = /[()]/g;
+const defaultModifiers = {
+  'upper': str => str.toLocaleUpperCase(),
+  'lower': str => str.toLocaleLowerCase(),
+  'capitalize': str => `${str.charAt(0).toLocaleUpperCase()}${str.substr(1)}`
+};
+
+const defaultFormatter = new BaseFormatter();
+
+class VueI18n {
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  constructor (options = {}) {
+    // Auto install if it is not done yet and `window` has `Vue`.
+    // To allow users to avoid auto-installation in some cases,
+    // this code should be placed here. See #290
+    /* istanbul ignore if */
+    if (!Vue && typeof window !== 'undefined' && window.Vue) {
+      install(window.Vue);
+    }
+
+    const locale = options.locale || 'en-US';
+    const fallbackLocale = options.fallbackLocale === false
+      ? false
+      : options.fallbackLocale || 'en-US';
+    const messages = options.messages || {};
+    const dateTimeFormats = options.dateTimeFormats || {};
+    const numberFormats = options.numberFormats || {};
+
+    this._vm = null;
+    this._formatter = options.formatter || defaultFormatter;
+    this._modifiers = options.modifiers || {};
+    this._missing = options.missing || null;
+    this._root = options.root || null;
+    this._sync = options.sync === undefined ? true : !!options.sync;
+    this._fallbackRoot = options.fallbackRoot === undefined
+      ? true
+      : !!options.fallbackRoot;
+    this._formatFallbackMessages = options.formatFallbackMessages === undefined
+      ? false
+      : !!options.formatFallbackMessages;
+    this._silentTranslationWarn = options.silentTranslationWarn === undefined
+      ? false
+      : options.silentTranslationWarn;
+    this._silentFallbackWarn = options.silentFallbackWarn === undefined
+      ? false
+      : !!options.silentFallbackWarn;
+    this._dateTimeFormatters = {};
+    this._numberFormatters = {};
+    this._path = new I18nPath();
+    this._dataListeners = [];
+    this._componentInstanceCreatedListener = options.componentInstanceCreatedListener || null;
+    this._preserveDirectiveContent = options.preserveDirectiveContent === undefined
+      ? false
+      : !!options.preserveDirectiveContent;
+    this.pluralizationRules = options.pluralizationRules || {};
+    this._warnHtmlInMessage = options.warnHtmlInMessage || 'off';
+    this._postTranslation = options.postTranslation || null;
+
+    /**
+     * @param choice {number} a choice index given by the input to $tc: `$tc('path.to.rule', choiceIndex)`
+     * @param choicesLength {number} an overall amount of available choices
+     * @returns a final choice index
+    */
+    this.getChoiceIndex = (choice, choicesLength) => {
+      const thisPrototype = Object.getPrototypeOf(this);
+      if (thisPrototype && thisPrototype.getChoiceIndex) {
+        const prototypeGetChoiceIndex = (thisPrototype.getChoiceIndex);
+        return (prototypeGetChoiceIndex).call(this, choice, choicesLength)
+      }
+
+      // Default (old) getChoiceIndex implementation - english-compatible
+      const defaultImpl = (_choice, _choicesLength) => {
+        _choice = Math.abs(_choice);
+
+        if (_choicesLength === 2) {
+          return _choice
+            ? _choice > 1
+              ? 1
+              : 0
+            : 1
+        }
+
+        return _choice ? Math.min(_choice, 2) : 0
+      };
+
+      if (this.locale in this.pluralizationRules) {
+        return this.pluralizationRules[this.locale].apply(this, [choice, choicesLength])
+      } else {
+        return defaultImpl(choice, choicesLength)
+      }
+    };
+
+
+    this._exist = (message, key) => {
+      if (!message || !key) { return false }
+      if (!isNull(this._path.getPathValue(message, key))) { return true }
+      // fallback for flat key
+      if (message[key]) { return true }
+      return false
+    };
+
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      Object.keys(messages).forEach(locale => {
+        this._checkLocaleMessage(locale, this._warnHtmlInMessage, messages[locale]);
+      });
+    }
+
+    this._initVM({
+      locale,
+      fallbackLocale,
+      messages,
+      dateTimeFormats,
+      numberFormats
+    });
+  }
+
+  _checkLocaleMessage (locale, level, message) {
+    const paths = [];
+
+    const fn = (level, locale, message, paths) => {
+      if (isPlainObject(message)) {
+        Object.keys(message).forEach(key => {
+          const val = message[key];
+          if (isPlainObject(val)) {
+            paths.push(key);
+            paths.push('.');
+            fn(level, locale, val, paths);
+            paths.pop();
+            paths.pop();
+          } else {
+            paths.push(key);
+            fn(level, locale, val, paths);
+            paths.pop();
+          }
+        });
+      } else if (Array.isArray(message)) {
+        message.forEach((item, index) => {
+          if (isPlainObject(item)) {
+            paths.push(`[${index}]`);
+            paths.push('.');
+            fn(level, locale, item, paths);
+            paths.pop();
+            paths.pop();
+          } else {
+            paths.push(`[${index}]`);
+            fn(level, locale, item, paths);
+            paths.pop();
+          }
+        });
+      } else if (isString(message)) {
+        const ret = htmlTagMatcher.test(message);
+        if (ret) {
+          const msg = `Detected HTML in message '${message}' of keypath '${paths.join('')}' at '${locale}'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp`;
+          if (level === 'warn') {
+            warn(msg);
+          } else if (level === 'error') {
+            error(msg);
+          }
+        }
+      }
+    };
+
+    fn(level, locale, message, paths);
+  }
+
+  _initVM (data) {
+    const silent = Vue.config.silent;
+    Vue.config.silent = true;
+    this._vm = new Vue({ data });
+    Vue.config.silent = silent;
+  }
+
+  destroyVM () {
+    this._vm.$destroy();
+  }
+
+  subscribeDataChanging (vm) {
+    this._dataListeners.push(vm);
+  }
+
+  unsubscribeDataChanging (vm) {
+    remove(this._dataListeners, vm);
+  }
+
+  watchI18nData () {
+    const self = this;
+    return this._vm.$watch('$data', () => {
+      let i = self._dataListeners.length;
+      while (i--) {
+        Vue.nextTick(() => {
+          self._dataListeners[i] && self._dataListeners[i].$forceUpdate();
+        });
+      }
+    }, { deep: true })
+  }
+
+  watchLocale () {
+    /* istanbul ignore if */
+    if (!this._sync || !this._root) { return null }
+    const target = this._vm;
+    return this._root.$i18n.vm.$watch('locale', (val) => {
+      target.$set(target, 'locale', val);
+      target.$forceUpdate();
+    }, { immediate: true })
+  }
+
+  onComponentInstanceCreated (newI18n) {
+    if (this._componentInstanceCreatedListener) {
+      this._componentInstanceCreatedListener(newI18n, this);
+    }
+  }
+
+  get vm () { return this._vm }
+
+  get messages () { return looseClone(this._getMessages()) }
+  get dateTimeFormats () { return looseClone(this._getDateTimeFormats()) }
+  get numberFormats () { return looseClone(this._getNumberFormats()) }
+  get availableLocales () { return Object.keys(this.messages).sort() }
+
+  get locale () { return this._vm.locale }
+  set locale (locale) {
+    this._vm.$set(this._vm, 'locale', locale);
+  }
+
+  get fallbackLocale () { return this._vm.fallbackLocale }
+  set fallbackLocale (locale) {
+    this._localeChainCache = {};
+    this._vm.$set(this._vm, 'fallbackLocale', locale);
+  }
+
+  get formatFallbackMessages () { return this._formatFallbackMessages }
+  set formatFallbackMessages (fallback) { this._formatFallbackMessages = fallback; }
+
+  get missing () { return this._missing }
+  set missing (handler) { this._missing = handler; }
+
+  get formatter () { return this._formatter }
+  set formatter (formatter) { this._formatter = formatter; }
+
+  get silentTranslationWarn () { return this._silentTranslationWarn }
+  set silentTranslationWarn (silent) { this._silentTranslationWarn = silent; }
+
+  get silentFallbackWarn () { return this._silentFallbackWarn }
+  set silentFallbackWarn (silent) { this._silentFallbackWarn = silent; }
+
+  get preserveDirectiveContent () { return this._preserveDirectiveContent }
+  set preserveDirectiveContent (preserve) { this._preserveDirectiveContent = preserve; }
+
+  get warnHtmlInMessage () { return this._warnHtmlInMessage }
+  set warnHtmlInMessage (level) {
+    const orgLevel = this._warnHtmlInMessage;
+    this._warnHtmlInMessage = level;
+    if (orgLevel !== level && (level === 'warn' || level === 'error')) {
+      const messages = this._getMessages();
+      Object.keys(messages).forEach(locale => {
+        this._checkLocaleMessage(locale, this._warnHtmlInMessage, messages[locale]);
+      });
+    }
+  }
+
+  get postTranslation () { return this._postTranslation }
+  set postTranslation (handler) { this._postTranslation = handler; }
+
+  _getMessages () { return this._vm.messages }
+  _getDateTimeFormats () { return this._vm.dateTimeFormats }
+  _getNumberFormats () { return this._vm.numberFormats }
+
+  _warnDefault (locale, key, result, vm, values, interpolateMode) {
+    if (!isNull(result)) { return result }
+    if (this._missing) {
+      const missingRet = this._missing.apply(null, [locale, key, vm, values]);
+      if (isString(missingRet)) {
+        return missingRet
+      }
+    } else {
+      if (!this._isSilentTranslationWarn(key)) {
+        warn(
+          `Cannot translate the value of keypath '${key}'. ` +
+          'Use the value of keypath as default.'
+        );
+      }
+    }
+
+    if (this._formatFallbackMessages) {
+      const parsedArgs = parseArgs(...values);
+      return this._render(key, interpolateMode, parsedArgs.params, key)
+    } else {
+      return key
+    }
+  }
+
+  _isFallbackRoot (val) {
+    return !val && !isNull(this._root) && this._fallbackRoot
+  }
+
+  _isSilentFallbackWarn (key) {
+    return this._silentFallbackWarn instanceof RegExp
+      ? this._silentFallbackWarn.test(key)
+      : this._silentFallbackWarn
+  }
+
+  _isSilentFallback (locale, key) {
+    return this._isSilentFallbackWarn(key) && (this._isFallbackRoot() || locale !== this.fallbackLocale)
+  }
+
+  _isSilentTranslationWarn (key) {
+    return this._silentTranslationWarn instanceof RegExp
+      ? this._silentTranslationWarn.test(key)
+      : this._silentTranslationWarn
+  }
+
+  _interpolate (
+    locale,
+    message,
+    key,
+    host,
+    interpolateMode,
+    values,
+    visitedLinkStack
+  ) {
+    if (!message) { return null }
+
+    const pathRet = this._path.getPathValue(message, key);
+    if (Array.isArray(pathRet) || isPlainObject(pathRet)) { return pathRet }
+
+    let ret;
+    if (isNull(pathRet)) {
+      /* istanbul ignore else */
+      if (isPlainObject(message)) {
+        ret = message[key];
+        if (!isString(ret)) {
+          if (!this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+            warn(`Value of key '${key}' is not a string!`);
+          }
+          return null
+        }
+      } else {
+        return null
+      }
+    } else {
+      /* istanbul ignore else */
+      if (isString(pathRet)) {
+        ret = pathRet;
+      } else {
+        if (!this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+          warn(`Value of key '${key}' is not a string!`);
+        }
+        return null
+      }
+    }
+
+    // Check for the existence of links within the translated string
+    if (ret.indexOf('@:') >= 0 || ret.indexOf('@.') >= 0) {
+      ret = this._link(locale, message, ret, host, 'raw', values, visitedLinkStack);
+    }
+
+    return this._render(ret, interpolateMode, values, key)
+  }
+
+  _link (
+    locale,
+    message,
+    str,
+    host,
+    interpolateMode,
+    values,
+    visitedLinkStack
+  ) {
+    let ret = str;
+
+    // Match all the links within the local
+    // We are going to replace each of
+    // them with its translation
+    const matches = ret.match(linkKeyMatcher);
+    for (let idx in matches) {
+      // ie compatible: filter custom array
+      // prototype method
+      if (!matches.hasOwnProperty(idx)) {
+        continue
+      }
+      const link = matches[idx];
+      const linkKeyPrefixMatches = link.match(linkKeyPrefixMatcher);
+      const [linkPrefix, formatterName] = linkKeyPrefixMatches;
+
+      // Remove the leading @:, @.case: and the brackets
+      const linkPlaceholder = link.replace(linkPrefix, '').replace(bracketsMatcher, '');
+
+      if (includes(visitedLinkStack, linkPlaceholder)) {
+        {
+          warn(`Circular reference found. "${link}" is already visited in the chain of ${visitedLinkStack.reverse().join(' <- ')}`);
+        }
+        return ret
+      }
+      visitedLinkStack.push(linkPlaceholder);
+
+      // Translate the link
+      let translated = this._interpolate(
+        locale, message, linkPlaceholder, host,
+        interpolateMode === 'raw' ? 'string' : interpolateMode,
+        interpolateMode === 'raw' ? undefined : values,
+        visitedLinkStack
+      );
+
+      if (this._isFallbackRoot(translated)) {
+        if (!this._isSilentTranslationWarn(linkPlaceholder)) {
+          warn(`Fall back to translate the link placeholder '${linkPlaceholder}' with root locale.`);
+        }
+        /* istanbul ignore if */
+        if (!this._root) { throw Error('unexpected error') }
+        const root = this._root.$i18n;
+        translated = root._translate(
+          root._getMessages(), root.locale, root.fallbackLocale,
+          linkPlaceholder, host, interpolateMode, values
+        );
+      }
+      translated = this._warnDefault(
+        locale, linkPlaceholder, translated, host,
+        Array.isArray(values) ? values : [values],
+        interpolateMode
+      );
+
+      if (this._modifiers.hasOwnProperty(formatterName)) {
+        translated = this._modifiers[formatterName](translated);
+      } else if (defaultModifiers.hasOwnProperty(formatterName)) {
+        translated = defaultModifiers[formatterName](translated);
+      }
+
+      visitedLinkStack.pop();
+
+      // Replace the link with the translated
+      ret = !translated ? ret : ret.replace(link, translated);
+    }
+
+    return ret
+  }
+
+  _render (message, interpolateMode, values, path) {
+    let ret = this._formatter.interpolate(message, values, path);
+
+    // If the custom formatter refuses to work - apply the default one
+    if (!ret) {
+      ret = defaultFormatter.interpolate(message, values, path);
+    }
+
+    // if interpolateMode is **not** 'string' ('row'),
+    // return the compiled data (e.g. ['foo', VNode, 'bar']) with formatter
+    return interpolateMode === 'string' && !isString(ret) ? ret.join('') : ret
+  }
+
+  _appendItemToChain (chain, item, blocks) {
+    let follow = false;
+    if (!includes(chain, item)) {
+      follow = true;
+      if (item) {
+        follow = item[item.length - 1] !== '!';
+        item = item.replace(/!/g, '');
+        chain.push(item);
+        if (blocks && blocks[item]) {
+          follow = blocks[item];
+        }
+      }
+    }
+    return follow
+  }
+
+  _appendLocaleToChain (chain, locale, blocks) {
+    let follow;
+    const tokens = locale.split('-');
+    do {
+      const item = tokens.join('-');
+      follow = this._appendItemToChain(chain, item, blocks);
+      tokens.splice(-1, 1);
+    } while (tokens.length && (follow === true))
+    return follow
+  }
+
+  _appendBlockToChain (chain, block, blocks) {
+    let follow = true;
+    for (let i = 0; (i < block.length) && (isBoolean(follow)); i++) {
+      const locale = block[i];
+      if (isString(locale)) {
+        follow = this._appendLocaleToChain(chain, locale, blocks);
+      }
+    }
+    return follow
+  }
+
+  _getLocaleChain (start, fallbackLocale) {
+    if (start === '') { return [] }
+
+    if (!this._localeChainCache) {
+      this._localeChainCache = {};
+    }
+
+    let chain = this._localeChainCache[start];
+    if (!chain) {
+      if (!fallbackLocale) {
+        fallbackLocale = this.fallbackLocale;
+      }
+      chain = [];
+
+      // first block defined by start
+      let block = [start];
+
+      // while any intervening block found
+      while (isArray(block)) {
+        block = this._appendBlockToChain(
+          chain,
+          block,
+          fallbackLocale
+        );
+      }
+
+      // last block defined by default
+      let defaults;
+      if (isArray(fallbackLocale)) {
+        defaults = fallbackLocale;
+      } else if (isObject(fallbackLocale)) {
+        /* $FlowFixMe */
+        if (fallbackLocale['default']) {
+          defaults = fallbackLocale['default'];
+        } else {
+          defaults = null;
+        }
+      } else {
+        defaults = fallbackLocale;
+      }
+
+      // convert defaults to array
+      if (isString(defaults)) {
+        block = [defaults];
+      } else {
+        block = defaults;
+      }
+      if (block) {
+        this._appendBlockToChain(
+          chain,
+          block,
+          null
+        );
+      }
+      this._localeChainCache[start] = chain;
+    }
+    return chain
+  }
+
+  _translate (
+    messages,
+    locale,
+    fallback,
+    key,
+    host,
+    interpolateMode,
+    args
+  ) {
+    const chain = this._getLocaleChain(locale, fallback);
+    let res;
+    for (let i = 0; i < chain.length; i++) {
+      const step = chain[i];
+      res =
+        this._interpolate(step, messages[step], key, host, interpolateMode, args, [key]);
+      if (!isNull(res)) {
+        if (step !== locale && "development" !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(("Fall back to translate the keypath '" + key + "' with '" + step + "' locale."));
+        }
+        return res
+      }
+    }
+    return null
+  }
+
+  _t (key, _locale, messages, host, ...values) {
+    if (!key) { return '' }
+
+    const parsedArgs = parseArgs(...values);
+    const locale = parsedArgs.locale || _locale;
+
+    let ret = this._translate(
+      messages, locale, this.fallbackLocale, key,
+      host, 'string', parsedArgs.params
+    );
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(`Fall back to translate the keypath '${key}' with root locale.`);
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$t(key, ...values)
+    } else {
+      ret = this._warnDefault(locale, key, ret, host, values, 'string');
+      if (this._postTranslation && ret !== null && ret !== undefined) {
+        ret = this._postTranslation(ret, key);
+      }
+      return ret
+    }
+  }
+
+  t (key, ...values) {
+    return this._t(key, this.locale, this._getMessages(), null, ...values)
+  }
+
+  _i (key, locale, messages, host, values) {
+    const ret =
+      this._translate(messages, locale, this.fallbackLocale, key, host, 'raw', values);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key)) {
+        warn(`Fall back to interpolate the keypath '${key}' with root locale.`);
+      }
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.i(key, locale, values)
+    } else {
+      return this._warnDefault(locale, key, ret, host, [values], 'raw')
+    }
+  }
+
+  i (key, locale, values) {
+    /* istanbul ignore if */
+    if (!key) { return '' }
+
+    if (!isString(locale)) {
+      locale = this.locale;
+    }
+
+    return this._i(key, locale, this._getMessages(), null, values)
+  }
+
+  _tc (
+    key,
+    _locale,
+    messages,
+    host,
+    choice,
+    ...values
+  ) {
+    if (!key) { return '' }
+    if (choice === undefined) {
+      choice = 1;
+    }
+
+    const predefined = { 'count': choice, 'n': choice };
+    const parsedArgs = parseArgs(...values);
+    parsedArgs.params = Object.assign(predefined, parsedArgs.params);
+    values = parsedArgs.locale === null ? [parsedArgs.params] : [parsedArgs.locale, parsedArgs.params];
+    return this.fetchChoice(this._t(key, _locale, messages, host, ...values), choice)
+  }
+
+  fetchChoice (message, choice) {
+    /* istanbul ignore if */
+    if (!message && !isString(message)) { return null }
+    const choices = message.split('|');
+
+    choice = this.getChoiceIndex(choice, choices.length);
+    if (!choices[choice]) { return message }
+    return choices[choice].trim()
+  }
+
+  tc (key, choice, ...values) {
+    return this._tc(key, this.locale, this._getMessages(), null, choice, ...values)
+  }
+
+  _te (key, locale, messages, ...args) {
+    const _locale = parseArgs(...args).locale || locale;
+    return this._exist(messages[_locale], key)
+  }
+
+  te (key, locale) {
+    return this._te(key, this.locale, this._getMessages(), locale)
+  }
+
+  getLocaleMessage (locale) {
+    return looseClone(this._vm.messages[locale] || {})
+  }
+
+  setLocaleMessage (locale, message) {
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+    }
+    this._vm.$set(this._vm.messages, locale, message);
+  }
+
+  mergeLocaleMessage (locale, message) {
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+    }
+    this._vm.$set(this._vm.messages, locale, merge({}, this._vm.messages[locale] || {}, message));
+  }
+
+  getDateTimeFormat (locale) {
+    return looseClone(this._vm.dateTimeFormats[locale] || {})
+  }
+
+  setDateTimeFormat (locale, format) {
+    this._vm.$set(this._vm.dateTimeFormats, locale, format);
+    this._clearDateTimeFormat(locale, format);
+  }
+
+  mergeDateTimeFormat (locale, format) {
+    this._vm.$set(this._vm.dateTimeFormats, locale, merge(this._vm.dateTimeFormats[locale] || {}, format));
+    this._clearDateTimeFormat(locale, format);
+  }
+
+  _clearDateTimeFormat (locale, format) {
+    for (let key in format) {
+      const id = `${locale}__${key}`;
+
+      if (!this._dateTimeFormatters.hasOwnProperty(id)) {
+        continue
+      }
+
+      delete this._dateTimeFormatters[id];
+    }
+  }
+
+  _localizeDateTime (
+    value,
+    locale,
+    fallback,
+    dateTimeFormats,
+    key
+  ) {
+    let _locale = locale;
+    let formats = dateTimeFormats[_locale];
+
+    const chain = this._getLocaleChain(locale, fallback);
+    for (let i = 0; i < chain.length; i++) {
+      const current = _locale;
+      const step = chain[i];
+      formats = dateTimeFormats[step];
+      _locale = step;
+      // fallback locale
+      if (isNull(formats) || isNull(formats[key])) {
+        if (step !== locale && "development" !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(`Fall back to '${step}' datetime formats from '${current}' datetime formats.`);
+        }
+      } else {
+        break
+      }
+    }
+
+    if (isNull(formats) || isNull(formats[key])) {
+      return null
+    } else {
+      const format = formats[key];
+      const id = `${_locale}__${key}`;
+      let formatter = this._dateTimeFormatters[id];
+      if (!formatter) {
+        formatter = this._dateTimeFormatters[id] = new Intl.DateTimeFormat(_locale, format);
+      }
+      return formatter.format(value)
+    }
+  }
+
+  _d (value, locale, key) {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.dateTimeFormat) {
+      warn('Cannot format a Date value due to not supported Intl.DateTimeFormat.');
+      return ''
+    }
+
+    if (!key) {
+      return new Intl.DateTimeFormat(locale).format(value)
+    }
+
+    const ret =
+      this._localizeDateTime(value, locale, this.fallbackLocale, this._getDateTimeFormats(), key);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(`Fall back to datetime localization of root: key '${key}'.`);
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.d(value, key, locale)
+    } else {
+      return ret || ''
+    }
+  }
+
+  d (value, ...args) {
+    let locale = this.locale;
+    let key = null;
+
+    if (args.length === 1) {
+      if (isString(args[0])) {
+        key = args[0];
+      } else if (isObject(args[0])) {
+        if (args[0].locale) {
+          locale = args[0].locale;
+        }
+        if (args[0].key) {
+          key = args[0].key;
+        }
+      }
+    } else if (args.length === 2) {
+      if (isString(args[0])) {
+        key = args[0];
+      }
+      if (isString(args[1])) {
+        locale = args[1];
+      }
+    }
+
+    return this._d(value, locale, key)
+  }
+
+  getNumberFormat (locale) {
+    return looseClone(this._vm.numberFormats[locale] || {})
+  }
+
+  setNumberFormat (locale, format) {
+    this._vm.$set(this._vm.numberFormats, locale, format);
+    this._clearNumberFormat(locale, format);
+  }
+
+  mergeNumberFormat (locale, format) {
+    this._vm.$set(this._vm.numberFormats, locale, merge(this._vm.numberFormats[locale] || {}, format));
+    this._clearNumberFormat(locale, format);
+  }
+
+  _clearNumberFormat (locale, format) {
+    for (let key in format) {
+      const id = `${locale}__${key}`;
+
+      if (!this._numberFormatters.hasOwnProperty(id)) {
+        continue
+      }
+
+      delete this._numberFormatters[id];
+    }
+  }
+
+  _getNumberFormatter (
+    value,
+    locale,
+    fallback,
+    numberFormats,
+    key,
+    options
+  ) {
+    let _locale = locale;
+    let formats = numberFormats[_locale];
+
+    const chain = this._getLocaleChain(locale, fallback);
+    for (let i = 0; i < chain.length; i++) {
+      const current = _locale;
+      const step = chain[i];
+      formats = numberFormats[step];
+      _locale = step;
+      // fallback locale
+      if (isNull(formats) || isNull(formats[key])) {
+        if (step !== locale && "development" !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(`Fall back to '${step}' number formats from '${current}' number formats.`);
+        }
+      } else {
+        break
+      }
+    }
+
+    if (isNull(formats) || isNull(formats[key])) {
+      return null
+    } else {
+      const format = formats[key];
+
+      let formatter;
+      if (options) {
+        // If options specified - create one time number formatter
+        formatter = new Intl.NumberFormat(_locale, Object.assign({}, format, options));
+      } else {
+        const id = `${_locale}__${key}`;
+        formatter = this._numberFormatters[id];
+        if (!formatter) {
+          formatter = this._numberFormatters[id] = new Intl.NumberFormat(_locale, format);
+        }
+      }
+      return formatter
+    }
+  }
+
+  _n (value, locale, key, options) {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.numberFormat) {
+      {
+        warn('Cannot format a Number value due to not supported Intl.NumberFormat.');
+      }
+      return ''
+    }
+
+    if (!key) {
+      const nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+      return nf.format(value)
+    }
+
+    const formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+    const ret = formatter && formatter.format(value);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(`Fall back to number localization of root: key '${key}'.`);
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.n(value, Object.assign({}, { key, locale }, options))
+    } else {
+      return ret || ''
+    }
+  }
+
+  n (value, ...args) {
+    let locale = this.locale;
+    let key = null;
+    let options = null;
+
+    if (args.length === 1) {
+      if (isString(args[0])) {
+        key = args[0];
+      } else if (isObject(args[0])) {
+        if (args[0].locale) {
+          locale = args[0].locale;
+        }
+        if (args[0].key) {
+          key = args[0].key;
+        }
+
+        // Filter out number format options only
+        options = Object.keys(args[0]).reduce((acc, key) => {
+          if (includes(numberFormatKeys, key)) {
+            return Object.assign({}, acc, { [key]: args[0][key] })
+          }
+          return acc
+        }, null);
+      }
+    } else if (args.length === 2) {
+      if (isString(args[0])) {
+        key = args[0];
+      }
+      if (isString(args[1])) {
+        locale = args[1];
+      }
+    }
+
+    return this._n(value, locale, key, options)
+  }
+
+  _ntp (value, locale, key, options) {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.numberFormat) {
+      {
+        warn('Cannot format to parts a Number value due to not supported Intl.NumberFormat.');
+      }
+      return []
+    }
+
+    if (!key) {
+      const nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+      return nf.formatToParts(value)
+    }
+
+    const formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+    const ret = formatter && formatter.formatToParts(value);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key)) {
+        warn(`Fall back to format number to parts of root: key '${key}' .`);
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n._ntp(value, locale, key, options)
+    } else {
+      return ret || []
+    }
+  }
+}
+
+let availabilities;
+// $FlowFixMe
+Object.defineProperty(VueI18n, 'availabilities', {
+  get () {
+    if (!availabilities) {
+      const intlDefined = typeof Intl !== 'undefined';
+      availabilities = {
+        dateTimeFormat: intlDefined && typeof Intl.DateTimeFormat !== 'undefined',
+        numberFormat: intlDefined && typeof Intl.NumberFormat !== 'undefined'
+      };
+    }
+
+    return availabilities
+  }
+});
+
+VueI18n.install = install;
+VueI18n.version = '8.20.0';
+
+export default VueI18n;
diff --git a/node_modules/vue-i18n/dist/vue-i18n.esm.browser.min.js b/node_modules/vue-i18n/dist/vue-i18n.esm.browser.min.js
new file mode 100644
index 0000000..fa3c3cd
--- /dev/null
+++ b/node_modules/vue-i18n/dist/vue-i18n.esm.browser.min.js
@@ -0,0 +1 @@
+const t=["style","currency","currencyDisplay","useGrouping","minimumIntegerDigits","minimumFractionDigits","maximumFractionDigits","minimumSignificantDigits","maximumSignificantDigits","localeMatcher","formatMatcher","unit"];function e(t,e){"undefined"!=typeof console&&(console.warn("[vue-i18n] "+t),e&&console.warn(e.stack))}const n=Array.isArray;function s(t){return null!==t&&"object"==typeof t}function r(t){return"string"==typeof t}const a=Object.prototype.toString,i="[object Object]";function o(t){return a.call(t)===i}function l(t){return null==t}function c(...t){let e=null,n=null;return 1===t.length?s(t[0])||Array.isArray(t[0])?n=t[0]:"string"==typeof t[0]&&(e=t[0]):2===t.length&&("string"==typeof t[0]&&(e=t[0]),(s(t[1])||Array.isArray(t[1]))&&(n=t[1])),{locale:e,params:n}}function h(t){return JSON.parse(JSON.stringify(t))}function u(t,e){return!!~t.indexOf(e)}const m=Object.prototype.hasOwnProperty;function _(t,e){return m.call(t,e)}function f(t){const e=Object(t);for(let t=1;t<arguments.length;t++){const n=arguments[t];if(null!=n){let t;for(t in n)_(n,t)&&(s(n[t])?e[t]=f(e[t],n[t]):e[t]=n[t])}}return e}function p(t,e){if(t===e)return!0;const n=s(t),r=s(e);if(!n||!r)return!n&&!r&&String(t)===String(e);try{const n=Array.isArray(t),s=Array.isArray(e);if(n&&s)return t.length===e.length&&t.every((t,n)=>p(t,e[n]));if(n||s)return!1;{const n=Object.keys(t),s=Object.keys(e);return n.length===s.length&&n.every(n=>p(t[n],e[n]))}}catch(t){return!1}}var g={beforeCreate(){const t=this.$options;if(t.i18n=t.i18n||(t.__i18n?{}:null),t.i18n){if(t.i18n instanceof Y){if(t.__i18n)try{let e={};t.__i18n.forEach(t=>{e=f(e,JSON.parse(t))}),Object.keys(e).forEach(n=>{t.i18n.mergeLocaleMessage(n,e[n])})}catch(t){}this._i18n=t.i18n,this._i18nWatcher=this._i18n.watchI18nData()}else if(o(t.i18n)){const e=this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof Y?this.$root.$i18n:null;if(e&&(t.i18n.root=this.$root,t.i18n.formatter=e.formatter,t.i18n.fallbackLocale=e.fallbackLocale,t.i18n.formatFallbackMessages=e.formatFallbackMessages,t.i18n.silentTranslationWarn=e.silentTranslationWarn,t.i18n.silentFallbackWarn=e.silentFallbackWarn,t.i18n.pluralizationRules=e.pluralizationRules,t.i18n.preserveDirectiveContent=e.preserveDirectiveContent),t.__i18n)try{let e={};t.__i18n.forEach(t=>{e=f(e,JSON.parse(t))}),t.i18n.messages=e}catch(t){}const{sharedMessages:n}=t.i18n;n&&o(n)&&(t.i18n.messages=f(t.i18n.messages,n)),this._i18n=new Y(t.i18n),this._i18nWatcher=this._i18n.watchI18nData(),(void 0===t.i18n.sync||t.i18n.sync)&&(this._localeWatcher=this.$i18n.watchLocale()),e&&e.onComponentInstanceCreated(this._i18n)}}else this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof Y?this._i18n=this.$root.$i18n:t.parent&&t.parent.$i18n&&t.parent.$i18n instanceof Y&&(this._i18n=t.parent.$i18n)},beforeMount(){const t=this.$options;t.i18n=t.i18n||(t.__i18n?{}:null),t.i18n?t.i18n instanceof Y?(this._i18n.subscribeDataChanging(this),this._subscribing=!0):o(t.i18n)&&(this._i18n.subscribeDataChanging(this),this._subscribing=!0):this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof Y?(this._i18n.subscribeDataChanging(this),this._subscribing=!0):t.parent&&t.parent.$i18n&&t.parent.$i18n instanceof Y&&(this._i18n.subscribeDataChanging(this),this._subscribing=!0)},beforeDestroy(){if(!this._i18n)return;const t=this;this.$nextTick(()=>{t._subscribing&&(t._i18n.unsubscribeDataChanging(t),delete t._subscribing),t._i18nWatcher&&(t._i18nWatcher(),t._i18n.destroyVM(),delete t._i18nWatcher),t._localeWatcher&&(t._localeWatcher(),delete t._localeWatcher)})}},d={name:"i18n",functional:!0,props:{tag:{type:[String,Boolean,Object],default:"span"},path:{type:String,required:!0},locale:{type:String},places:{type:[Array,Object]}},render(t,{data:e,parent:n,props:s,slots:r}){const{$i18n:a}=n;if(!a)return;const{path:i,locale:o,places:l}=s,c=r(),h=a.i(i,o,function(t){let e;for(e in t)if("default"!==e)return!1;return Boolean(e)}(c)||l?function(t,e){const n=e?function(t){return Array.isArray(t)?t.reduce(v,{}):Object.assign({},t)}(e):{};if(!t)return n;const s=(t=t.filter(t=>t.tag||""!==t.text.trim())).every(y);return t.reduce(s?b:v,n)}(c.default,l):c),u=s.tag&&!0!==s.tag||!1===s.tag?s.tag:"span";return u?t(u,e,h):h}};function b(t,e){return e.data&&e.data.attrs&&e.data.attrs.place&&(t[e.data.attrs.place]=e),t}function v(t,e,n){return t[n]=e,t}function y(t){return Boolean(t.data&&t.data.attrs&&t.data.attrs.place)}var F={name:"i18n-n",functional:!0,props:{tag:{type:[String,Boolean,Object],default:"span"},value:{type:Number,required:!0},format:{type:[String,Object]},locale:{type:String}},render(e,{props:n,parent:a,data:i}){const o=a.$i18n;if(!o)return null;let l=null,c=null;r(n.format)?l=n.format:s(n.format)&&(n.format.key&&(l=n.format.key),c=Object.keys(n.format).reduce((e,s)=>u(t,s)?Object.assign({},e,{[s]:n.format[s]}):e,null));const h=n.locale||o.locale,m=o._ntp(n.value,h,l,c),_=m.map((t,e)=>{const n=i.scopedSlots&&i.scopedSlots[t.type];return n?n({[t.type]:t.value,index:e,parts:m}):t.value}),f=n.tag&&!0!==n.tag||!1===n.tag?n.tag:"span";return f?e(f,{attrs:i.attrs,class:i.class,staticClass:i.staticClass},_):_}};function k(t,e,n){M(t,n)&&C(t,e,n)}function $(t,e,n,s){if(!M(t,n))return;const r=n.context.$i18n;(function(t,e){const n=e.context;return t._locale===n.$i18n.locale})(t,n)&&p(e.value,e.oldValue)&&p(t._localeMessage,r.getLocaleMessage(r.locale))||C(t,e,n)}function w(t,n,s,r){if(!s.context)return void e("Vue instance does not exists in VNode context");const a=s.context.$i18n||{};n.modifiers.preserve||a.preserveDirectiveContent||(t.textContent=""),t._vt=void 0,delete t._vt,t._locale=void 0,delete t._locale,t._localeMessage=void 0,delete t._localeMessage}function M(t,n){const s=n.context;return s?!!s.$i18n||(e("VueI18n instance does not exists in Vue instance"),!1):(e("Vue instance does not exists in VNode context"),!1)}function C(t,n,s){const a=n.value,{path:i,locale:l,args:c,choice:h}=function(t){let e,n,s,a;r(t)?e=t:o(t)&&(e=t.path,n=t.locale,s=t.args,a=t.choice);return{path:e,locale:n,args:s,choice:a}}(a);if(!i&&!l&&!c)return void e("value type not supported");if(!i)return void e("`path` is required in v-t directive");const u=s.context;t._vt=t.textContent=null!=h?u.$i18n.tc(i,h,...T(l,c)):u.$i18n.t(i,...T(l,c)),t._locale=u.$i18n.locale,t._localeMessage=u.$i18n.getLocaleMessage(u.$i18n.locale)}function T(t,e){const n=[];return t&&n.push(t),e&&(Array.isArray(e)||o(e))&&n.push(e),n}let L;function D(t){D.installed=!0;(L=t).version&&Number(L.version.split(".")[0]);!function(t){t.prototype.hasOwnProperty("$i18n")||Object.defineProperty(t.prototype,"$i18n",{get(){return this._i18n}}),t.prototype.$t=function(t,...e){const n=this.$i18n;return n._t(t,n.locale,n._getMessages(),this,...e)},t.prototype.$tc=function(t,e,...n){const s=this.$i18n;return s._tc(t,s.locale,s._getMessages(),this,e,...n)},t.prototype.$te=function(t,e){const n=this.$i18n;return n._te(t,n.locale,n._getMessages(),e)},t.prototype.$d=function(t,...e){return this.$i18n.d(t,...e)},t.prototype.$n=function(t,...e){return this.$i18n.n(t,...e)}}(L),L.mixin(g),L.directive("t",{bind:k,update:$,unbind:w}),L.component(d.name,d),L.component(F.name,F),L.config.optionMergeStrategies.i18n=function(t,e){return void 0===e?t:e}}const I=/^(?:\d)+/,O=/^(?:\w)+/;const x=0,W=1,j=2,N=3,A=0,S=4,R=5,H=6,P=7,V=8,E=[];E[A]={ws:[A],ident:[3,x],"[":[S],eof:[P]},E[1]={ws:[1],".":[2],"[":[S],eof:[P]},E[2]={ws:[2],ident:[3,x],0:[3,x],number:[3,x]},E[3]={ident:[3,x],0:[3,x],number:[3,x],ws:[1,W],".":[2,W],"[":[S,W],eof:[P,W]},E[S]={"'":[R,x],'"':[H,x],"[":[S,j],"]":[1,N],eof:V,else:[S,x]},E[R]={"'":[S,x],eof:V,else:[R,x]},E[H]={'"':[S,x],eof:V,else:[H,x]};const z=/^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/;function B(t){if(null==t)return"eof";switch(t.charCodeAt(0)){case 91:case 93:case 46:case 34:case 39:return t;case 95:case 36:case 45:return"ident";case 9:case 10:case 13:case 160:case 65279:case 8232:case 8233:return"ws"}return"ident"}function U(t){const e=t.trim();return("0"!==t.charAt(0)||!isNaN(t))&&(n=e,z.test(n)?function(t){const e=t.charCodeAt(0);return e!==t.charCodeAt(t.length-1)||34!==e&&39!==e?t:t.slice(1,-1)}(e):"*"+e);var n}class J{constructor(){this._cache=Object.create(null)}parsePath(t){let e=this._cache[t];return e||(e=function(t){const e=[];let n,s,r,a,i,o,l,c=-1,h=A,u=0;const m=[];function _(){const e=t[c+1];if(h===R&&"'"===e||h===H&&'"'===e)return c++,r="\\"+e,m[x](),!0}for(m[W]=function(){void 0!==s&&(e.push(s),s=void 0)},m[x]=function(){void 0===s?s=r:s+=r},m[j]=function(){m[x](),u++},m[N]=function(){if(u>0)u--,h=S,m[x]();else{if(u=0,void 0===s)return!1;if(!1===(s=U(s)))return!1;m[W]()}};null!==h;)if("\\"!==(n=t[++c])||!_()){if(a=B(n),(i=(l=E[h])[a]||l.else||V)===V)return;if(h=i[0],(o=m[i[1]])&&(r=void 0===(r=i[2])?n:r,!1===o()))return;if(h===P)return e}}(t))&&(this._cache[t]=e),e||[]}getPathValue(t,e){if(!s(t))return null;const n=this.parsePath(e);if(0===n.length)return null;{const e=n.length;let s=t,r=0;for(;r<e;){const t=s[n[r]];if(void 0===t)return null;s=t,r++}return s}}}const q=/<\/?[\w\s="/.':;#-\/]+>/,G=/(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g,X=/^@(?:\.([a-z]+))?:/,Z=/[()]/g,K={upper:t=>t.toLocaleUpperCase(),lower:t=>t.toLocaleLowerCase(),capitalize:t=>`${t.charAt(0).toLocaleUpperCase()}${t.substr(1)}`},Q=new class{constructor(){this._caches=Object.create(null)}interpolate(t,e){if(!e)return[t];let n=this._caches[t];return n||(n=function(t){const e=[];let n=0,s="";for(;n<t.length;){let r=t[n++];if("{"===r){s&&e.push({type:"text",value:s}),s="";let a="";for(r=t[n++];void 0!==r&&"}"!==r;)a+=r,r=t[n++];const i="}"===r,o=I.test(a)?"list":i&&O.test(a)?"named":"unknown";e.push({value:a,type:o})}else"%"===r?"{"!==t[n]&&(s+=r):s+=r}return s&&e.push({type:"text",value:s}),e}(t),this._caches[t]=n),function(t,e){const n=[];let r=0;const a=Array.isArray(e)?"list":s(e)?"named":"unknown";if("unknown"===a)return n;for(;r<t.length;){const s=t[r];switch(s.type){case"text":n.push(s.value);break;case"list":n.push(e[parseInt(s.value,10)]);break;case"named":"named"===a&&n.push(e[s.value])}r++}return n}(n,e)}};class Y{constructor(t={}){!L&&"undefined"!=typeof window&&window.Vue&&D(window.Vue);const e=t.locale||"en-US",n=!1!==t.fallbackLocale&&(t.fallbackLocale||"en-US"),s=t.messages||{},r=t.dateTimeFormats||{},a=t.numberFormats||{};this._vm=null,this._formatter=t.formatter||Q,this._modifiers=t.modifiers||{},this._missing=t.missing||null,this._root=t.root||null,this._sync=void 0===t.sync||!!t.sync,this._fallbackRoot=void 0===t.fallbackRoot||!!t.fallbackRoot,this._formatFallbackMessages=void 0!==t.formatFallbackMessages&&!!t.formatFallbackMessages,this._silentTranslationWarn=void 0!==t.silentTranslationWarn&&t.silentTranslationWarn,this._silentFallbackWarn=void 0!==t.silentFallbackWarn&&!!t.silentFallbackWarn,this._dateTimeFormatters={},this._numberFormatters={},this._path=new J,this._dataListeners=[],this._componentInstanceCreatedListener=t.componentInstanceCreatedListener||null,this._preserveDirectiveContent=void 0!==t.preserveDirectiveContent&&!!t.preserveDirectiveContent,this.pluralizationRules=t.pluralizationRules||{},this._warnHtmlInMessage=t.warnHtmlInMessage||"off",this._postTranslation=t.postTranslation||null,this.getChoiceIndex=((t,e)=>{const n=Object.getPrototypeOf(this);if(n&&n.getChoiceIndex){return n.getChoiceIndex.call(this,t,e)}return this.locale in this.pluralizationRules?this.pluralizationRules[this.locale].apply(this,[t,e]):((t,e)=>(t=Math.abs(t),2===e?t?t>1?1:0:1:t?Math.min(t,2):0))(t,e)}),this._exist=((t,e)=>!(!t||!e)&&(!l(this._path.getPathValue(t,e))||!!t[e])),"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||Object.keys(s).forEach(t=>{this._checkLocaleMessage(t,this._warnHtmlInMessage,s[t])}),this._initVM({locale:e,fallbackLocale:n,messages:s,dateTimeFormats:r,numberFormats:a})}_checkLocaleMessage(t,n,s){const a=(t,n,s,i)=>{if(o(s))Object.keys(s).forEach(e=>{const r=s[e];o(r)?(i.push(e),i.push("."),a(t,n,r,i),i.pop(),i.pop()):(i.push(e),a(t,n,r,i),i.pop())});else if(Array.isArray(s))s.forEach((e,s)=>{o(e)?(i.push(`[${s}]`),i.push("."),a(t,n,e,i),i.pop(),i.pop()):(i.push(`[${s}]`),a(t,n,e,i),i.pop())});else if(r(s)){if(q.test(s)){const r=`Detected HTML in message '${s}' of keypath '${i.join("")}' at '${n}'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp`;"warn"===t?e(r):"error"===t&&function(t,e){"undefined"!=typeof console&&(console.error("[vue-i18n] "+t),e&&console.error(e.stack))}(r)}}};a(n,t,s,[])}_initVM(t){const e=L.config.silent;L.config.silent=!0,this._vm=new L({data:t}),L.config.silent=e}destroyVM(){this._vm.$destroy()}subscribeDataChanging(t){this._dataListeners.push(t)}unsubscribeDataChanging(t){!function(t,e){if(t.length){const n=t.indexOf(e);if(n>-1)t.splice(n,1)}}(this._dataListeners,t)}watchI18nData(){const t=this;return this._vm.$watch("$data",()=>{let e=t._dataListeners.length;for(;e--;)L.nextTick(()=>{t._dataListeners[e]&&t._dataListeners[e].$forceUpdate()})},{deep:!0})}watchLocale(){if(!this._sync||!this._root)return null;const t=this._vm;return this._root.$i18n.vm.$watch("locale",e=>{t.$set(t,"locale",e),t.$forceUpdate()},{immediate:!0})}onComponentInstanceCreated(t){this._componentInstanceCreatedListener&&this._componentInstanceCreatedListener(t,this)}get vm(){return this._vm}get messages(){return h(this._getMessages())}get dateTimeFormats(){return h(this._getDateTimeFormats())}get numberFormats(){return h(this._getNumberFormats())}get availableLocales(){return Object.keys(this.messages).sort()}get locale(){return this._vm.locale}set locale(t){this._vm.$set(this._vm,"locale",t)}get fallbackLocale(){return this._vm.fallbackLocale}set fallbackLocale(t){this._localeChainCache={},this._vm.$set(this._vm,"fallbackLocale",t)}get formatFallbackMessages(){return this._formatFallbackMessages}set formatFallbackMessages(t){this._formatFallbackMessages=t}get missing(){return this._missing}set missing(t){this._missing=t}get formatter(){return this._formatter}set formatter(t){this._formatter=t}get silentTranslationWarn(){return this._silentTranslationWarn}set silentTranslationWarn(t){this._silentTranslationWarn=t}get silentFallbackWarn(){return this._silentFallbackWarn}set silentFallbackWarn(t){this._silentFallbackWarn=t}get preserveDirectiveContent(){return this._preserveDirectiveContent}set preserveDirectiveContent(t){this._preserveDirectiveContent=t}get warnHtmlInMessage(){return this._warnHtmlInMessage}set warnHtmlInMessage(t){const e=this._warnHtmlInMessage;if(this._warnHtmlInMessage=t,e!==t&&("warn"===t||"error"===t)){const t=this._getMessages();Object.keys(t).forEach(e=>{this._checkLocaleMessage(e,this._warnHtmlInMessage,t[e])})}}get postTranslation(){return this._postTranslation}set postTranslation(t){this._postTranslation=t}_getMessages(){return this._vm.messages}_getDateTimeFormats(){return this._vm.dateTimeFormats}_getNumberFormats(){return this._vm.numberFormats}_warnDefault(t,e,n,s,a,i){if(!l(n))return n;if(this._missing){const n=this._missing.apply(null,[t,e,s,a]);if(r(n))return n}if(this._formatFallbackMessages){const t=c(...a);return this._render(e,i,t.params,e)}return e}_isFallbackRoot(t){return!t&&!l(this._root)&&this._fallbackRoot}_isSilentFallbackWarn(t){return this._silentFallbackWarn instanceof RegExp?this._silentFallbackWarn.test(t):this._silentFallbackWarn}_isSilentFallback(t,e){return this._isSilentFallbackWarn(e)&&(this._isFallbackRoot()||t!==this.fallbackLocale)}_isSilentTranslationWarn(t){return this._silentTranslationWarn instanceof RegExp?this._silentTranslationWarn.test(t):this._silentTranslationWarn}_interpolate(t,e,n,s,a,i,c){if(!e)return null;const h=this._path.getPathValue(e,n);if(Array.isArray(h)||o(h))return h;let u;if(l(h)){if(!o(e))return null;if(!r(u=e[n]))return null}else{if(!r(h))return null;u=h}return(u.indexOf("@:")>=0||u.indexOf("@.")>=0)&&(u=this._link(t,e,u,s,"raw",i,c)),this._render(u,a,i,n)}_link(t,e,n,s,r,a,i){let o=n;const l=o.match(G);for(let n in l){if(!l.hasOwnProperty(n))continue;const c=l[n],h=c.match(X),[m,_]=h,f=c.replace(m,"").replace(Z,"");if(u(i,f))return o;i.push(f);let p=this._interpolate(t,e,f,s,"raw"===r?"string":r,"raw"===r?void 0:a,i);if(this._isFallbackRoot(p)){if(!this._root)throw Error("unexpected error");const t=this._root.$i18n;p=t._translate(t._getMessages(),t.locale,t.fallbackLocale,f,s,r,a)}p=this._warnDefault(t,f,p,s,Array.isArray(a)?a:[a],r),this._modifiers.hasOwnProperty(_)?p=this._modifiers[_](p):K.hasOwnProperty(_)&&(p=K[_](p)),i.pop(),o=p?o.replace(c,p):o}return o}_render(t,e,n,s){let a=this._formatter.interpolate(t,n,s);return a||(a=Q.interpolate(t,n,s)),"string"!==e||r(a)?a:a.join("")}_appendItemToChain(t,e,n){let s=!1;return u(t,e)||(s=!0,e&&(s="!"!==e[e.length-1],e=e.replace(/!/g,""),t.push(e),n&&n[e]&&(s=n[e]))),s}_appendLocaleToChain(t,e,n){let s;const r=e.split("-");do{const e=r.join("-");s=this._appendItemToChain(t,e,n),r.splice(-1,1)}while(r.length&&!0===s);return s}_appendBlockToChain(t,e,n){let s=!0;for(let a=0;a<e.length&&"boolean"==typeof s;a++){const i=e[a];r(i)&&(s=this._appendLocaleToChain(t,i,n))}return s}_getLocaleChain(t,e){if(""===t)return[];this._localeChainCache||(this._localeChainCache={});let a=this._localeChainCache[t];if(!a){e||(e=this.fallbackLocale),a=[];let i,o=[t];for(;n(o);)o=this._appendBlockToChain(a,o,e);(o=r(i=n(e)?e:s(e)?e.default?e.default:null:e)?[i]:i)&&this._appendBlockToChain(a,o,null),this._localeChainCache[t]=a}return a}_translate(t,e,n,s,r,a,i){const o=this._getLocaleChain(e,n);let c;for(let e=0;e<o.length;e++){const n=o[e];if(!l(c=this._interpolate(n,t[n],s,r,a,i,[s])))return c}return null}_t(t,e,n,s,...r){if(!t)return"";const a=c(...r),i=a.locale||e;let o=this._translate(n,i,this.fallbackLocale,t,s,"string",a.params);if(this._isFallbackRoot(o)){if(!this._root)throw Error("unexpected error");return this._root.$t(t,...r)}return o=this._warnDefault(i,t,o,s,r,"string"),this._postTranslation&&null!=o&&(o=this._postTranslation(o,t)),o}t(t,...e){return this._t(t,this.locale,this._getMessages(),null,...e)}_i(t,e,n,s,r){const a=this._translate(n,e,this.fallbackLocale,t,s,"raw",r);if(this._isFallbackRoot(a)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.i(t,e,r)}return this._warnDefault(e,t,a,s,[r],"raw")}i(t,e,n){return t?(r(e)||(e=this.locale),this._i(t,e,this._getMessages(),null,n)):""}_tc(t,e,n,s,r,...a){if(!t)return"";void 0===r&&(r=1);const i={count:r,n:r},o=c(...a);return o.params=Object.assign(i,o.params),a=null===o.locale?[o.params]:[o.locale,o.params],this.fetchChoice(this._t(t,e,n,s,...a),r)}fetchChoice(t,e){if(!t&&!r(t))return null;const n=t.split("|");return n[e=this.getChoiceIndex(e,n.length)]?n[e].trim():t}tc(t,e,...n){return this._tc(t,this.locale,this._getMessages(),null,e,...n)}_te(t,e,n,...s){const r=c(...s).locale||e;return this._exist(n[r],t)}te(t,e){return this._te(t,this.locale,this._getMessages(),e)}getLocaleMessage(t){return h(this._vm.messages[t]||{})}setLocaleMessage(t,e){"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||this._checkLocaleMessage(t,this._warnHtmlInMessage,e),this._vm.$set(this._vm.messages,t,e)}mergeLocaleMessage(t,e){"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||this._checkLocaleMessage(t,this._warnHtmlInMessage,e),this._vm.$set(this._vm.messages,t,f({},this._vm.messages[t]||{},e))}getDateTimeFormat(t){return h(this._vm.dateTimeFormats[t]||{})}setDateTimeFormat(t,e){this._vm.$set(this._vm.dateTimeFormats,t,e),this._clearDateTimeFormat(t,e)}mergeDateTimeFormat(t,e){this._vm.$set(this._vm.dateTimeFormats,t,f(this._vm.dateTimeFormats[t]||{},e)),this._clearDateTimeFormat(t,e)}_clearDateTimeFormat(t,e){for(let n in e){const e=`${t}__${n}`;this._dateTimeFormatters.hasOwnProperty(e)&&delete this._dateTimeFormatters[e]}}_localizeDateTime(t,e,n,s,r){let a=e,i=s[a];const o=this._getLocaleChain(e,n);for(let t=0;t<o.length;t++){const e=o[t];if(a=e,!l(i=s[e])&&!l(i[r]))break}if(l(i)||l(i[r]))return null;{const e=i[r],n=`${a}__${r}`;let s=this._dateTimeFormatters[n];return s||(s=this._dateTimeFormatters[n]=new Intl.DateTimeFormat(a,e)),s.format(t)}}_d(t,e,n){if(!n)return new Intl.DateTimeFormat(e).format(t);const s=this._localizeDateTime(t,e,this.fallbackLocale,this._getDateTimeFormats(),n);if(this._isFallbackRoot(s)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.d(t,n,e)}return s||""}d(t,...e){let n=this.locale,a=null;return 1===e.length?r(e[0])?a=e[0]:s(e[0])&&(e[0].locale&&(n=e[0].locale),e[0].key&&(a=e[0].key)):2===e.length&&(r(e[0])&&(a=e[0]),r(e[1])&&(n=e[1])),this._d(t,n,a)}getNumberFormat(t){return h(this._vm.numberFormats[t]||{})}setNumberFormat(t,e){this._vm.$set(this._vm.numberFormats,t,e),this._clearNumberFormat(t,e)}mergeNumberFormat(t,e){this._vm.$set(this._vm.numberFormats,t,f(this._vm.numberFormats[t]||{},e)),this._clearNumberFormat(t,e)}_clearNumberFormat(t,e){for(let n in e){const e=`${t}__${n}`;this._numberFormatters.hasOwnProperty(e)&&delete this._numberFormatters[e]}}_getNumberFormatter(t,e,n,s,r,a){let i=e,o=s[i];const c=this._getLocaleChain(e,n);for(let t=0;t<c.length;t++){const e=c[t];if(i=e,!l(o=s[e])&&!l(o[r]))break}if(l(o)||l(o[r]))return null;{const t=o[r];let e;if(a)e=new Intl.NumberFormat(i,Object.assign({},t,a));else{const n=`${i}__${r}`;(e=this._numberFormatters[n])||(e=this._numberFormatters[n]=new Intl.NumberFormat(i,t))}return e}}_n(t,e,n,s){if(!Y.availabilities.numberFormat)return"";if(!n){return(s?new Intl.NumberFormat(e,s):new Intl.NumberFormat(e)).format(t)}const r=this._getNumberFormatter(t,e,this.fallbackLocale,this._getNumberFormats(),n,s),a=r&&r.format(t);if(this._isFallbackRoot(a)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.n(t,Object.assign({},{key:n,locale:e},s))}return a||""}n(e,...n){let a=this.locale,i=null,o=null;return 1===n.length?r(n[0])?i=n[0]:s(n[0])&&(n[0].locale&&(a=n[0].locale),n[0].key&&(i=n[0].key),o=Object.keys(n[0]).reduce((e,s)=>u(t,s)?Object.assign({},e,{[s]:n[0][s]}):e,null)):2===n.length&&(r(n[0])&&(i=n[0]),r(n[1])&&(a=n[1])),this._n(e,a,i,o)}_ntp(t,e,n,s){if(!Y.availabilities.numberFormat)return[];if(!n){return(s?new Intl.NumberFormat(e,s):new Intl.NumberFormat(e)).formatToParts(t)}const r=this._getNumberFormatter(t,e,this.fallbackLocale,this._getNumberFormats(),n,s),a=r&&r.formatToParts(t);if(this._isFallbackRoot(a)){if(!this._root)throw Error("unexpected error");return this._root.$i18n._ntp(t,e,n,s)}return a||[]}}let tt;Object.defineProperty(Y,"availabilities",{get(){if(!tt){const t="undefined"!=typeof Intl;tt={dateTimeFormat:t&&void 0!==Intl.DateTimeFormat,numberFormat:t&&void 0!==Intl.NumberFormat}}return tt}}),Y.install=D,Y.version="8.20.0";export default Y;
\ No newline at end of file
diff --git a/node_modules/vue-i18n/dist/vue-i18n.esm.js b/node_modules/vue-i18n/dist/vue-i18n.esm.js
new file mode 100644
index 0000000..676850a
--- /dev/null
+++ b/node_modules/vue-i18n/dist/vue-i18n.esm.js
@@ -0,0 +1,2130 @@
+/*!
+ * vue-i18n v8.20.0 
+ * (c) 2020 kazuya kawaguchi
+ * Released under the MIT License.
+ */
+/*  */
+
+/**
+ * constants
+ */
+
+var numberFormatKeys = [
+  'style',
+  'currency',
+  'currencyDisplay',
+  'useGrouping',
+  'minimumIntegerDigits',
+  'minimumFractionDigits',
+  'maximumFractionDigits',
+  'minimumSignificantDigits',
+  'maximumSignificantDigits',
+  'localeMatcher',
+  'formatMatcher',
+  'unit'
+];
+
+/**
+ * utilities
+ */
+
+function warn (msg, err) {
+  if (typeof console !== 'undefined') {
+    console.warn('[vue-i18n] ' + msg);
+    /* istanbul ignore if */
+    if (err) {
+      console.warn(err.stack);
+    }
+  }
+}
+
+function error (msg, err) {
+  if (typeof console !== 'undefined') {
+    console.error('[vue-i18n] ' + msg);
+    /* istanbul ignore if */
+    if (err) {
+      console.error(err.stack);
+    }
+  }
+}
+
+var isArray = Array.isArray;
+
+function isObject (obj) {
+  return obj !== null && typeof obj === 'object'
+}
+
+function isBoolean (val) {
+  return typeof val === 'boolean'
+}
+
+function isString (val) {
+  return typeof val === 'string'
+}
+
+var toString = Object.prototype.toString;
+var OBJECT_STRING = '[object Object]';
+function isPlainObject (obj) {
+  return toString.call(obj) === OBJECT_STRING
+}
+
+function isNull (val) {
+  return val === null || val === undefined
+}
+
+function parseArgs () {
+  var args = [], len = arguments.length;
+  while ( len-- ) args[ len ] = arguments[ len ];
+
+  var locale = null;
+  var params = null;
+  if (args.length === 1) {
+    if (isObject(args[0]) || Array.isArray(args[0])) {
+      params = args[0];
+    } else if (typeof args[0] === 'string') {
+      locale = args[0];
+    }
+  } else if (args.length === 2) {
+    if (typeof args[0] === 'string') {
+      locale = args[0];
+    }
+    /* istanbul ignore if */
+    if (isObject(args[1]) || Array.isArray(args[1])) {
+      params = args[1];
+    }
+  }
+
+  return { locale: locale, params: params }
+}
+
+function looseClone (obj) {
+  return JSON.parse(JSON.stringify(obj))
+}
+
+function remove (arr, item) {
+  if (arr.length) {
+    var index = arr.indexOf(item);
+    if (index > -1) {
+      return arr.splice(index, 1)
+    }
+  }
+}
+
+function includes (arr, item) {
+  return !!~arr.indexOf(item)
+}
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+function hasOwn (obj, key) {
+  return hasOwnProperty.call(obj, key)
+}
+
+function merge (target) {
+  var arguments$1 = arguments;
+
+  var output = Object(target);
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments$1[i];
+    if (source !== undefined && source !== null) {
+      var key = (void 0);
+      for (key in source) {
+        if (hasOwn(source, key)) {
+          if (isObject(source[key])) {
+            output[key] = merge(output[key], source[key]);
+          } else {
+            output[key] = source[key];
+          }
+        }
+      }
+    }
+  }
+  return output
+}
+
+function looseEqual (a, b) {
+  if (a === b) { return true }
+  var isObjectA = isObject(a);
+  var isObjectB = isObject(b);
+  if (isObjectA && isObjectB) {
+    try {
+      var isArrayA = Array.isArray(a);
+      var isArrayB = Array.isArray(b);
+      if (isArrayA && isArrayB) {
+        return a.length === b.length && a.every(function (e, i) {
+          return looseEqual(e, b[i])
+        })
+      } else if (!isArrayA && !isArrayB) {
+        var keysA = Object.keys(a);
+        var keysB = Object.keys(b);
+        return keysA.length === keysB.length && keysA.every(function (key) {
+          return looseEqual(a[key], b[key])
+        })
+      } else {
+        /* istanbul ignore next */
+        return false
+      }
+    } catch (e) {
+      /* istanbul ignore next */
+      return false
+    }
+  } else if (!isObjectA && !isObjectB) {
+    return String(a) === String(b)
+  } else {
+    return false
+  }
+}
+
+/*  */
+
+function extend (Vue) {
+  if (!Vue.prototype.hasOwnProperty('$i18n')) {
+    // $FlowFixMe
+    Object.defineProperty(Vue.prototype, '$i18n', {
+      get: function get () { return this._i18n }
+    });
+  }
+
+  Vue.prototype.$t = function (key) {
+    var values = [], len = arguments.length - 1;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 1 ];
+
+    var i18n = this.$i18n;
+    return i18n._t.apply(i18n, [ key, i18n.locale, i18n._getMessages(), this ].concat( values ))
+  };
+
+  Vue.prototype.$tc = function (key, choice) {
+    var values = [], len = arguments.length - 2;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 2 ];
+
+    var i18n = this.$i18n;
+    return i18n._tc.apply(i18n, [ key, i18n.locale, i18n._getMessages(), this, choice ].concat( values ))
+  };
+
+  Vue.prototype.$te = function (key, locale) {
+    var i18n = this.$i18n;
+    return i18n._te(key, i18n.locale, i18n._getMessages(), locale)
+  };
+
+  Vue.prototype.$d = function (value) {
+    var ref;
+
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+    return (ref = this.$i18n).d.apply(ref, [ value ].concat( args ))
+  };
+
+  Vue.prototype.$n = function (value) {
+    var ref;
+
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+    return (ref = this.$i18n).n.apply(ref, [ value ].concat( args ))
+  };
+}
+
+/*  */
+
+var mixin = {
+  beforeCreate: function beforeCreate () {
+    var options = this.$options;
+    options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            var localeMessages = {};
+            options.__i18n.forEach(function (resource) {
+              localeMessages = merge(localeMessages, JSON.parse(resource));
+            });
+            Object.keys(localeMessages).forEach(function (locale) {
+              options.i18n.mergeLocaleMessage(locale, localeMessages[locale]);
+            });
+          } catch (e) {
+            if (process.env.NODE_ENV !== 'production') {
+              error("Cannot parse locale messages via custom blocks.", e);
+            }
+          }
+        }
+        this._i18n = options.i18n;
+        this._i18nWatcher = this._i18n.watchI18nData();
+      } else if (isPlainObject(options.i18n)) {
+        var rootI18n = this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n
+          ? this.$root.$i18n
+          : null;
+        // component local i18n
+        if (rootI18n) {
+          options.i18n.root = this.$root;
+          options.i18n.formatter = rootI18n.formatter;
+          options.i18n.fallbackLocale = rootI18n.fallbackLocale;
+          options.i18n.formatFallbackMessages = rootI18n.formatFallbackMessages;
+          options.i18n.silentTranslationWarn = rootI18n.silentTranslationWarn;
+          options.i18n.silentFallbackWarn = rootI18n.silentFallbackWarn;
+          options.i18n.pluralizationRules = rootI18n.pluralizationRules;
+          options.i18n.preserveDirectiveContent = rootI18n.preserveDirectiveContent;
+        }
+
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            var localeMessages$1 = {};
+            options.__i18n.forEach(function (resource) {
+              localeMessages$1 = merge(localeMessages$1, JSON.parse(resource));
+            });
+            options.i18n.messages = localeMessages$1;
+          } catch (e) {
+            if (process.env.NODE_ENV !== 'production') {
+              warn("Cannot parse locale messages via custom blocks.", e);
+            }
+          }
+        }
+
+        var ref = options.i18n;
+        var sharedMessages = ref.sharedMessages;
+        if (sharedMessages && isPlainObject(sharedMessages)) {
+          options.i18n.messages = merge(options.i18n.messages, sharedMessages);
+        }
+
+        this._i18n = new VueI18n(options.i18n);
+        this._i18nWatcher = this._i18n.watchI18nData();
+
+        if (options.i18n.sync === undefined || !!options.i18n.sync) {
+          this._localeWatcher = this.$i18n.watchLocale();
+        }
+
+        if (rootI18n) {
+          rootI18n.onComponentInstanceCreated(this._i18n);
+        }
+      } else {
+        if (process.env.NODE_ENV !== 'production') {
+          warn("Cannot be interpreted 'i18n' option.");
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      // root i18n
+      this._i18n = this.$root.$i18n;
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      // parent i18n
+      this._i18n = options.parent.$i18n;
+    }
+  },
+
+  beforeMount: function beforeMount () {
+    var options = this.$options;
+    options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      } else if (isPlainObject(options.i18n)) {
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      } else {
+        if (process.env.NODE_ENV !== 'production') {
+          warn("Cannot be interpreted 'i18n' option.");
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this);
+      this._subscribing = true;
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this);
+      this._subscribing = true;
+    }
+  },
+
+  beforeDestroy: function beforeDestroy () {
+    if (!this._i18n) { return }
+
+    var self = this;
+    this.$nextTick(function () {
+      if (self._subscribing) {
+        self._i18n.unsubscribeDataChanging(self);
+        delete self._subscribing;
+      }
+
+      if (self._i18nWatcher) {
+        self._i18nWatcher();
+        self._i18n.destroyVM();
+        delete self._i18nWatcher;
+      }
+
+      if (self._localeWatcher) {
+        self._localeWatcher();
+        delete self._localeWatcher;
+      }
+    });
+  }
+};
+
+/*  */
+
+var interpolationComponent = {
+  name: 'i18n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    path: {
+      type: String,
+      required: true
+    },
+    locale: {
+      type: String
+    },
+    places: {
+      type: [Array, Object]
+    }
+  },
+  render: function render (h, ref) {
+    var data = ref.data;
+    var parent = ref.parent;
+    var props = ref.props;
+    var slots = ref.slots;
+
+    var $i18n = parent.$i18n;
+    if (!$i18n) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot find VueI18n instance!');
+      }
+      return
+    }
+
+    var path = props.path;
+    var locale = props.locale;
+    var places = props.places;
+    var params = slots();
+    var children = $i18n.i(
+      path,
+      locale,
+      onlyHasDefaultPlace(params) || places
+        ? useLegacyPlaces(params.default, places)
+        : params
+    );
+
+    var tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+    return tag ? h(tag, data, children) : children
+  }
+};
+
+function onlyHasDefaultPlace (params) {
+  var prop;
+  for (prop in params) {
+    if (prop !== 'default') { return false }
+  }
+  return Boolean(prop)
+}
+
+function useLegacyPlaces (children, places) {
+  var params = places ? createParamsFromPlaces(places) : {};
+
+  if (!children) { return params }
+
+  // Filter empty text nodes
+  children = children.filter(function (child) {
+    return child.tag || child.text.trim() !== ''
+  });
+
+  var everyPlace = children.every(vnodeHasPlaceAttribute);
+  if (process.env.NODE_ENV !== 'production' && everyPlace) {
+    warn('`place` attribute is deprecated in next major version. Please switch to Vue slots.');
+  }
+
+  return children.reduce(
+    everyPlace ? assignChildPlace : assignChildIndex,
+    params
+  )
+}
+
+function createParamsFromPlaces (places) {
+  if (process.env.NODE_ENV !== 'production') {
+    warn('`places` prop is deprecated in next major version. Please switch to Vue slots.');
+  }
+
+  return Array.isArray(places)
+    ? places.reduce(assignChildIndex, {})
+    : Object.assign({}, places)
+}
+
+function assignChildPlace (params, child) {
+  if (child.data && child.data.attrs && child.data.attrs.place) {
+    params[child.data.attrs.place] = child;
+  }
+  return params
+}
+
+function assignChildIndex (params, child, index) {
+  params[index] = child;
+  return params
+}
+
+function vnodeHasPlaceAttribute (vnode) {
+  return Boolean(vnode.data && vnode.data.attrs && vnode.data.attrs.place)
+}
+
+/*  */
+
+var numberComponent = {
+  name: 'i18n-n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    value: {
+      type: Number,
+      required: true
+    },
+    format: {
+      type: [String, Object]
+    },
+    locale: {
+      type: String
+    }
+  },
+  render: function render (h, ref) {
+    var props = ref.props;
+    var parent = ref.parent;
+    var data = ref.data;
+
+    var i18n = parent.$i18n;
+
+    if (!i18n) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot find VueI18n instance!');
+      }
+      return null
+    }
+
+    var key = null;
+    var options = null;
+
+    if (isString(props.format)) {
+      key = props.format;
+    } else if (isObject(props.format)) {
+      if (props.format.key) {
+        key = props.format.key;
+      }
+
+      // Filter out number format options only
+      options = Object.keys(props.format).reduce(function (acc, prop) {
+        var obj;
+
+        if (includes(numberFormatKeys, prop)) {
+          return Object.assign({}, acc, ( obj = {}, obj[prop] = props.format[prop], obj ))
+        }
+        return acc
+      }, null);
+    }
+
+    var locale = props.locale || i18n.locale;
+    var parts = i18n._ntp(props.value, locale, key, options);
+
+    var values = parts.map(function (part, index) {
+      var obj;
+
+      var slot = data.scopedSlots && data.scopedSlots[part.type];
+      return slot ? slot(( obj = {}, obj[part.type] = part.value, obj.index = index, obj.parts = parts, obj )) : part.value
+    });
+
+    var tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+    return tag
+      ? h(tag, {
+        attrs: data.attrs,
+        'class': data['class'],
+        staticClass: data.staticClass
+      }, values)
+      : values
+  }
+};
+
+/*  */
+
+function bind (el, binding, vnode) {
+  if (!assert(el, vnode)) { return }
+
+  t(el, binding, vnode);
+}
+
+function update (el, binding, vnode, oldVNode) {
+  if (!assert(el, vnode)) { return }
+
+  var i18n = vnode.context.$i18n;
+  if (localeEqual(el, vnode) &&
+    (looseEqual(binding.value, binding.oldValue) &&
+     looseEqual(el._localeMessage, i18n.getLocaleMessage(i18n.locale)))) { return }
+
+  t(el, binding, vnode);
+}
+
+function unbind (el, binding, vnode, oldVNode) {
+  var vm = vnode.context;
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context');
+    return
+  }
+
+  var i18n = vnode.context.$i18n || {};
+  if (!binding.modifiers.preserve && !i18n.preserveDirectiveContent) {
+    el.textContent = '';
+  }
+  el._vt = undefined;
+  delete el['_vt'];
+  el._locale = undefined;
+  delete el['_locale'];
+  el._localeMessage = undefined;
+  delete el['_localeMessage'];
+}
+
+function assert (el, vnode) {
+  var vm = vnode.context;
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context');
+    return false
+  }
+
+  if (!vm.$i18n) {
+    warn('VueI18n instance does not exists in Vue instance');
+    return false
+  }
+
+  return true
+}
+
+function localeEqual (el, vnode) {
+  var vm = vnode.context;
+  return el._locale === vm.$i18n.locale
+}
+
+function t (el, binding, vnode) {
+  var ref$1, ref$2;
+
+  var value = binding.value;
+
+  var ref = parseValue(value);
+  var path = ref.path;
+  var locale = ref.locale;
+  var args = ref.args;
+  var choice = ref.choice;
+  if (!path && !locale && !args) {
+    warn('value type not supported');
+    return
+  }
+
+  if (!path) {
+    warn('`path` is required in v-t directive');
+    return
+  }
+
+  var vm = vnode.context;
+  if (choice != null) {
+    el._vt = el.textContent = (ref$1 = vm.$i18n).tc.apply(ref$1, [ path, choice ].concat( makeParams(locale, args) ));
+  } else {
+    el._vt = el.textContent = (ref$2 = vm.$i18n).t.apply(ref$2, [ path ].concat( makeParams(locale, args) ));
+  }
+  el._locale = vm.$i18n.locale;
+  el._localeMessage = vm.$i18n.getLocaleMessage(vm.$i18n.locale);
+}
+
+function parseValue (value) {
+  var path;
+  var locale;
+  var args;
+  var choice;
+
+  if (isString(value)) {
+    path = value;
+  } else if (isPlainObject(value)) {
+    path = value.path;
+    locale = value.locale;
+    args = value.args;
+    choice = value.choice;
+  }
+
+  return { path: path, locale: locale, args: args, choice: choice }
+}
+
+function makeParams (locale, args) {
+  var params = [];
+
+  locale && params.push(locale);
+  if (args && (Array.isArray(args) || isPlainObject(args))) {
+    params.push(args);
+  }
+
+  return params
+}
+
+var Vue;
+
+function install (_Vue) {
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && install.installed && _Vue === Vue) {
+    warn('already installed.');
+    return
+  }
+  install.installed = true;
+
+  Vue = _Vue;
+
+  var version = (Vue.version && Number(Vue.version.split('.')[0])) || -1;
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && version < 2) {
+    warn(("vue-i18n (" + (install.version) + ") need to use Vue 2.0 or later (Vue: " + (Vue.version) + ")."));
+    return
+  }
+
+  extend(Vue);
+  Vue.mixin(mixin);
+  Vue.directive('t', { bind: bind, update: update, unbind: unbind });
+  Vue.component(interpolationComponent.name, interpolationComponent);
+  Vue.component(numberComponent.name, numberComponent);
+
+  // use simple mergeStrategies to prevent i18n instance lose '__proto__'
+  var strats = Vue.config.optionMergeStrategies;
+  strats.i18n = function (parentVal, childVal) {
+    return childVal === undefined
+      ? parentVal
+      : childVal
+  };
+}
+
+/*  */
+
+var BaseFormatter = function BaseFormatter () {
+  this._caches = Object.create(null);
+};
+
+BaseFormatter.prototype.interpolate = function interpolate (message, values) {
+  if (!values) {
+    return [message]
+  }
+  var tokens = this._caches[message];
+  if (!tokens) {
+    tokens = parse(message);
+    this._caches[message] = tokens;
+  }
+  return compile(tokens, values)
+};
+
+
+
+var RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
+var RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
+
+function parse (format) {
+  var tokens = [];
+  var position = 0;
+
+  var text = '';
+  while (position < format.length) {
+    var char = format[position++];
+    if (char === '{') {
+      if (text) {
+        tokens.push({ type: 'text', value: text });
+      }
+
+      text = '';
+      var sub = '';
+      char = format[position++];
+      while (char !== undefined && char !== '}') {
+        sub += char;
+        char = format[position++];
+      }
+      var isClosed = char === '}';
+
+      var type = RE_TOKEN_LIST_VALUE.test(sub)
+        ? 'list'
+        : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
+          ? 'named'
+          : 'unknown';
+      tokens.push({ value: sub, type: type });
+    } else if (char === '%') {
+      // when found rails i18n syntax, skip text capture
+      if (format[(position)] !== '{') {
+        text += char;
+      }
+    } else {
+      text += char;
+    }
+  }
+
+  text && tokens.push({ type: 'text', value: text });
+
+  return tokens
+}
+
+function compile (tokens, values) {
+  var compiled = [];
+  var index = 0;
+
+  var mode = Array.isArray(values)
+    ? 'list'
+    : isObject(values)
+      ? 'named'
+      : 'unknown';
+  if (mode === 'unknown') { return compiled }
+
+  while (index < tokens.length) {
+    var token = tokens[index];
+    switch (token.type) {
+      case 'text':
+        compiled.push(token.value);
+        break
+      case 'list':
+        compiled.push(values[parseInt(token.value, 10)]);
+        break
+      case 'named':
+        if (mode === 'named') {
+          compiled.push((values)[token.value]);
+        } else {
+          if (process.env.NODE_ENV !== 'production') {
+            warn(("Type of token '" + (token.type) + "' and format of value '" + mode + "' don't match!"));
+          }
+        }
+        break
+      case 'unknown':
+        if (process.env.NODE_ENV !== 'production') {
+          warn("Detect 'unknown' type of token!");
+        }
+        break
+    }
+    index++;
+  }
+
+  return compiled
+}
+
+/*  */
+
+/**
+ *  Path parser
+ *  - Inspired:
+ *    Vue.js Path parser
+ */
+
+// actions
+var APPEND = 0;
+var PUSH = 1;
+var INC_SUB_PATH_DEPTH = 2;
+var PUSH_SUB_PATH = 3;
+
+// states
+var BEFORE_PATH = 0;
+var IN_PATH = 1;
+var BEFORE_IDENT = 2;
+var IN_IDENT = 3;
+var IN_SUB_PATH = 4;
+var IN_SINGLE_QUOTE = 5;
+var IN_DOUBLE_QUOTE = 6;
+var AFTER_PATH = 7;
+var ERROR = 8;
+
+var pathStateMachine = [];
+
+pathStateMachine[BEFORE_PATH] = {
+  'ws': [BEFORE_PATH],
+  'ident': [IN_IDENT, APPEND],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+};
+
+pathStateMachine[IN_PATH] = {
+  'ws': [IN_PATH],
+  '.': [BEFORE_IDENT],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+};
+
+pathStateMachine[BEFORE_IDENT] = {
+  'ws': [BEFORE_IDENT],
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND]
+};
+
+pathStateMachine[IN_IDENT] = {
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND],
+  'ws': [IN_PATH, PUSH],
+  '.': [BEFORE_IDENT, PUSH],
+  '[': [IN_SUB_PATH, PUSH],
+  'eof': [AFTER_PATH, PUSH]
+};
+
+pathStateMachine[IN_SUB_PATH] = {
+  "'": [IN_SINGLE_QUOTE, APPEND],
+  '"': [IN_DOUBLE_QUOTE, APPEND],
+  '[': [IN_SUB_PATH, INC_SUB_PATH_DEPTH],
+  ']': [IN_PATH, PUSH_SUB_PATH],
+  'eof': ERROR,
+  'else': [IN_SUB_PATH, APPEND]
+};
+
+pathStateMachine[IN_SINGLE_QUOTE] = {
+  "'": [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_SINGLE_QUOTE, APPEND]
+};
+
+pathStateMachine[IN_DOUBLE_QUOTE] = {
+  '"': [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_DOUBLE_QUOTE, APPEND]
+};
+
+/**
+ * Check if an expression is a literal value.
+ */
+
+var literalValueRE = /^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/;
+function isLiteral (exp) {
+  return literalValueRE.test(exp)
+}
+
+/**
+ * Strip quotes from a string
+ */
+
+function stripQuotes (str) {
+  var a = str.charCodeAt(0);
+  var b = str.charCodeAt(str.length - 1);
+  return a === b && (a === 0x22 || a === 0x27)
+    ? str.slice(1, -1)
+    : str
+}
+
+/**
+ * Determine the type of a character in a keypath.
+ */
+
+function getPathCharType (ch) {
+  if (ch === undefined || ch === null) { return 'eof' }
+
+  var code = ch.charCodeAt(0);
+
+  switch (code) {
+    case 0x5B: // [
+    case 0x5D: // ]
+    case 0x2E: // .
+    case 0x22: // "
+    case 0x27: // '
+      return ch
+
+    case 0x5F: // _
+    case 0x24: // $
+    case 0x2D: // -
+      return 'ident'
+
+    case 0x09: // Tab
+    case 0x0A: // Newline
+    case 0x0D: // Return
+    case 0xA0:  // No-break space
+    case 0xFEFF:  // Byte Order Mark
+    case 0x2028:  // Line Separator
+    case 0x2029:  // Paragraph Separator
+      return 'ws'
+  }
+
+  return 'ident'
+}
+
+/**
+ * Format a subPath, return its plain form if it is
+ * a literal string or number. Otherwise prepend the
+ * dynamic indicator (*).
+ */
+
+function formatSubPath (path) {
+  var trimmed = path.trim();
+  // invalid leading 0
+  if (path.charAt(0) === '0' && isNaN(path)) { return false }
+
+  return isLiteral(trimmed) ? stripQuotes(trimmed) : '*' + trimmed
+}
+
+/**
+ * Parse a string path into an array of segments
+ */
+
+function parse$1 (path) {
+  var keys = [];
+  var index = -1;
+  var mode = BEFORE_PATH;
+  var subPathDepth = 0;
+  var c;
+  var key;
+  var newChar;
+  var type;
+  var transition;
+  var action;
+  var typeMap;
+  var actions = [];
+
+  actions[PUSH] = function () {
+    if (key !== undefined) {
+      keys.push(key);
+      key = undefined;
+    }
+  };
+
+  actions[APPEND] = function () {
+    if (key === undefined) {
+      key = newChar;
+    } else {
+      key += newChar;
+    }
+  };
+
+  actions[INC_SUB_PATH_DEPTH] = function () {
+    actions[APPEND]();
+    subPathDepth++;
+  };
+
+  actions[PUSH_SUB_PATH] = function () {
+    if (subPathDepth > 0) {
+      subPathDepth--;
+      mode = IN_SUB_PATH;
+      actions[APPEND]();
+    } else {
+      subPathDepth = 0;
+      if (key === undefined) { return false }
+      key = formatSubPath(key);
+      if (key === false) {
+        return false
+      } else {
+        actions[PUSH]();
+      }
+    }
+  };
+
+  function maybeUnescapeQuote () {
+    var nextChar = path[index + 1];
+    if ((mode === IN_SINGLE_QUOTE && nextChar === "'") ||
+      (mode === IN_DOUBLE_QUOTE && nextChar === '"')) {
+      index++;
+      newChar = '\\' + nextChar;
+      actions[APPEND]();
+      return true
+    }
+  }
+
+  while (mode !== null) {
+    index++;
+    c = path[index];
+
+    if (c === '\\' && maybeUnescapeQuote()) {
+      continue
+    }
+
+    type = getPathCharType(c);
+    typeMap = pathStateMachine[mode];
+    transition = typeMap[type] || typeMap['else'] || ERROR;
+
+    if (transition === ERROR) {
+      return // parse error
+    }
+
+    mode = transition[0];
+    action = actions[transition[1]];
+    if (action) {
+      newChar = transition[2];
+      newChar = newChar === undefined
+        ? c
+        : newChar;
+      if (action() === false) {
+        return
+      }
+    }
+
+    if (mode === AFTER_PATH) {
+      return keys
+    }
+  }
+}
+
+
+
+
+
+var I18nPath = function I18nPath () {
+  this._cache = Object.create(null);
+};
+
+/**
+ * External parse that check for a cache hit first
+ */
+I18nPath.prototype.parsePath = function parsePath (path) {
+  var hit = this._cache[path];
+  if (!hit) {
+    hit = parse$1(path);
+    if (hit) {
+      this._cache[path] = hit;
+    }
+  }
+  return hit || []
+};
+
+/**
+ * Get path value from path string
+ */
+I18nPath.prototype.getPathValue = function getPathValue (obj, path) {
+  if (!isObject(obj)) { return null }
+
+  var paths = this.parsePath(path);
+  if (paths.length === 0) {
+    return null
+  } else {
+    var length = paths.length;
+    var last = obj;
+    var i = 0;
+    while (i < length) {
+      var value = last[paths[i]];
+      if (value === undefined) {
+        return null
+      }
+      last = value;
+      i++;
+    }
+
+    return last
+  }
+};
+
+/*  */
+
+
+
+var htmlTagMatcher = /<\/?[\w\s="/.':;#-\/]+>/;
+var linkKeyMatcher = /(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g;
+var linkKeyPrefixMatcher = /^@(?:\.([a-z]+))?:/;
+var bracketsMatcher = /[()]/g;
+var defaultModifiers = {
+  'upper': function (str) { return str.toLocaleUpperCase(); },
+  'lower': function (str) { return str.toLocaleLowerCase(); },
+  'capitalize': function (str) { return ("" + (str.charAt(0).toLocaleUpperCase()) + (str.substr(1))); }
+};
+
+var defaultFormatter = new BaseFormatter();
+
+var VueI18n = function VueI18n (options) {
+  var this$1 = this;
+  if ( options === void 0 ) options = {};
+
+  // Auto install if it is not done yet and `window` has `Vue`.
+  // To allow users to avoid auto-installation in some cases,
+  // this code should be placed here. See #290
+  /* istanbul ignore if */
+  if (!Vue && typeof window !== 'undefined' && window.Vue) {
+    install(window.Vue);
+  }
+
+  var locale = options.locale || 'en-US';
+  var fallbackLocale = options.fallbackLocale === false
+    ? false
+    : options.fallbackLocale || 'en-US';
+  var messages = options.messages || {};
+  var dateTimeFormats = options.dateTimeFormats || {};
+  var numberFormats = options.numberFormats || {};
+
+  this._vm = null;
+  this._formatter = options.formatter || defaultFormatter;
+  this._modifiers = options.modifiers || {};
+  this._missing = options.missing || null;
+  this._root = options.root || null;
+  this._sync = options.sync === undefined ? true : !!options.sync;
+  this._fallbackRoot = options.fallbackRoot === undefined
+    ? true
+    : !!options.fallbackRoot;
+  this._formatFallbackMessages = options.formatFallbackMessages === undefined
+    ? false
+    : !!options.formatFallbackMessages;
+  this._silentTranslationWarn = options.silentTranslationWarn === undefined
+    ? false
+    : options.silentTranslationWarn;
+  this._silentFallbackWarn = options.silentFallbackWarn === undefined
+    ? false
+    : !!options.silentFallbackWarn;
+  this._dateTimeFormatters = {};
+  this._numberFormatters = {};
+  this._path = new I18nPath();
+  this._dataListeners = [];
+  this._componentInstanceCreatedListener = options.componentInstanceCreatedListener || null;
+  this._preserveDirectiveContent = options.preserveDirectiveContent === undefined
+    ? false
+    : !!options.preserveDirectiveContent;
+  this.pluralizationRules = options.pluralizationRules || {};
+  this._warnHtmlInMessage = options.warnHtmlInMessage || 'off';
+  this._postTranslation = options.postTranslation || null;
+
+  /**
+   * @param choice {number} a choice index given by the input to $tc: `$tc('path.to.rule', choiceIndex)`
+   * @param choicesLength {number} an overall amount of available choices
+   * @returns a final choice index
+  */
+  this.getChoiceIndex = function (choice, choicesLength) {
+    var thisPrototype = Object.getPrototypeOf(this$1);
+    if (thisPrototype && thisPrototype.getChoiceIndex) {
+      var prototypeGetChoiceIndex = (thisPrototype.getChoiceIndex);
+      return (prototypeGetChoiceIndex).call(this$1, choice, choicesLength)
+    }
+
+    // Default (old) getChoiceIndex implementation - english-compatible
+    var defaultImpl = function (_choice, _choicesLength) {
+      _choice = Math.abs(_choice);
+
+      if (_choicesLength === 2) {
+        return _choice
+          ? _choice > 1
+            ? 1
+            : 0
+          : 1
+      }
+
+      return _choice ? Math.min(_choice, 2) : 0
+    };
+
+    if (this$1.locale in this$1.pluralizationRules) {
+      return this$1.pluralizationRules[this$1.locale].apply(this$1, [choice, choicesLength])
+    } else {
+      return defaultImpl(choice, choicesLength)
+    }
+  };
+
+
+  this._exist = function (message, key) {
+    if (!message || !key) { return false }
+    if (!isNull(this$1._path.getPathValue(message, key))) { return true }
+    // fallback for flat key
+    if (message[key]) { return true }
+    return false
+  };
+
+  if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+    Object.keys(messages).forEach(function (locale) {
+      this$1._checkLocaleMessage(locale, this$1._warnHtmlInMessage, messages[locale]);
+    });
+  }
+
+  this._initVM({
+    locale: locale,
+    fallbackLocale: fallbackLocale,
+    messages: messages,
+    dateTimeFormats: dateTimeFormats,
+    numberFormats: numberFormats
+  });
+};
+
+var prototypeAccessors = { vm: { configurable: true },messages: { configurable: true },dateTimeFormats: { configurable: true },numberFormats: { configurable: true },availableLocales: { configurable: true },locale: { configurable: true },fallbackLocale: { configurable: true },formatFallbackMessages: { configurable: true },missing: { configurable: true },formatter: { configurable: true },silentTranslationWarn: { configurable: true },silentFallbackWarn: { configurable: true },preserveDirectiveContent: { configurable: true },warnHtmlInMessage: { configurable: true },postTranslation: { configurable: true } };
+
+VueI18n.prototype._checkLocaleMessage = function _checkLocaleMessage (locale, level, message) {
+  var paths = [];
+
+  var fn = function (level, locale, message, paths) {
+    if (isPlainObject(message)) {
+      Object.keys(message).forEach(function (key) {
+        var val = message[key];
+        if (isPlainObject(val)) {
+          paths.push(key);
+          paths.push('.');
+          fn(level, locale, val, paths);
+          paths.pop();
+          paths.pop();
+        } else {
+          paths.push(key);
+          fn(level, locale, val, paths);
+          paths.pop();
+        }
+      });
+    } else if (Array.isArray(message)) {
+      message.forEach(function (item, index) {
+        if (isPlainObject(item)) {
+          paths.push(("[" + index + "]"));
+          paths.push('.');
+          fn(level, locale, item, paths);
+          paths.pop();
+          paths.pop();
+        } else {
+          paths.push(("[" + index + "]"));
+          fn(level, locale, item, paths);
+          paths.pop();
+        }
+      });
+    } else if (isString(message)) {
+      var ret = htmlTagMatcher.test(message);
+      if (ret) {
+        var msg = "Detected HTML in message '" + message + "' of keypath '" + (paths.join('')) + "' at '" + locale + "'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp";
+        if (level === 'warn') {
+          warn(msg);
+        } else if (level === 'error') {
+          error(msg);
+        }
+      }
+    }
+  };
+
+  fn(level, locale, message, paths);
+};
+
+VueI18n.prototype._initVM = function _initVM (data) {
+  var silent = Vue.config.silent;
+  Vue.config.silent = true;
+  this._vm = new Vue({ data: data });
+  Vue.config.silent = silent;
+};
+
+VueI18n.prototype.destroyVM = function destroyVM () {
+  this._vm.$destroy();
+};
+
+VueI18n.prototype.subscribeDataChanging = function subscribeDataChanging (vm) {
+  this._dataListeners.push(vm);
+};
+
+VueI18n.prototype.unsubscribeDataChanging = function unsubscribeDataChanging (vm) {
+  remove(this._dataListeners, vm);
+};
+
+VueI18n.prototype.watchI18nData = function watchI18nData () {
+  var self = this;
+  return this._vm.$watch('$data', function () {
+    var i = self._dataListeners.length;
+    while (i--) {
+      Vue.nextTick(function () {
+        self._dataListeners[i] && self._dataListeners[i].$forceUpdate();
+      });
+    }
+  }, { deep: true })
+};
+
+VueI18n.prototype.watchLocale = function watchLocale () {
+  /* istanbul ignore if */
+  if (!this._sync || !this._root) { return null }
+  var target = this._vm;
+  return this._root.$i18n.vm.$watch('locale', function (val) {
+    target.$set(target, 'locale', val);
+    target.$forceUpdate();
+  }, { immediate: true })
+};
+
+VueI18n.prototype.onComponentInstanceCreated = function onComponentInstanceCreated (newI18n) {
+  if (this._componentInstanceCreatedListener) {
+    this._componentInstanceCreatedListener(newI18n, this);
+  }
+};
+
+prototypeAccessors.vm.get = function () { return this._vm };
+
+prototypeAccessors.messages.get = function () { return looseClone(this._getMessages()) };
+prototypeAccessors.dateTimeFormats.get = function () { return looseClone(this._getDateTimeFormats()) };
+prototypeAccessors.numberFormats.get = function () { return looseClone(this._getNumberFormats()) };
+prototypeAccessors.availableLocales.get = function () { return Object.keys(this.messages).sort() };
+
+prototypeAccessors.locale.get = function () { return this._vm.locale };
+prototypeAccessors.locale.set = function (locale) {
+  this._vm.$set(this._vm, 'locale', locale);
+};
+
+prototypeAccessors.fallbackLocale.get = function () { return this._vm.fallbackLocale };
+prototypeAccessors.fallbackLocale.set = function (locale) {
+  this._localeChainCache = {};
+  this._vm.$set(this._vm, 'fallbackLocale', locale);
+};
+
+prototypeAccessors.formatFallbackMessages.get = function () { return this._formatFallbackMessages };
+prototypeAccessors.formatFallbackMessages.set = function (fallback) { this._formatFallbackMessages = fallback; };
+
+prototypeAccessors.missing.get = function () { return this._missing };
+prototypeAccessors.missing.set = function (handler) { this._missing = handler; };
+
+prototypeAccessors.formatter.get = function () { return this._formatter };
+prototypeAccessors.formatter.set = function (formatter) { this._formatter = formatter; };
+
+prototypeAccessors.silentTranslationWarn.get = function () { return this._silentTranslationWarn };
+prototypeAccessors.silentTranslationWarn.set = function (silent) { this._silentTranslationWarn = silent; };
+
+prototypeAccessors.silentFallbackWarn.get = function () { return this._silentFallbackWarn };
+prototypeAccessors.silentFallbackWarn.set = function (silent) { this._silentFallbackWarn = silent; };
+
+prototypeAccessors.preserveDirectiveContent.get = function () { return this._preserveDirectiveContent };
+prototypeAccessors.preserveDirectiveContent.set = function (preserve) { this._preserveDirectiveContent = preserve; };
+
+prototypeAccessors.warnHtmlInMessage.get = function () { return this._warnHtmlInMessage };
+prototypeAccessors.warnHtmlInMessage.set = function (level) {
+    var this$1 = this;
+
+  var orgLevel = this._warnHtmlInMessage;
+  this._warnHtmlInMessage = level;
+  if (orgLevel !== level && (level === 'warn' || level === 'error')) {
+    var messages = this._getMessages();
+    Object.keys(messages).forEach(function (locale) {
+      this$1._checkLocaleMessage(locale, this$1._warnHtmlInMessage, messages[locale]);
+    });
+  }
+};
+
+prototypeAccessors.postTranslation.get = function () { return this._postTranslation };
+prototypeAccessors.postTranslation.set = function (handler) { this._postTranslation = handler; };
+
+VueI18n.prototype._getMessages = function _getMessages () { return this._vm.messages };
+VueI18n.prototype._getDateTimeFormats = function _getDateTimeFormats () { return this._vm.dateTimeFormats };
+VueI18n.prototype._getNumberFormats = function _getNumberFormats () { return this._vm.numberFormats };
+
+VueI18n.prototype._warnDefault = function _warnDefault (locale, key, result, vm, values, interpolateMode) {
+  if (!isNull(result)) { return result }
+  if (this._missing) {
+    var missingRet = this._missing.apply(null, [locale, key, vm, values]);
+    if (isString(missingRet)) {
+      return missingRet
+    }
+  } else {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+      warn(
+        "Cannot translate the value of keypath '" + key + "'. " +
+        'Use the value of keypath as default.'
+      );
+    }
+  }
+
+  if (this._formatFallbackMessages) {
+    var parsedArgs = parseArgs.apply(void 0, values);
+    return this._render(key, interpolateMode, parsedArgs.params, key)
+  } else {
+    return key
+  }
+};
+
+VueI18n.prototype._isFallbackRoot = function _isFallbackRoot (val) {
+  return !val && !isNull(this._root) && this._fallbackRoot
+};
+
+VueI18n.prototype._isSilentFallbackWarn = function _isSilentFallbackWarn (key) {
+  return this._silentFallbackWarn instanceof RegExp
+    ? this._silentFallbackWarn.test(key)
+    : this._silentFallbackWarn
+};
+
+VueI18n.prototype._isSilentFallback = function _isSilentFallback (locale, key) {
+  return this._isSilentFallbackWarn(key) && (this._isFallbackRoot() || locale !== this.fallbackLocale)
+};
+
+VueI18n.prototype._isSilentTranslationWarn = function _isSilentTranslationWarn (key) {
+  return this._silentTranslationWarn instanceof RegExp
+    ? this._silentTranslationWarn.test(key)
+    : this._silentTranslationWarn
+};
+
+VueI18n.prototype._interpolate = function _interpolate (
+  locale,
+  message,
+  key,
+  host,
+  interpolateMode,
+  values,
+  visitedLinkStack
+) {
+  if (!message) { return null }
+
+  var pathRet = this._path.getPathValue(message, key);
+  if (Array.isArray(pathRet) || isPlainObject(pathRet)) { return pathRet }
+
+  var ret;
+  if (isNull(pathRet)) {
+    /* istanbul ignore else */
+    if (isPlainObject(message)) {
+      ret = message[key];
+      if (!isString(ret)) {
+        if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+          warn(("Value of key '" + key + "' is not a string!"));
+        }
+        return null
+      }
+    } else {
+      return null
+    }
+  } else {
+    /* istanbul ignore else */
+    if (isString(pathRet)) {
+      ret = pathRet;
+    } else {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+        warn(("Value of key '" + key + "' is not a string!"));
+      }
+      return null
+    }
+  }
+
+  // Check for the existence of links within the translated string
+  if (ret.indexOf('@:') >= 0 || ret.indexOf('@.') >= 0) {
+    ret = this._link(locale, message, ret, host, 'raw', values, visitedLinkStack);
+  }
+
+  return this._render(ret, interpolateMode, values, key)
+};
+
+VueI18n.prototype._link = function _link (
+  locale,
+  message,
+  str,
+  host,
+  interpolateMode,
+  values,
+  visitedLinkStack
+) {
+  var ret = str;
+
+  // Match all the links within the local
+  // We are going to replace each of
+  // them with its translation
+  var matches = ret.match(linkKeyMatcher);
+  for (var idx in matches) {
+    // ie compatible: filter custom array
+    // prototype method
+    if (!matches.hasOwnProperty(idx)) {
+      continue
+    }
+    var link = matches[idx];
+    var linkKeyPrefixMatches = link.match(linkKeyPrefixMatcher);
+    var linkPrefix = linkKeyPrefixMatches[0];
+      var formatterName = linkKeyPrefixMatches[1];
+
+    // Remove the leading @:, @.case: and the brackets
+    var linkPlaceholder = link.replace(linkPrefix, '').replace(bracketsMatcher, '');
+
+    if (includes(visitedLinkStack, linkPlaceholder)) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn(("Circular reference found. \"" + link + "\" is already visited in the chain of " + (visitedLinkStack.reverse().join(' <- '))));
+      }
+      return ret
+    }
+    visitedLinkStack.push(linkPlaceholder);
+
+    // Translate the link
+    var translated = this._interpolate(
+      locale, message, linkPlaceholder, host,
+      interpolateMode === 'raw' ? 'string' : interpolateMode,
+      interpolateMode === 'raw' ? undefined : values,
+      visitedLinkStack
+    );
+
+    if (this._isFallbackRoot(translated)) {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(linkPlaceholder)) {
+        warn(("Fall back to translate the link placeholder '" + linkPlaceholder + "' with root locale."));
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      var root = this._root.$i18n;
+      translated = root._translate(
+        root._getMessages(), root.locale, root.fallbackLocale,
+        linkPlaceholder, host, interpolateMode, values
+      );
+    }
+    translated = this._warnDefault(
+      locale, linkPlaceholder, translated, host,
+      Array.isArray(values) ? values : [values],
+      interpolateMode
+    );
+
+    if (this._modifiers.hasOwnProperty(formatterName)) {
+      translated = this._modifiers[formatterName](translated);
+    } else if (defaultModifiers.hasOwnProperty(formatterName)) {
+      translated = defaultModifiers[formatterName](translated);
+    }
+
+    visitedLinkStack.pop();
+
+    // Replace the link with the translated
+    ret = !translated ? ret : ret.replace(link, translated);
+  }
+
+  return ret
+};
+
+VueI18n.prototype._render = function _render (message, interpolateMode, values, path) {
+  var ret = this._formatter.interpolate(message, values, path);
+
+  // If the custom formatter refuses to work - apply the default one
+  if (!ret) {
+    ret = defaultFormatter.interpolate(message, values, path);
+  }
+
+  // if interpolateMode is **not** 'string' ('row'),
+  // return the compiled data (e.g. ['foo', VNode, 'bar']) with formatter
+  return interpolateMode === 'string' && !isString(ret) ? ret.join('') : ret
+};
+
+VueI18n.prototype._appendItemToChain = function _appendItemToChain (chain, item, blocks) {
+  var follow = false;
+  if (!includes(chain, item)) {
+    follow = true;
+    if (item) {
+      follow = item[item.length - 1] !== '!';
+      item = item.replace(/!/g, '');
+      chain.push(item);
+      if (blocks && blocks[item]) {
+        follow = blocks[item];
+      }
+    }
+  }
+  return follow
+};
+
+VueI18n.prototype._appendLocaleToChain = function _appendLocaleToChain (chain, locale, blocks) {
+  var follow;
+  var tokens = locale.split('-');
+  do {
+    var item = tokens.join('-');
+    follow = this._appendItemToChain(chain, item, blocks);
+    tokens.splice(-1, 1);
+  } while (tokens.length && (follow === true))
+  return follow
+};
+
+VueI18n.prototype._appendBlockToChain = function _appendBlockToChain (chain, block, blocks) {
+  var follow = true;
+  for (var i = 0; (i < block.length) && (isBoolean(follow)); i++) {
+    var locale = block[i];
+    if (isString(locale)) {
+      follow = this._appendLocaleToChain(chain, locale, blocks);
+    }
+  }
+  return follow
+};
+
+VueI18n.prototype._getLocaleChain = function _getLocaleChain (start, fallbackLocale) {
+  if (start === '') { return [] }
+
+  if (!this._localeChainCache) {
+    this._localeChainCache = {};
+  }
+
+  var chain = this._localeChainCache[start];
+  if (!chain) {
+    if (!fallbackLocale) {
+      fallbackLocale = this.fallbackLocale;
+    }
+    chain = [];
+
+    // first block defined by start
+    var block = [start];
+
+    // while any intervening block found
+    while (isArray(block)) {
+      block = this._appendBlockToChain(
+        chain,
+        block,
+        fallbackLocale
+      );
+    }
+
+    // last block defined by default
+    var defaults;
+    if (isArray(fallbackLocale)) {
+      defaults = fallbackLocale;
+    } else if (isObject(fallbackLocale)) {
+      /* $FlowFixMe */
+      if (fallbackLocale['default']) {
+        defaults = fallbackLocale['default'];
+      } else {
+        defaults = null;
+      }
+    } else {
+      defaults = fallbackLocale;
+    }
+
+    // convert defaults to array
+    if (isString(defaults)) {
+      block = [defaults];
+    } else {
+      block = defaults;
+    }
+    if (block) {
+      this._appendBlockToChain(
+        chain,
+        block,
+        null
+      );
+    }
+    this._localeChainCache[start] = chain;
+  }
+  return chain
+};
+
+VueI18n.prototype._translate = function _translate (
+  messages,
+  locale,
+  fallback,
+  key,
+  host,
+  interpolateMode,
+  args
+) {
+  var chain = this._getLocaleChain(locale, fallback);
+  var res;
+  for (var i = 0; i < chain.length; i++) {
+    var step = chain[i];
+    res =
+      this._interpolate(step, messages[step], key, host, interpolateMode, args, [key]);
+    if (!isNull(res)) {
+      if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to translate the keypath '" + key + "' with '" + step + "' locale."));
+      }
+      return res
+    }
+  }
+  return null
+};
+
+VueI18n.prototype._t = function _t (key, _locale, messages, host) {
+    var ref;
+
+    var values = [], len = arguments.length - 4;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 4 ];
+  if (!key) { return '' }
+
+  var parsedArgs = parseArgs.apply(void 0, values);
+  var locale = parsedArgs.locale || _locale;
+
+  var ret = this._translate(
+    messages, locale, this.fallbackLocale, key,
+    host, 'string', parsedArgs.params
+  );
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+      warn(("Fall back to translate the keypath '" + key + "' with root locale."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return (ref = this._root).$t.apply(ref, [ key ].concat( values ))
+  } else {
+    ret = this._warnDefault(locale, key, ret, host, values, 'string');
+    if (this._postTranslation && ret !== null && ret !== undefined) {
+      ret = this._postTranslation(ret, key);
+    }
+    return ret
+  }
+};
+
+VueI18n.prototype.t = function t (key) {
+    var ref;
+
+    var values = [], len = arguments.length - 1;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 1 ];
+  return (ref = this)._t.apply(ref, [ key, this.locale, this._getMessages(), null ].concat( values ))
+};
+
+VueI18n.prototype._i = function _i (key, locale, messages, host, values) {
+  var ret =
+    this._translate(messages, locale, this.fallbackLocale, key, host, 'raw', values);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+      warn(("Fall back to interpolate the keypath '" + key + "' with root locale."));
+    }
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n.i(key, locale, values)
+  } else {
+    return this._warnDefault(locale, key, ret, host, [values], 'raw')
+  }
+};
+
+VueI18n.prototype.i = function i (key, locale, values) {
+  /* istanbul ignore if */
+  if (!key) { return '' }
+
+  if (!isString(locale)) {
+    locale = this.locale;
+  }
+
+  return this._i(key, locale, this._getMessages(), null, values)
+};
+
+VueI18n.prototype._tc = function _tc (
+  key,
+  _locale,
+  messages,
+  host,
+  choice
+) {
+    var ref;
+
+    var values = [], len = arguments.length - 5;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 5 ];
+  if (!key) { return '' }
+  if (choice === undefined) {
+    choice = 1;
+  }
+
+  var predefined = { 'count': choice, 'n': choice };
+  var parsedArgs = parseArgs.apply(void 0, values);
+  parsedArgs.params = Object.assign(predefined, parsedArgs.params);
+  values = parsedArgs.locale === null ? [parsedArgs.params] : [parsedArgs.locale, parsedArgs.params];
+  return this.fetchChoice((ref = this)._t.apply(ref, [ key, _locale, messages, host ].concat( values )), choice)
+};
+
+VueI18n.prototype.fetchChoice = function fetchChoice (message, choice) {
+  /* istanbul ignore if */
+  if (!message && !isString(message)) { return null }
+  var choices = message.split('|');
+
+  choice = this.getChoiceIndex(choice, choices.length);
+  if (!choices[choice]) { return message }
+  return choices[choice].trim()
+};
+
+VueI18n.prototype.tc = function tc (key, choice) {
+    var ref;
+
+    var values = [], len = arguments.length - 2;
+    while ( len-- > 0 ) values[ len ] = arguments[ len + 2 ];
+  return (ref = this)._tc.apply(ref, [ key, this.locale, this._getMessages(), null, choice ].concat( values ))
+};
+
+VueI18n.prototype._te = function _te (key, locale, messages) {
+    var args = [], len = arguments.length - 3;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 3 ];
+
+  var _locale = parseArgs.apply(void 0, args).locale || locale;
+  return this._exist(messages[_locale], key)
+};
+
+VueI18n.prototype.te = function te (key, locale) {
+  return this._te(key, this.locale, this._getMessages(), locale)
+};
+
+VueI18n.prototype.getLocaleMessage = function getLocaleMessage (locale) {
+  return looseClone(this._vm.messages[locale] || {})
+};
+
+VueI18n.prototype.setLocaleMessage = function setLocaleMessage (locale, message) {
+  if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+    this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+  }
+  this._vm.$set(this._vm.messages, locale, message);
+};
+
+VueI18n.prototype.mergeLocaleMessage = function mergeLocaleMessage (locale, message) {
+  if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+    this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+  }
+  this._vm.$set(this._vm.messages, locale, merge({}, this._vm.messages[locale] || {}, message));
+};
+
+VueI18n.prototype.getDateTimeFormat = function getDateTimeFormat (locale) {
+  return looseClone(this._vm.dateTimeFormats[locale] || {})
+};
+
+VueI18n.prototype.setDateTimeFormat = function setDateTimeFormat (locale, format) {
+  this._vm.$set(this._vm.dateTimeFormats, locale, format);
+  this._clearDateTimeFormat(locale, format);
+};
+
+VueI18n.prototype.mergeDateTimeFormat = function mergeDateTimeFormat (locale, format) {
+  this._vm.$set(this._vm.dateTimeFormats, locale, merge(this._vm.dateTimeFormats[locale] || {}, format));
+  this._clearDateTimeFormat(locale, format);
+};
+
+VueI18n.prototype._clearDateTimeFormat = function _clearDateTimeFormat (locale, format) {
+  for (var key in format) {
+    var id = locale + "__" + key;
+
+    if (!this._dateTimeFormatters.hasOwnProperty(id)) {
+      continue
+    }
+
+    delete this._dateTimeFormatters[id];
+  }
+};
+
+VueI18n.prototype._localizeDateTime = function _localizeDateTime (
+  value,
+  locale,
+  fallback,
+  dateTimeFormats,
+  key
+) {
+  var _locale = locale;
+  var formats = dateTimeFormats[_locale];
+
+  var chain = this._getLocaleChain(locale, fallback);
+  for (var i = 0; i < chain.length; i++) {
+    var current = _locale;
+    var step = chain[i];
+    formats = dateTimeFormats[step];
+    _locale = step;
+    // fallback locale
+    if (isNull(formats) || isNull(formats[key])) {
+      if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to '" + step + "' datetime formats from '" + current + "' datetime formats."));
+      }
+    } else {
+      break
+    }
+  }
+
+  if (isNull(formats) || isNull(formats[key])) {
+    return null
+  } else {
+    var format = formats[key];
+    var id = _locale + "__" + key;
+    var formatter = this._dateTimeFormatters[id];
+    if (!formatter) {
+      formatter = this._dateTimeFormatters[id] = new Intl.DateTimeFormat(_locale, format);
+    }
+    return formatter.format(value)
+  }
+};
+
+VueI18n.prototype._d = function _d (value, locale, key) {
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && !VueI18n.availabilities.dateTimeFormat) {
+    warn('Cannot format a Date value due to not supported Intl.DateTimeFormat.');
+    return ''
+  }
+
+  if (!key) {
+    return new Intl.DateTimeFormat(locale).format(value)
+  }
+
+  var ret =
+    this._localizeDateTime(value, locale, this.fallbackLocale, this._getDateTimeFormats(), key);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+      warn(("Fall back to datetime localization of root: key '" + key + "'."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n.d(value, key, locale)
+  } else {
+    return ret || ''
+  }
+};
+
+VueI18n.prototype.d = function d (value) {
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+  var locale = this.locale;
+  var key = null;
+
+  if (args.length === 1) {
+    if (isString(args[0])) {
+      key = args[0];
+    } else if (isObject(args[0])) {
+      if (args[0].locale) {
+        locale = args[0].locale;
+      }
+      if (args[0].key) {
+        key = args[0].key;
+      }
+    }
+  } else if (args.length === 2) {
+    if (isString(args[0])) {
+      key = args[0];
+    }
+    if (isString(args[1])) {
+      locale = args[1];
+    }
+  }
+
+  return this._d(value, locale, key)
+};
+
+VueI18n.prototype.getNumberFormat = function getNumberFormat (locale) {
+  return looseClone(this._vm.numberFormats[locale] || {})
+};
+
+VueI18n.prototype.setNumberFormat = function setNumberFormat (locale, format) {
+  this._vm.$set(this._vm.numberFormats, locale, format);
+  this._clearNumberFormat(locale, format);
+};
+
+VueI18n.prototype.mergeNumberFormat = function mergeNumberFormat (locale, format) {
+  this._vm.$set(this._vm.numberFormats, locale, merge(this._vm.numberFormats[locale] || {}, format));
+  this._clearNumberFormat(locale, format);
+};
+
+VueI18n.prototype._clearNumberFormat = function _clearNumberFormat (locale, format) {
+  for (var key in format) {
+    var id = locale + "__" + key;
+
+    if (!this._numberFormatters.hasOwnProperty(id)) {
+      continue
+    }
+
+    delete this._numberFormatters[id];
+  }
+};
+
+VueI18n.prototype._getNumberFormatter = function _getNumberFormatter (
+  value,
+  locale,
+  fallback,
+  numberFormats,
+  key,
+  options
+) {
+  var _locale = locale;
+  var formats = numberFormats[_locale];
+
+  var chain = this._getLocaleChain(locale, fallback);
+  for (var i = 0; i < chain.length; i++) {
+    var current = _locale;
+    var step = chain[i];
+    formats = numberFormats[step];
+    _locale = step;
+    // fallback locale
+    if (isNull(formats) || isNull(formats[key])) {
+      if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to '" + step + "' number formats from '" + current + "' number formats."));
+      }
+    } else {
+      break
+    }
+  }
+
+  if (isNull(formats) || isNull(formats[key])) {
+    return null
+  } else {
+    var format = formats[key];
+
+    var formatter;
+    if (options) {
+      // If options specified - create one time number formatter
+      formatter = new Intl.NumberFormat(_locale, Object.assign({}, format, options));
+    } else {
+      var id = _locale + "__" + key;
+      formatter = this._numberFormatters[id];
+      if (!formatter) {
+        formatter = this._numberFormatters[id] = new Intl.NumberFormat(_locale, format);
+      }
+    }
+    return formatter
+  }
+};
+
+VueI18n.prototype._n = function _n (value, locale, key, options) {
+  /* istanbul ignore if */
+  if (!VueI18n.availabilities.numberFormat) {
+    if (process.env.NODE_ENV !== 'production') {
+      warn('Cannot format a Number value due to not supported Intl.NumberFormat.');
+    }
+    return ''
+  }
+
+  if (!key) {
+    var nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+    return nf.format(value)
+  }
+
+  var formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+  var ret = formatter && formatter.format(value);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+      warn(("Fall back to number localization of root: key '" + key + "'."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n.n(value, Object.assign({}, { key: key, locale: locale }, options))
+  } else {
+    return ret || ''
+  }
+};
+
+VueI18n.prototype.n = function n (value) {
+    var args = [], len = arguments.length - 1;
+    while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+  var locale = this.locale;
+  var key = null;
+  var options = null;
+
+  if (args.length === 1) {
+    if (isString(args[0])) {
+      key = args[0];
+    } else if (isObject(args[0])) {
+      if (args[0].locale) {
+        locale = args[0].locale;
+      }
+      if (args[0].key) {
+        key = args[0].key;
+      }
+
+      // Filter out number format options only
+      options = Object.keys(args[0]).reduce(function (acc, key) {
+          var obj;
+
+        if (includes(numberFormatKeys, key)) {
+          return Object.assign({}, acc, ( obj = {}, obj[key] = args[0][key], obj ))
+        }
+        return acc
+      }, null);
+    }
+  } else if (args.length === 2) {
+    if (isString(args[0])) {
+      key = args[0];
+    }
+    if (isString(args[1])) {
+      locale = args[1];
+    }
+  }
+
+  return this._n(value, locale, key, options)
+};
+
+VueI18n.prototype._ntp = function _ntp (value, locale, key, options) {
+  /* istanbul ignore if */
+  if (!VueI18n.availabilities.numberFormat) {
+    if (process.env.NODE_ENV !== 'production') {
+      warn('Cannot format to parts a Number value due to not supported Intl.NumberFormat.');
+    }
+    return []
+  }
+
+  if (!key) {
+    var nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+    return nf.formatToParts(value)
+  }
+
+  var formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+  var ret = formatter && formatter.formatToParts(value);
+  if (this._isFallbackRoot(ret)) {
+    if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+      warn(("Fall back to format number to parts of root: key '" + key + "' ."));
+    }
+    /* istanbul ignore if */
+    if (!this._root) { throw Error('unexpected error') }
+    return this._root.$i18n._ntp(value, locale, key, options)
+  } else {
+    return ret || []
+  }
+};
+
+Object.defineProperties( VueI18n.prototype, prototypeAccessors );
+
+var availabilities;
+// $FlowFixMe
+Object.defineProperty(VueI18n, 'availabilities', {
+  get: function get () {
+    if (!availabilities) {
+      var intlDefined = typeof Intl !== 'undefined';
+      availabilities = {
+        dateTimeFormat: intlDefined && typeof Intl.DateTimeFormat !== 'undefined',
+        numberFormat: intlDefined && typeof Intl.NumberFormat !== 'undefined'
+      };
+    }
+
+    return availabilities
+  }
+});
+
+VueI18n.install = install;
+VueI18n.version = '8.20.0';
+
+export default VueI18n;
diff --git a/node_modules/vue-i18n/dist/vue-i18n.js b/node_modules/vue-i18n/dist/vue-i18n.js
new file mode 100644
index 0000000..9509917
--- /dev/null
+++ b/node_modules/vue-i18n/dist/vue-i18n.js
@@ -0,0 +1,2138 @@
+/*!
+ * vue-i18n v8.20.0 
+ * (c) 2020 kazuya kawaguchi
+ * Released under the MIT License.
+ */
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global.VueI18n = factory());
+}(this, (function () { 'use strict';
+
+  /*  */
+
+  /**
+   * constants
+   */
+
+  var numberFormatKeys = [
+    'style',
+    'currency',
+    'currencyDisplay',
+    'useGrouping',
+    'minimumIntegerDigits',
+    'minimumFractionDigits',
+    'maximumFractionDigits',
+    'minimumSignificantDigits',
+    'maximumSignificantDigits',
+    'localeMatcher',
+    'formatMatcher',
+    'unit'
+  ];
+
+  /**
+   * utilities
+   */
+
+  function warn (msg, err) {
+    if (typeof console !== 'undefined') {
+      console.warn('[vue-i18n] ' + msg);
+      /* istanbul ignore if */
+      if (err) {
+        console.warn(err.stack);
+      }
+    }
+  }
+
+  function error (msg, err) {
+    if (typeof console !== 'undefined') {
+      console.error('[vue-i18n] ' + msg);
+      /* istanbul ignore if */
+      if (err) {
+        console.error(err.stack);
+      }
+    }
+  }
+
+  var isArray = Array.isArray;
+
+  function isObject (obj) {
+    return obj !== null && typeof obj === 'object'
+  }
+
+  function isBoolean (val) {
+    return typeof val === 'boolean'
+  }
+
+  function isString (val) {
+    return typeof val === 'string'
+  }
+
+  var toString = Object.prototype.toString;
+  var OBJECT_STRING = '[object Object]';
+  function isPlainObject (obj) {
+    return toString.call(obj) === OBJECT_STRING
+  }
+
+  function isNull (val) {
+    return val === null || val === undefined
+  }
+
+  function parseArgs () {
+    var args = [], len = arguments.length;
+    while ( len-- ) args[ len ] = arguments[ len ];
+
+    var locale = null;
+    var params = null;
+    if (args.length === 1) {
+      if (isObject(args[0]) || Array.isArray(args[0])) {
+        params = args[0];
+      } else if (typeof args[0] === 'string') {
+        locale = args[0];
+      }
+    } else if (args.length === 2) {
+      if (typeof args[0] === 'string') {
+        locale = args[0];
+      }
+      /* istanbul ignore if */
+      if (isObject(args[1]) || Array.isArray(args[1])) {
+        params = args[1];
+      }
+    }
+
+    return { locale: locale, params: params }
+  }
+
+  function looseClone (obj) {
+    return JSON.parse(JSON.stringify(obj))
+  }
+
+  function remove (arr, item) {
+    if (arr.length) {
+      var index = arr.indexOf(item);
+      if (index > -1) {
+        return arr.splice(index, 1)
+      }
+    }
+  }
+
+  function includes (arr, item) {
+    return !!~arr.indexOf(item)
+  }
+
+  var hasOwnProperty = Object.prototype.hasOwnProperty;
+  function hasOwn (obj, key) {
+    return hasOwnProperty.call(obj, key)
+  }
+
+  function merge (target) {
+    var arguments$1 = arguments;
+
+    var output = Object(target);
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments$1[i];
+      if (source !== undefined && source !== null) {
+        var key = (void 0);
+        for (key in source) {
+          if (hasOwn(source, key)) {
+            if (isObject(source[key])) {
+              output[key] = merge(output[key], source[key]);
+            } else {
+              output[key] = source[key];
+            }
+          }
+        }
+      }
+    }
+    return output
+  }
+
+  function looseEqual (a, b) {
+    if (a === b) { return true }
+    var isObjectA = isObject(a);
+    var isObjectB = isObject(b);
+    if (isObjectA && isObjectB) {
+      try {
+        var isArrayA = Array.isArray(a);
+        var isArrayB = Array.isArray(b);
+        if (isArrayA && isArrayB) {
+          return a.length === b.length && a.every(function (e, i) {
+            return looseEqual(e, b[i])
+          })
+        } else if (!isArrayA && !isArrayB) {
+          var keysA = Object.keys(a);
+          var keysB = Object.keys(b);
+          return keysA.length === keysB.length && keysA.every(function (key) {
+            return looseEqual(a[key], b[key])
+          })
+        } else {
+          /* istanbul ignore next */
+          return false
+        }
+      } catch (e) {
+        /* istanbul ignore next */
+        return false
+      }
+    } else if (!isObjectA && !isObjectB) {
+      return String(a) === String(b)
+    } else {
+      return false
+    }
+  }
+
+  /*  */
+
+  function extend (Vue) {
+    if (!Vue.prototype.hasOwnProperty('$i18n')) {
+      // $FlowFixMe
+      Object.defineProperty(Vue.prototype, '$i18n', {
+        get: function get () { return this._i18n }
+      });
+    }
+
+    Vue.prototype.$t = function (key) {
+      var values = [], len = arguments.length - 1;
+      while ( len-- > 0 ) values[ len ] = arguments[ len + 1 ];
+
+      var i18n = this.$i18n;
+      return i18n._t.apply(i18n, [ key, i18n.locale, i18n._getMessages(), this ].concat( values ))
+    };
+
+    Vue.prototype.$tc = function (key, choice) {
+      var values = [], len = arguments.length - 2;
+      while ( len-- > 0 ) values[ len ] = arguments[ len + 2 ];
+
+      var i18n = this.$i18n;
+      return i18n._tc.apply(i18n, [ key, i18n.locale, i18n._getMessages(), this, choice ].concat( values ))
+    };
+
+    Vue.prototype.$te = function (key, locale) {
+      var i18n = this.$i18n;
+      return i18n._te(key, i18n.locale, i18n._getMessages(), locale)
+    };
+
+    Vue.prototype.$d = function (value) {
+      var ref;
+
+      var args = [], len = arguments.length - 1;
+      while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+      return (ref = this.$i18n).d.apply(ref, [ value ].concat( args ))
+    };
+
+    Vue.prototype.$n = function (value) {
+      var ref;
+
+      var args = [], len = arguments.length - 1;
+      while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+      return (ref = this.$i18n).n.apply(ref, [ value ].concat( args ))
+    };
+  }
+
+  /*  */
+
+  var mixin = {
+    beforeCreate: function beforeCreate () {
+      var options = this.$options;
+      options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+      if (options.i18n) {
+        if (options.i18n instanceof VueI18n) {
+          // init locale messages via custom blocks
+          if (options.__i18n) {
+            try {
+              var localeMessages = {};
+              options.__i18n.forEach(function (resource) {
+                localeMessages = merge(localeMessages, JSON.parse(resource));
+              });
+              Object.keys(localeMessages).forEach(function (locale) {
+                options.i18n.mergeLocaleMessage(locale, localeMessages[locale]);
+              });
+            } catch (e) {
+              {
+                error("Cannot parse locale messages via custom blocks.", e);
+              }
+            }
+          }
+          this._i18n = options.i18n;
+          this._i18nWatcher = this._i18n.watchI18nData();
+        } else if (isPlainObject(options.i18n)) {
+          var rootI18n = this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n
+            ? this.$root.$i18n
+            : null;
+          // component local i18n
+          if (rootI18n) {
+            options.i18n.root = this.$root;
+            options.i18n.formatter = rootI18n.formatter;
+            options.i18n.fallbackLocale = rootI18n.fallbackLocale;
+            options.i18n.formatFallbackMessages = rootI18n.formatFallbackMessages;
+            options.i18n.silentTranslationWarn = rootI18n.silentTranslationWarn;
+            options.i18n.silentFallbackWarn = rootI18n.silentFallbackWarn;
+            options.i18n.pluralizationRules = rootI18n.pluralizationRules;
+            options.i18n.preserveDirectiveContent = rootI18n.preserveDirectiveContent;
+          }
+
+          // init locale messages via custom blocks
+          if (options.__i18n) {
+            try {
+              var localeMessages$1 = {};
+              options.__i18n.forEach(function (resource) {
+                localeMessages$1 = merge(localeMessages$1, JSON.parse(resource));
+              });
+              options.i18n.messages = localeMessages$1;
+            } catch (e) {
+              {
+                warn("Cannot parse locale messages via custom blocks.", e);
+              }
+            }
+          }
+
+          var ref = options.i18n;
+          var sharedMessages = ref.sharedMessages;
+          if (sharedMessages && isPlainObject(sharedMessages)) {
+            options.i18n.messages = merge(options.i18n.messages, sharedMessages);
+          }
+
+          this._i18n = new VueI18n(options.i18n);
+          this._i18nWatcher = this._i18n.watchI18nData();
+
+          if (options.i18n.sync === undefined || !!options.i18n.sync) {
+            this._localeWatcher = this.$i18n.watchLocale();
+          }
+
+          if (rootI18n) {
+            rootI18n.onComponentInstanceCreated(this._i18n);
+          }
+        } else {
+          {
+            warn("Cannot be interpreted 'i18n' option.");
+          }
+        }
+      } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+        // root i18n
+        this._i18n = this.$root.$i18n;
+      } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+        // parent i18n
+        this._i18n = options.parent.$i18n;
+      }
+    },
+
+    beforeMount: function beforeMount () {
+      var options = this.$options;
+      options.i18n = options.i18n || (options.__i18n ? {} : null);
+
+      if (options.i18n) {
+        if (options.i18n instanceof VueI18n) {
+          // init locale messages via custom blocks
+          this._i18n.subscribeDataChanging(this);
+          this._subscribing = true;
+        } else if (isPlainObject(options.i18n)) {
+          this._i18n.subscribeDataChanging(this);
+          this._subscribing = true;
+        } else {
+          {
+            warn("Cannot be interpreted 'i18n' option.");
+          }
+        }
+      } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+        this._i18n.subscribeDataChanging(this);
+        this._subscribing = true;
+      }
+    },
+
+    beforeDestroy: function beforeDestroy () {
+      if (!this._i18n) { return }
+
+      var self = this;
+      this.$nextTick(function () {
+        if (self._subscribing) {
+          self._i18n.unsubscribeDataChanging(self);
+          delete self._subscribing;
+        }
+
+        if (self._i18nWatcher) {
+          self._i18nWatcher();
+          self._i18n.destroyVM();
+          delete self._i18nWatcher;
+        }
+
+        if (self._localeWatcher) {
+          self._localeWatcher();
+          delete self._localeWatcher;
+        }
+      });
+    }
+  };
+
+  /*  */
+
+  var interpolationComponent = {
+    name: 'i18n',
+    functional: true,
+    props: {
+      tag: {
+        type: [String, Boolean, Object],
+        default: 'span'
+      },
+      path: {
+        type: String,
+        required: true
+      },
+      locale: {
+        type: String
+      },
+      places: {
+        type: [Array, Object]
+      }
+    },
+    render: function render (h, ref) {
+      var data = ref.data;
+      var parent = ref.parent;
+      var props = ref.props;
+      var slots = ref.slots;
+
+      var $i18n = parent.$i18n;
+      if (!$i18n) {
+        {
+          warn('Cannot find VueI18n instance!');
+        }
+        return
+      }
+
+      var path = props.path;
+      var locale = props.locale;
+      var places = props.places;
+      var params = slots();
+      var children = $i18n.i(
+        path,
+        locale,
+        onlyHasDefaultPlace(params) || places
+          ? useLegacyPlaces(params.default, places)
+          : params
+      );
+
+      var tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+      return tag ? h(tag, data, children) : children
+    }
+  };
+
+  function onlyHasDefaultPlace (params) {
+    var prop;
+    for (prop in params) {
+      if (prop !== 'default') { return false }
+    }
+    return Boolean(prop)
+  }
+
+  function useLegacyPlaces (children, places) {
+    var params = places ? createParamsFromPlaces(places) : {};
+
+    if (!children) { return params }
+
+    // Filter empty text nodes
+    children = children.filter(function (child) {
+      return child.tag || child.text.trim() !== ''
+    });
+
+    var everyPlace = children.every(vnodeHasPlaceAttribute);
+    if (everyPlace) {
+      warn('`place` attribute is deprecated in next major version. Please switch to Vue slots.');
+    }
+
+    return children.reduce(
+      everyPlace ? assignChildPlace : assignChildIndex,
+      params
+    )
+  }
+
+  function createParamsFromPlaces (places) {
+    {
+      warn('`places` prop is deprecated in next major version. Please switch to Vue slots.');
+    }
+
+    return Array.isArray(places)
+      ? places.reduce(assignChildIndex, {})
+      : Object.assign({}, places)
+  }
+
+  function assignChildPlace (params, child) {
+    if (child.data && child.data.attrs && child.data.attrs.place) {
+      params[child.data.attrs.place] = child;
+    }
+    return params
+  }
+
+  function assignChildIndex (params, child, index) {
+    params[index] = child;
+    return params
+  }
+
+  function vnodeHasPlaceAttribute (vnode) {
+    return Boolean(vnode.data && vnode.data.attrs && vnode.data.attrs.place)
+  }
+
+  /*  */
+
+  var numberComponent = {
+    name: 'i18n-n',
+    functional: true,
+    props: {
+      tag: {
+        type: [String, Boolean, Object],
+        default: 'span'
+      },
+      value: {
+        type: Number,
+        required: true
+      },
+      format: {
+        type: [String, Object]
+      },
+      locale: {
+        type: String
+      }
+    },
+    render: function render (h, ref) {
+      var props = ref.props;
+      var parent = ref.parent;
+      var data = ref.data;
+
+      var i18n = parent.$i18n;
+
+      if (!i18n) {
+        {
+          warn('Cannot find VueI18n instance!');
+        }
+        return null
+      }
+
+      var key = null;
+      var options = null;
+
+      if (isString(props.format)) {
+        key = props.format;
+      } else if (isObject(props.format)) {
+        if (props.format.key) {
+          key = props.format.key;
+        }
+
+        // Filter out number format options only
+        options = Object.keys(props.format).reduce(function (acc, prop) {
+          var obj;
+
+          if (includes(numberFormatKeys, prop)) {
+            return Object.assign({}, acc, ( obj = {}, obj[prop] = props.format[prop], obj ))
+          }
+          return acc
+        }, null);
+      }
+
+      var locale = props.locale || i18n.locale;
+      var parts = i18n._ntp(props.value, locale, key, options);
+
+      var values = parts.map(function (part, index) {
+        var obj;
+
+        var slot = data.scopedSlots && data.scopedSlots[part.type];
+        return slot ? slot(( obj = {}, obj[part.type] = part.value, obj.index = index, obj.parts = parts, obj )) : part.value
+      });
+
+      var tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span';
+      return tag
+        ? h(tag, {
+          attrs: data.attrs,
+          'class': data['class'],
+          staticClass: data.staticClass
+        }, values)
+        : values
+    }
+  };
+
+  /*  */
+
+  function bind (el, binding, vnode) {
+    if (!assert(el, vnode)) { return }
+
+    t(el, binding, vnode);
+  }
+
+  function update (el, binding, vnode, oldVNode) {
+    if (!assert(el, vnode)) { return }
+
+    var i18n = vnode.context.$i18n;
+    if (localeEqual(el, vnode) &&
+      (looseEqual(binding.value, binding.oldValue) &&
+       looseEqual(el._localeMessage, i18n.getLocaleMessage(i18n.locale)))) { return }
+
+    t(el, binding, vnode);
+  }
+
+  function unbind (el, binding, vnode, oldVNode) {
+    var vm = vnode.context;
+    if (!vm) {
+      warn('Vue instance does not exists in VNode context');
+      return
+    }
+
+    var i18n = vnode.context.$i18n || {};
+    if (!binding.modifiers.preserve && !i18n.preserveDirectiveContent) {
+      el.textContent = '';
+    }
+    el._vt = undefined;
+    delete el['_vt'];
+    el._locale = undefined;
+    delete el['_locale'];
+    el._localeMessage = undefined;
+    delete el['_localeMessage'];
+  }
+
+  function assert (el, vnode) {
+    var vm = vnode.context;
+    if (!vm) {
+      warn('Vue instance does not exists in VNode context');
+      return false
+    }
+
+    if (!vm.$i18n) {
+      warn('VueI18n instance does not exists in Vue instance');
+      return false
+    }
+
+    return true
+  }
+
+  function localeEqual (el, vnode) {
+    var vm = vnode.context;
+    return el._locale === vm.$i18n.locale
+  }
+
+  function t (el, binding, vnode) {
+    var ref$1, ref$2;
+
+    var value = binding.value;
+
+    var ref = parseValue(value);
+    var path = ref.path;
+    var locale = ref.locale;
+    var args = ref.args;
+    var choice = ref.choice;
+    if (!path && !locale && !args) {
+      warn('value type not supported');
+      return
+    }
+
+    if (!path) {
+      warn('`path` is required in v-t directive');
+      return
+    }
+
+    var vm = vnode.context;
+    if (choice != null) {
+      el._vt = el.textContent = (ref$1 = vm.$i18n).tc.apply(ref$1, [ path, choice ].concat( makeParams(locale, args) ));
+    } else {
+      el._vt = el.textContent = (ref$2 = vm.$i18n).t.apply(ref$2, [ path ].concat( makeParams(locale, args) ));
+    }
+    el._locale = vm.$i18n.locale;
+    el._localeMessage = vm.$i18n.getLocaleMessage(vm.$i18n.locale);
+  }
+
+  function parseValue (value) {
+    var path;
+    var locale;
+    var args;
+    var choice;
+
+    if (isString(value)) {
+      path = value;
+    } else if (isPlainObject(value)) {
+      path = value.path;
+      locale = value.locale;
+      args = value.args;
+      choice = value.choice;
+    }
+
+    return { path: path, locale: locale, args: args, choice: choice }
+  }
+
+  function makeParams (locale, args) {
+    var params = [];
+
+    locale && params.push(locale);
+    if (args && (Array.isArray(args) || isPlainObject(args))) {
+      params.push(args);
+    }
+
+    return params
+  }
+
+  var Vue;
+
+  function install (_Vue) {
+    /* istanbul ignore if */
+    if (install.installed && _Vue === Vue) {
+      warn('already installed.');
+      return
+    }
+    install.installed = true;
+
+    Vue = _Vue;
+
+    var version = (Vue.version && Number(Vue.version.split('.')[0])) || -1;
+    /* istanbul ignore if */
+    if (version < 2) {
+      warn(("vue-i18n (" + (install.version) + ") need to use Vue 2.0 or later (Vue: " + (Vue.version) + ")."));
+      return
+    }
+
+    extend(Vue);
+    Vue.mixin(mixin);
+    Vue.directive('t', { bind: bind, update: update, unbind: unbind });
+    Vue.component(interpolationComponent.name, interpolationComponent);
+    Vue.component(numberComponent.name, numberComponent);
+
+    // use simple mergeStrategies to prevent i18n instance lose '__proto__'
+    var strats = Vue.config.optionMergeStrategies;
+    strats.i18n = function (parentVal, childVal) {
+      return childVal === undefined
+        ? parentVal
+        : childVal
+    };
+  }
+
+  /*  */
+
+  var BaseFormatter = function BaseFormatter () {
+    this._caches = Object.create(null);
+  };
+
+  BaseFormatter.prototype.interpolate = function interpolate (message, values) {
+    if (!values) {
+      return [message]
+    }
+    var tokens = this._caches[message];
+    if (!tokens) {
+      tokens = parse(message);
+      this._caches[message] = tokens;
+    }
+    return compile(tokens, values)
+  };
+
+
+
+  var RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
+  var RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
+
+  function parse (format) {
+    var tokens = [];
+    var position = 0;
+
+    var text = '';
+    while (position < format.length) {
+      var char = format[position++];
+      if (char === '{') {
+        if (text) {
+          tokens.push({ type: 'text', value: text });
+        }
+
+        text = '';
+        var sub = '';
+        char = format[position++];
+        while (char !== undefined && char !== '}') {
+          sub += char;
+          char = format[position++];
+        }
+        var isClosed = char === '}';
+
+        var type = RE_TOKEN_LIST_VALUE.test(sub)
+          ? 'list'
+          : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
+            ? 'named'
+            : 'unknown';
+        tokens.push({ value: sub, type: type });
+      } else if (char === '%') {
+        // when found rails i18n syntax, skip text capture
+        if (format[(position)] !== '{') {
+          text += char;
+        }
+      } else {
+        text += char;
+      }
+    }
+
+    text && tokens.push({ type: 'text', value: text });
+
+    return tokens
+  }
+
+  function compile (tokens, values) {
+    var compiled = [];
+    var index = 0;
+
+    var mode = Array.isArray(values)
+      ? 'list'
+      : isObject(values)
+        ? 'named'
+        : 'unknown';
+    if (mode === 'unknown') { return compiled }
+
+    while (index < tokens.length) {
+      var token = tokens[index];
+      switch (token.type) {
+        case 'text':
+          compiled.push(token.value);
+          break
+        case 'list':
+          compiled.push(values[parseInt(token.value, 10)]);
+          break
+        case 'named':
+          if (mode === 'named') {
+            compiled.push((values)[token.value]);
+          } else {
+            {
+              warn(("Type of token '" + (token.type) + "' and format of value '" + mode + "' don't match!"));
+            }
+          }
+          break
+        case 'unknown':
+          {
+            warn("Detect 'unknown' type of token!");
+          }
+          break
+      }
+      index++;
+    }
+
+    return compiled
+  }
+
+  /*  */
+
+  /**
+   *  Path parser
+   *  - Inspired:
+   *    Vue.js Path parser
+   */
+
+  // actions
+  var APPEND = 0;
+  var PUSH = 1;
+  var INC_SUB_PATH_DEPTH = 2;
+  var PUSH_SUB_PATH = 3;
+
+  // states
+  var BEFORE_PATH = 0;
+  var IN_PATH = 1;
+  var BEFORE_IDENT = 2;
+  var IN_IDENT = 3;
+  var IN_SUB_PATH = 4;
+  var IN_SINGLE_QUOTE = 5;
+  var IN_DOUBLE_QUOTE = 6;
+  var AFTER_PATH = 7;
+  var ERROR = 8;
+
+  var pathStateMachine = [];
+
+  pathStateMachine[BEFORE_PATH] = {
+    'ws': [BEFORE_PATH],
+    'ident': [IN_IDENT, APPEND],
+    '[': [IN_SUB_PATH],
+    'eof': [AFTER_PATH]
+  };
+
+  pathStateMachine[IN_PATH] = {
+    'ws': [IN_PATH],
+    '.': [BEFORE_IDENT],
+    '[': [IN_SUB_PATH],
+    'eof': [AFTER_PATH]
+  };
+
+  pathStateMachine[BEFORE_IDENT] = {
+    'ws': [BEFORE_IDENT],
+    'ident': [IN_IDENT, APPEND],
+    '0': [IN_IDENT, APPEND],
+    'number': [IN_IDENT, APPEND]
+  };
+
+  pathStateMachine[IN_IDENT] = {
+    'ident': [IN_IDENT, APPEND],
+    '0': [IN_IDENT, APPEND],
+    'number': [IN_IDENT, APPEND],
+    'ws': [IN_PATH, PUSH],
+    '.': [BEFORE_IDENT, PUSH],
+    '[': [IN_SUB_PATH, PUSH],
+    'eof': [AFTER_PATH, PUSH]
+  };
+
+  pathStateMachine[IN_SUB_PATH] = {
+    "'": [IN_SINGLE_QUOTE, APPEND],
+    '"': [IN_DOUBLE_QUOTE, APPEND],
+    '[': [IN_SUB_PATH, INC_SUB_PATH_DEPTH],
+    ']': [IN_PATH, PUSH_SUB_PATH],
+    'eof': ERROR,
+    'else': [IN_SUB_PATH, APPEND]
+  };
+
+  pathStateMachine[IN_SINGLE_QUOTE] = {
+    "'": [IN_SUB_PATH, APPEND],
+    'eof': ERROR,
+    'else': [IN_SINGLE_QUOTE, APPEND]
+  };
+
+  pathStateMachine[IN_DOUBLE_QUOTE] = {
+    '"': [IN_SUB_PATH, APPEND],
+    'eof': ERROR,
+    'else': [IN_DOUBLE_QUOTE, APPEND]
+  };
+
+  /**
+   * Check if an expression is a literal value.
+   */
+
+  var literalValueRE = /^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/;
+  function isLiteral (exp) {
+    return literalValueRE.test(exp)
+  }
+
+  /**
+   * Strip quotes from a string
+   */
+
+  function stripQuotes (str) {
+    var a = str.charCodeAt(0);
+    var b = str.charCodeAt(str.length - 1);
+    return a === b && (a === 0x22 || a === 0x27)
+      ? str.slice(1, -1)
+      : str
+  }
+
+  /**
+   * Determine the type of a character in a keypath.
+   */
+
+  function getPathCharType (ch) {
+    if (ch === undefined || ch === null) { return 'eof' }
+
+    var code = ch.charCodeAt(0);
+
+    switch (code) {
+      case 0x5B: // [
+      case 0x5D: // ]
+      case 0x2E: // .
+      case 0x22: // "
+      case 0x27: // '
+        return ch
+
+      case 0x5F: // _
+      case 0x24: // $
+      case 0x2D: // -
+        return 'ident'
+
+      case 0x09: // Tab
+      case 0x0A: // Newline
+      case 0x0D: // Return
+      case 0xA0:  // No-break space
+      case 0xFEFF:  // Byte Order Mark
+      case 0x2028:  // Line Separator
+      case 0x2029:  // Paragraph Separator
+        return 'ws'
+    }
+
+    return 'ident'
+  }
+
+  /**
+   * Format a subPath, return its plain form if it is
+   * a literal string or number. Otherwise prepend the
+   * dynamic indicator (*).
+   */
+
+  function formatSubPath (path) {
+    var trimmed = path.trim();
+    // invalid leading 0
+    if (path.charAt(0) === '0' && isNaN(path)) { return false }
+
+    return isLiteral(trimmed) ? stripQuotes(trimmed) : '*' + trimmed
+  }
+
+  /**
+   * Parse a string path into an array of segments
+   */
+
+  function parse$1 (path) {
+    var keys = [];
+    var index = -1;
+    var mode = BEFORE_PATH;
+    var subPathDepth = 0;
+    var c;
+    var key;
+    var newChar;
+    var type;
+    var transition;
+    var action;
+    var typeMap;
+    var actions = [];
+
+    actions[PUSH] = function () {
+      if (key !== undefined) {
+        keys.push(key);
+        key = undefined;
+      }
+    };
+
+    actions[APPEND] = function () {
+      if (key === undefined) {
+        key = newChar;
+      } else {
+        key += newChar;
+      }
+    };
+
+    actions[INC_SUB_PATH_DEPTH] = function () {
+      actions[APPEND]();
+      subPathDepth++;
+    };
+
+    actions[PUSH_SUB_PATH] = function () {
+      if (subPathDepth > 0) {
+        subPathDepth--;
+        mode = IN_SUB_PATH;
+        actions[APPEND]();
+      } else {
+        subPathDepth = 0;
+        if (key === undefined) { return false }
+        key = formatSubPath(key);
+        if (key === false) {
+          return false
+        } else {
+          actions[PUSH]();
+        }
+      }
+    };
+
+    function maybeUnescapeQuote () {
+      var nextChar = path[index + 1];
+      if ((mode === IN_SINGLE_QUOTE && nextChar === "'") ||
+        (mode === IN_DOUBLE_QUOTE && nextChar === '"')) {
+        index++;
+        newChar = '\\' + nextChar;
+        actions[APPEND]();
+        return true
+      }
+    }
+
+    while (mode !== null) {
+      index++;
+      c = path[index];
+
+      if (c === '\\' && maybeUnescapeQuote()) {
+        continue
+      }
+
+      type = getPathCharType(c);
+      typeMap = pathStateMachine[mode];
+      transition = typeMap[type] || typeMap['else'] || ERROR;
+
+      if (transition === ERROR) {
+        return // parse error
+      }
+
+      mode = transition[0];
+      action = actions[transition[1]];
+      if (action) {
+        newChar = transition[2];
+        newChar = newChar === undefined
+          ? c
+          : newChar;
+        if (action() === false) {
+          return
+        }
+      }
+
+      if (mode === AFTER_PATH) {
+        return keys
+      }
+    }
+  }
+
+
+
+
+
+  var I18nPath = function I18nPath () {
+    this._cache = Object.create(null);
+  };
+
+  /**
+   * External parse that check for a cache hit first
+   */
+  I18nPath.prototype.parsePath = function parsePath (path) {
+    var hit = this._cache[path];
+    if (!hit) {
+      hit = parse$1(path);
+      if (hit) {
+        this._cache[path] = hit;
+      }
+    }
+    return hit || []
+  };
+
+  /**
+   * Get path value from path string
+   */
+  I18nPath.prototype.getPathValue = function getPathValue (obj, path) {
+    if (!isObject(obj)) { return null }
+
+    var paths = this.parsePath(path);
+    if (paths.length === 0) {
+      return null
+    } else {
+      var length = paths.length;
+      var last = obj;
+      var i = 0;
+      while (i < length) {
+        var value = last[paths[i]];
+        if (value === undefined) {
+          return null
+        }
+        last = value;
+        i++;
+      }
+
+      return last
+    }
+  };
+
+  /*  */
+
+
+
+  var htmlTagMatcher = /<\/?[\w\s="/.':;#-\/]+>/;
+  var linkKeyMatcher = /(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g;
+  var linkKeyPrefixMatcher = /^@(?:\.([a-z]+))?:/;
+  var bracketsMatcher = /[()]/g;
+  var defaultModifiers = {
+    'upper': function (str) { return str.toLocaleUpperCase(); },
+    'lower': function (str) { return str.toLocaleLowerCase(); },
+    'capitalize': function (str) { return ("" + (str.charAt(0).toLocaleUpperCase()) + (str.substr(1))); }
+  };
+
+  var defaultFormatter = new BaseFormatter();
+
+  var VueI18n = function VueI18n (options) {
+    var this$1 = this;
+    if ( options === void 0 ) options = {};
+
+    // Auto install if it is not done yet and `window` has `Vue`.
+    // To allow users to avoid auto-installation in some cases,
+    // this code should be placed here. See #290
+    /* istanbul ignore if */
+    if (!Vue && typeof window !== 'undefined' && window.Vue) {
+      install(window.Vue);
+    }
+
+    var locale = options.locale || 'en-US';
+    var fallbackLocale = options.fallbackLocale === false
+      ? false
+      : options.fallbackLocale || 'en-US';
+    var messages = options.messages || {};
+    var dateTimeFormats = options.dateTimeFormats || {};
+    var numberFormats = options.numberFormats || {};
+
+    this._vm = null;
+    this._formatter = options.formatter || defaultFormatter;
+    this._modifiers = options.modifiers || {};
+    this._missing = options.missing || null;
+    this._root = options.root || null;
+    this._sync = options.sync === undefined ? true : !!options.sync;
+    this._fallbackRoot = options.fallbackRoot === undefined
+      ? true
+      : !!options.fallbackRoot;
+    this._formatFallbackMessages = options.formatFallbackMessages === undefined
+      ? false
+      : !!options.formatFallbackMessages;
+    this._silentTranslationWarn = options.silentTranslationWarn === undefined
+      ? false
+      : options.silentTranslationWarn;
+    this._silentFallbackWarn = options.silentFallbackWarn === undefined
+      ? false
+      : !!options.silentFallbackWarn;
+    this._dateTimeFormatters = {};
+    this._numberFormatters = {};
+    this._path = new I18nPath();
+    this._dataListeners = [];
+    this._componentInstanceCreatedListener = options.componentInstanceCreatedListener || null;
+    this._preserveDirectiveContent = options.preserveDirectiveContent === undefined
+      ? false
+      : !!options.preserveDirectiveContent;
+    this.pluralizationRules = options.pluralizationRules || {};
+    this._warnHtmlInMessage = options.warnHtmlInMessage || 'off';
+    this._postTranslation = options.postTranslation || null;
+
+    /**
+     * @param choice {number} a choice index given by the input to $tc: `$tc('path.to.rule', choiceIndex)`
+     * @param choicesLength {number} an overall amount of available choices
+     * @returns a final choice index
+    */
+    this.getChoiceIndex = function (choice, choicesLength) {
+      var thisPrototype = Object.getPrototypeOf(this$1);
+      if (thisPrototype && thisPrototype.getChoiceIndex) {
+        var prototypeGetChoiceIndex = (thisPrototype.getChoiceIndex);
+        return (prototypeGetChoiceIndex).call(this$1, choice, choicesLength)
+      }
+
+      // Default (old) getChoiceIndex implementation - english-compatible
+      var defaultImpl = function (_choice, _choicesLength) {
+        _choice = Math.abs(_choice);
+
+        if (_choicesLength === 2) {
+          return _choice
+            ? _choice > 1
+              ? 1
+              : 0
+            : 1
+        }
+
+        return _choice ? Math.min(_choice, 2) : 0
+      };
+
+      if (this$1.locale in this$1.pluralizationRules) {
+        return this$1.pluralizationRules[this$1.locale].apply(this$1, [choice, choicesLength])
+      } else {
+        return defaultImpl(choice, choicesLength)
+      }
+    };
+
+
+    this._exist = function (message, key) {
+      if (!message || !key) { return false }
+      if (!isNull(this$1._path.getPathValue(message, key))) { return true }
+      // fallback for flat key
+      if (message[key]) { return true }
+      return false
+    };
+
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      Object.keys(messages).forEach(function (locale) {
+        this$1._checkLocaleMessage(locale, this$1._warnHtmlInMessage, messages[locale]);
+      });
+    }
+
+    this._initVM({
+      locale: locale,
+      fallbackLocale: fallbackLocale,
+      messages: messages,
+      dateTimeFormats: dateTimeFormats,
+      numberFormats: numberFormats
+    });
+  };
+
+  var prototypeAccessors = { vm: { configurable: true },messages: { configurable: true },dateTimeFormats: { configurable: true },numberFormats: { configurable: true },availableLocales: { configurable: true },locale: { configurable: true },fallbackLocale: { configurable: true },formatFallbackMessages: { configurable: true },missing: { configurable: true },formatter: { configurable: true },silentTranslationWarn: { configurable: true },silentFallbackWarn: { configurable: true },preserveDirectiveContent: { configurable: true },warnHtmlInMessage: { configurable: true },postTranslation: { configurable: true } };
+
+  VueI18n.prototype._checkLocaleMessage = function _checkLocaleMessage (locale, level, message) {
+    var paths = [];
+
+    var fn = function (level, locale, message, paths) {
+      if (isPlainObject(message)) {
+        Object.keys(message).forEach(function (key) {
+          var val = message[key];
+          if (isPlainObject(val)) {
+            paths.push(key);
+            paths.push('.');
+            fn(level, locale, val, paths);
+            paths.pop();
+            paths.pop();
+          } else {
+            paths.push(key);
+            fn(level, locale, val, paths);
+            paths.pop();
+          }
+        });
+      } else if (Array.isArray(message)) {
+        message.forEach(function (item, index) {
+          if (isPlainObject(item)) {
+            paths.push(("[" + index + "]"));
+            paths.push('.');
+            fn(level, locale, item, paths);
+            paths.pop();
+            paths.pop();
+          } else {
+            paths.push(("[" + index + "]"));
+            fn(level, locale, item, paths);
+            paths.pop();
+          }
+        });
+      } else if (isString(message)) {
+        var ret = htmlTagMatcher.test(message);
+        if (ret) {
+          var msg = "Detected HTML in message '" + message + "' of keypath '" + (paths.join('')) + "' at '" + locale + "'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp";
+          if (level === 'warn') {
+            warn(msg);
+          } else if (level === 'error') {
+            error(msg);
+          }
+        }
+      }
+    };
+
+    fn(level, locale, message, paths);
+  };
+
+  VueI18n.prototype._initVM = function _initVM (data) {
+    var silent = Vue.config.silent;
+    Vue.config.silent = true;
+    this._vm = new Vue({ data: data });
+    Vue.config.silent = silent;
+  };
+
+  VueI18n.prototype.destroyVM = function destroyVM () {
+    this._vm.$destroy();
+  };
+
+  VueI18n.prototype.subscribeDataChanging = function subscribeDataChanging (vm) {
+    this._dataListeners.push(vm);
+  };
+
+  VueI18n.prototype.unsubscribeDataChanging = function unsubscribeDataChanging (vm) {
+    remove(this._dataListeners, vm);
+  };
+
+  VueI18n.prototype.watchI18nData = function watchI18nData () {
+    var self = this;
+    return this._vm.$watch('$data', function () {
+      var i = self._dataListeners.length;
+      while (i--) {
+        Vue.nextTick(function () {
+          self._dataListeners[i] && self._dataListeners[i].$forceUpdate();
+        });
+      }
+    }, { deep: true })
+  };
+
+  VueI18n.prototype.watchLocale = function watchLocale () {
+    /* istanbul ignore if */
+    if (!this._sync || !this._root) { return null }
+    var target = this._vm;
+    return this._root.$i18n.vm.$watch('locale', function (val) {
+      target.$set(target, 'locale', val);
+      target.$forceUpdate();
+    }, { immediate: true })
+  };
+
+  VueI18n.prototype.onComponentInstanceCreated = function onComponentInstanceCreated (newI18n) {
+    if (this._componentInstanceCreatedListener) {
+      this._componentInstanceCreatedListener(newI18n, this);
+    }
+  };
+
+  prototypeAccessors.vm.get = function () { return this._vm };
+
+  prototypeAccessors.messages.get = function () { return looseClone(this._getMessages()) };
+  prototypeAccessors.dateTimeFormats.get = function () { return looseClone(this._getDateTimeFormats()) };
+  prototypeAccessors.numberFormats.get = function () { return looseClone(this._getNumberFormats()) };
+  prototypeAccessors.availableLocales.get = function () { return Object.keys(this.messages).sort() };
+
+  prototypeAccessors.locale.get = function () { return this._vm.locale };
+  prototypeAccessors.locale.set = function (locale) {
+    this._vm.$set(this._vm, 'locale', locale);
+  };
+
+  prototypeAccessors.fallbackLocale.get = function () { return this._vm.fallbackLocale };
+  prototypeAccessors.fallbackLocale.set = function (locale) {
+    this._localeChainCache = {};
+    this._vm.$set(this._vm, 'fallbackLocale', locale);
+  };
+
+  prototypeAccessors.formatFallbackMessages.get = function () { return this._formatFallbackMessages };
+  prototypeAccessors.formatFallbackMessages.set = function (fallback) { this._formatFallbackMessages = fallback; };
+
+  prototypeAccessors.missing.get = function () { return this._missing };
+  prototypeAccessors.missing.set = function (handler) { this._missing = handler; };
+
+  prototypeAccessors.formatter.get = function () { return this._formatter };
+  prototypeAccessors.formatter.set = function (formatter) { this._formatter = formatter; };
+
+  prototypeAccessors.silentTranslationWarn.get = function () { return this._silentTranslationWarn };
+  prototypeAccessors.silentTranslationWarn.set = function (silent) { this._silentTranslationWarn = silent; };
+
+  prototypeAccessors.silentFallbackWarn.get = function () { return this._silentFallbackWarn };
+  prototypeAccessors.silentFallbackWarn.set = function (silent) { this._silentFallbackWarn = silent; };
+
+  prototypeAccessors.preserveDirectiveContent.get = function () { return this._preserveDirectiveContent };
+  prototypeAccessors.preserveDirectiveContent.set = function (preserve) { this._preserveDirectiveContent = preserve; };
+
+  prototypeAccessors.warnHtmlInMessage.get = function () { return this._warnHtmlInMessage };
+  prototypeAccessors.warnHtmlInMessage.set = function (level) {
+      var this$1 = this;
+
+    var orgLevel = this._warnHtmlInMessage;
+    this._warnHtmlInMessage = level;
+    if (orgLevel !== level && (level === 'warn' || level === 'error')) {
+      var messages = this._getMessages();
+      Object.keys(messages).forEach(function (locale) {
+        this$1._checkLocaleMessage(locale, this$1._warnHtmlInMessage, messages[locale]);
+      });
+    }
+  };
+
+  prototypeAccessors.postTranslation.get = function () { return this._postTranslation };
+  prototypeAccessors.postTranslation.set = function (handler) { this._postTranslation = handler; };
+
+  VueI18n.prototype._getMessages = function _getMessages () { return this._vm.messages };
+  VueI18n.prototype._getDateTimeFormats = function _getDateTimeFormats () { return this._vm.dateTimeFormats };
+  VueI18n.prototype._getNumberFormats = function _getNumberFormats () { return this._vm.numberFormats };
+
+  VueI18n.prototype._warnDefault = function _warnDefault (locale, key, result, vm, values, interpolateMode) {
+    if (!isNull(result)) { return result }
+    if (this._missing) {
+      var missingRet = this._missing.apply(null, [locale, key, vm, values]);
+      if (isString(missingRet)) {
+        return missingRet
+      }
+    } else {
+      if (!this._isSilentTranslationWarn(key)) {
+        warn(
+          "Cannot translate the value of keypath '" + key + "'. " +
+          'Use the value of keypath as default.'
+        );
+      }
+    }
+
+    if (this._formatFallbackMessages) {
+      var parsedArgs = parseArgs.apply(void 0, values);
+      return this._render(key, interpolateMode, parsedArgs.params, key)
+    } else {
+      return key
+    }
+  };
+
+  VueI18n.prototype._isFallbackRoot = function _isFallbackRoot (val) {
+    return !val && !isNull(this._root) && this._fallbackRoot
+  };
+
+  VueI18n.prototype._isSilentFallbackWarn = function _isSilentFallbackWarn (key) {
+    return this._silentFallbackWarn instanceof RegExp
+      ? this._silentFallbackWarn.test(key)
+      : this._silentFallbackWarn
+  };
+
+  VueI18n.prototype._isSilentFallback = function _isSilentFallback (locale, key) {
+    return this._isSilentFallbackWarn(key) && (this._isFallbackRoot() || locale !== this.fallbackLocale)
+  };
+
+  VueI18n.prototype._isSilentTranslationWarn = function _isSilentTranslationWarn (key) {
+    return this._silentTranslationWarn instanceof RegExp
+      ? this._silentTranslationWarn.test(key)
+      : this._silentTranslationWarn
+  };
+
+  VueI18n.prototype._interpolate = function _interpolate (
+    locale,
+    message,
+    key,
+    host,
+    interpolateMode,
+    values,
+    visitedLinkStack
+  ) {
+    if (!message) { return null }
+
+    var pathRet = this._path.getPathValue(message, key);
+    if (Array.isArray(pathRet) || isPlainObject(pathRet)) { return pathRet }
+
+    var ret;
+    if (isNull(pathRet)) {
+      /* istanbul ignore else */
+      if (isPlainObject(message)) {
+        ret = message[key];
+        if (!isString(ret)) {
+          if (!this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+            warn(("Value of key '" + key + "' is not a string!"));
+          }
+          return null
+        }
+      } else {
+        return null
+      }
+    } else {
+      /* istanbul ignore else */
+      if (isString(pathRet)) {
+        ret = pathRet;
+      } else {
+        if (!this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+          warn(("Value of key '" + key + "' is not a string!"));
+        }
+        return null
+      }
+    }
+
+    // Check for the existence of links within the translated string
+    if (ret.indexOf('@:') >= 0 || ret.indexOf('@.') >= 0) {
+      ret = this._link(locale, message, ret, host, 'raw', values, visitedLinkStack);
+    }
+
+    return this._render(ret, interpolateMode, values, key)
+  };
+
+  VueI18n.prototype._link = function _link (
+    locale,
+    message,
+    str,
+    host,
+    interpolateMode,
+    values,
+    visitedLinkStack
+  ) {
+    var ret = str;
+
+    // Match all the links within the local
+    // We are going to replace each of
+    // them with its translation
+    var matches = ret.match(linkKeyMatcher);
+    for (var idx in matches) {
+      // ie compatible: filter custom array
+      // prototype method
+      if (!matches.hasOwnProperty(idx)) {
+        continue
+      }
+      var link = matches[idx];
+      var linkKeyPrefixMatches = link.match(linkKeyPrefixMatcher);
+      var linkPrefix = linkKeyPrefixMatches[0];
+        var formatterName = linkKeyPrefixMatches[1];
+
+      // Remove the leading @:, @.case: and the brackets
+      var linkPlaceholder = link.replace(linkPrefix, '').replace(bracketsMatcher, '');
+
+      if (includes(visitedLinkStack, linkPlaceholder)) {
+        {
+          warn(("Circular reference found. \"" + link + "\" is already visited in the chain of " + (visitedLinkStack.reverse().join(' <- '))));
+        }
+        return ret
+      }
+      visitedLinkStack.push(linkPlaceholder);
+
+      // Translate the link
+      var translated = this._interpolate(
+        locale, message, linkPlaceholder, host,
+        interpolateMode === 'raw' ? 'string' : interpolateMode,
+        interpolateMode === 'raw' ? undefined : values,
+        visitedLinkStack
+      );
+
+      if (this._isFallbackRoot(translated)) {
+        if (!this._isSilentTranslationWarn(linkPlaceholder)) {
+          warn(("Fall back to translate the link placeholder '" + linkPlaceholder + "' with root locale."));
+        }
+        /* istanbul ignore if */
+        if (!this._root) { throw Error('unexpected error') }
+        var root = this._root.$i18n;
+        translated = root._translate(
+          root._getMessages(), root.locale, root.fallbackLocale,
+          linkPlaceholder, host, interpolateMode, values
+        );
+      }
+      translated = this._warnDefault(
+        locale, linkPlaceholder, translated, host,
+        Array.isArray(values) ? values : [values],
+        interpolateMode
+      );
+
+      if (this._modifiers.hasOwnProperty(formatterName)) {
+        translated = this._modifiers[formatterName](translated);
+      } else if (defaultModifiers.hasOwnProperty(formatterName)) {
+        translated = defaultModifiers[formatterName](translated);
+      }
+
+      visitedLinkStack.pop();
+
+      // Replace the link with the translated
+      ret = !translated ? ret : ret.replace(link, translated);
+    }
+
+    return ret
+  };
+
+  VueI18n.prototype._render = function _render (message, interpolateMode, values, path) {
+    var ret = this._formatter.interpolate(message, values, path);
+
+    // If the custom formatter refuses to work - apply the default one
+    if (!ret) {
+      ret = defaultFormatter.interpolate(message, values, path);
+    }
+
+    // if interpolateMode is **not** 'string' ('row'),
+    // return the compiled data (e.g. ['foo', VNode, 'bar']) with formatter
+    return interpolateMode === 'string' && !isString(ret) ? ret.join('') : ret
+  };
+
+  VueI18n.prototype._appendItemToChain = function _appendItemToChain (chain, item, blocks) {
+    var follow = false;
+    if (!includes(chain, item)) {
+      follow = true;
+      if (item) {
+        follow = item[item.length - 1] !== '!';
+        item = item.replace(/!/g, '');
+        chain.push(item);
+        if (blocks && blocks[item]) {
+          follow = blocks[item];
+        }
+      }
+    }
+    return follow
+  };
+
+  VueI18n.prototype._appendLocaleToChain = function _appendLocaleToChain (chain, locale, blocks) {
+    var follow;
+    var tokens = locale.split('-');
+    do {
+      var item = tokens.join('-');
+      follow = this._appendItemToChain(chain, item, blocks);
+      tokens.splice(-1, 1);
+    } while (tokens.length && (follow === true))
+    return follow
+  };
+
+  VueI18n.prototype._appendBlockToChain = function _appendBlockToChain (chain, block, blocks) {
+    var follow = true;
+    for (var i = 0; (i < block.length) && (isBoolean(follow)); i++) {
+      var locale = block[i];
+      if (isString(locale)) {
+        follow = this._appendLocaleToChain(chain, locale, blocks);
+      }
+    }
+    return follow
+  };
+
+  VueI18n.prototype._getLocaleChain = function _getLocaleChain (start, fallbackLocale) {
+    if (start === '') { return [] }
+
+    if (!this._localeChainCache) {
+      this._localeChainCache = {};
+    }
+
+    var chain = this._localeChainCache[start];
+    if (!chain) {
+      if (!fallbackLocale) {
+        fallbackLocale = this.fallbackLocale;
+      }
+      chain = [];
+
+      // first block defined by start
+      var block = [start];
+
+      // while any intervening block found
+      while (isArray(block)) {
+        block = this._appendBlockToChain(
+          chain,
+          block,
+          fallbackLocale
+        );
+      }
+
+      // last block defined by default
+      var defaults;
+      if (isArray(fallbackLocale)) {
+        defaults = fallbackLocale;
+      } else if (isObject(fallbackLocale)) {
+        /* $FlowFixMe */
+        if (fallbackLocale['default']) {
+          defaults = fallbackLocale['default'];
+        } else {
+          defaults = null;
+        }
+      } else {
+        defaults = fallbackLocale;
+      }
+
+      // convert defaults to array
+      if (isString(defaults)) {
+        block = [defaults];
+      } else {
+        block = defaults;
+      }
+      if (block) {
+        this._appendBlockToChain(
+          chain,
+          block,
+          null
+        );
+      }
+      this._localeChainCache[start] = chain;
+    }
+    return chain
+  };
+
+  VueI18n.prototype._translate = function _translate (
+    messages,
+    locale,
+    fallback,
+    key,
+    host,
+    interpolateMode,
+    args
+  ) {
+    var chain = this._getLocaleChain(locale, fallback);
+    var res;
+    for (var i = 0; i < chain.length; i++) {
+      var step = chain[i];
+      res =
+        this._interpolate(step, messages[step], key, host, interpolateMode, args, [key]);
+      if (!isNull(res)) {
+        if (step !== locale && "development" !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(("Fall back to translate the keypath '" + key + "' with '" + step + "' locale."));
+        }
+        return res
+      }
+    }
+    return null
+  };
+
+  VueI18n.prototype._t = function _t (key, _locale, messages, host) {
+      var ref;
+
+      var values = [], len = arguments.length - 4;
+      while ( len-- > 0 ) values[ len ] = arguments[ len + 4 ];
+    if (!key) { return '' }
+
+    var parsedArgs = parseArgs.apply(void 0, values);
+    var locale = parsedArgs.locale || _locale;
+
+    var ret = this._translate(
+      messages, locale, this.fallbackLocale, key,
+      host, 'string', parsedArgs.params
+    );
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to translate the keypath '" + key + "' with root locale."));
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return (ref = this._root).$t.apply(ref, [ key ].concat( values ))
+    } else {
+      ret = this._warnDefault(locale, key, ret, host, values, 'string');
+      if (this._postTranslation && ret !== null && ret !== undefined) {
+        ret = this._postTranslation(ret, key);
+      }
+      return ret
+    }
+  };
+
+  VueI18n.prototype.t = function t (key) {
+      var ref;
+
+      var values = [], len = arguments.length - 1;
+      while ( len-- > 0 ) values[ len ] = arguments[ len + 1 ];
+    return (ref = this)._t.apply(ref, [ key, this.locale, this._getMessages(), null ].concat( values ))
+  };
+
+  VueI18n.prototype._i = function _i (key, locale, messages, host, values) {
+    var ret =
+      this._translate(messages, locale, this.fallbackLocale, key, host, 'raw', values);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key)) {
+        warn(("Fall back to interpolate the keypath '" + key + "' with root locale."));
+      }
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.i(key, locale, values)
+    } else {
+      return this._warnDefault(locale, key, ret, host, [values], 'raw')
+    }
+  };
+
+  VueI18n.prototype.i = function i (key, locale, values) {
+    /* istanbul ignore if */
+    if (!key) { return '' }
+
+    if (!isString(locale)) {
+      locale = this.locale;
+    }
+
+    return this._i(key, locale, this._getMessages(), null, values)
+  };
+
+  VueI18n.prototype._tc = function _tc (
+    key,
+    _locale,
+    messages,
+    host,
+    choice
+  ) {
+      var ref;
+
+      var values = [], len = arguments.length - 5;
+      while ( len-- > 0 ) values[ len ] = arguments[ len + 5 ];
+    if (!key) { return '' }
+    if (choice === undefined) {
+      choice = 1;
+    }
+
+    var predefined = { 'count': choice, 'n': choice };
+    var parsedArgs = parseArgs.apply(void 0, values);
+    parsedArgs.params = Object.assign(predefined, parsedArgs.params);
+    values = parsedArgs.locale === null ? [parsedArgs.params] : [parsedArgs.locale, parsedArgs.params];
+    return this.fetchChoice((ref = this)._t.apply(ref, [ key, _locale, messages, host ].concat( values )), choice)
+  };
+
+  VueI18n.prototype.fetchChoice = function fetchChoice (message, choice) {
+    /* istanbul ignore if */
+    if (!message && !isString(message)) { return null }
+    var choices = message.split('|');
+
+    choice = this.getChoiceIndex(choice, choices.length);
+    if (!choices[choice]) { return message }
+    return choices[choice].trim()
+  };
+
+  VueI18n.prototype.tc = function tc (key, choice) {
+      var ref;
+
+      var values = [], len = arguments.length - 2;
+      while ( len-- > 0 ) values[ len ] = arguments[ len + 2 ];
+    return (ref = this)._tc.apply(ref, [ key, this.locale, this._getMessages(), null, choice ].concat( values ))
+  };
+
+  VueI18n.prototype._te = function _te (key, locale, messages) {
+      var args = [], len = arguments.length - 3;
+      while ( len-- > 0 ) args[ len ] = arguments[ len + 3 ];
+
+    var _locale = parseArgs.apply(void 0, args).locale || locale;
+    return this._exist(messages[_locale], key)
+  };
+
+  VueI18n.prototype.te = function te (key, locale) {
+    return this._te(key, this.locale, this._getMessages(), locale)
+  };
+
+  VueI18n.prototype.getLocaleMessage = function getLocaleMessage (locale) {
+    return looseClone(this._vm.messages[locale] || {})
+  };
+
+  VueI18n.prototype.setLocaleMessage = function setLocaleMessage (locale, message) {
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+    }
+    this._vm.$set(this._vm.messages, locale, message);
+  };
+
+  VueI18n.prototype.mergeLocaleMessage = function mergeLocaleMessage (locale, message) {
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      this._checkLocaleMessage(locale, this._warnHtmlInMessage, message);
+    }
+    this._vm.$set(this._vm.messages, locale, merge({}, this._vm.messages[locale] || {}, message));
+  };
+
+  VueI18n.prototype.getDateTimeFormat = function getDateTimeFormat (locale) {
+    return looseClone(this._vm.dateTimeFormats[locale] || {})
+  };
+
+  VueI18n.prototype.setDateTimeFormat = function setDateTimeFormat (locale, format) {
+    this._vm.$set(this._vm.dateTimeFormats, locale, format);
+    this._clearDateTimeFormat(locale, format);
+  };
+
+  VueI18n.prototype.mergeDateTimeFormat = function mergeDateTimeFormat (locale, format) {
+    this._vm.$set(this._vm.dateTimeFormats, locale, merge(this._vm.dateTimeFormats[locale] || {}, format));
+    this._clearDateTimeFormat(locale, format);
+  };
+
+  VueI18n.prototype._clearDateTimeFormat = function _clearDateTimeFormat (locale, format) {
+    for (var key in format) {
+      var id = locale + "__" + key;
+
+      if (!this._dateTimeFormatters.hasOwnProperty(id)) {
+        continue
+      }
+
+      delete this._dateTimeFormatters[id];
+    }
+  };
+
+  VueI18n.prototype._localizeDateTime = function _localizeDateTime (
+    value,
+    locale,
+    fallback,
+    dateTimeFormats,
+    key
+  ) {
+    var _locale = locale;
+    var formats = dateTimeFormats[_locale];
+
+    var chain = this._getLocaleChain(locale, fallback);
+    for (var i = 0; i < chain.length; i++) {
+      var current = _locale;
+      var step = chain[i];
+      formats = dateTimeFormats[step];
+      _locale = step;
+      // fallback locale
+      if (isNull(formats) || isNull(formats[key])) {
+        if (step !== locale && "development" !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(("Fall back to '" + step + "' datetime formats from '" + current + "' datetime formats."));
+        }
+      } else {
+        break
+      }
+    }
+
+    if (isNull(formats) || isNull(formats[key])) {
+      return null
+    } else {
+      var format = formats[key];
+      var id = _locale + "__" + key;
+      var formatter = this._dateTimeFormatters[id];
+      if (!formatter) {
+        formatter = this._dateTimeFormatters[id] = new Intl.DateTimeFormat(_locale, format);
+      }
+      return formatter.format(value)
+    }
+  };
+
+  VueI18n.prototype._d = function _d (value, locale, key) {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.dateTimeFormat) {
+      warn('Cannot format a Date value due to not supported Intl.DateTimeFormat.');
+      return ''
+    }
+
+    if (!key) {
+      return new Intl.DateTimeFormat(locale).format(value)
+    }
+
+    var ret =
+      this._localizeDateTime(value, locale, this.fallbackLocale, this._getDateTimeFormats(), key);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to datetime localization of root: key '" + key + "'."));
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.d(value, key, locale)
+    } else {
+      return ret || ''
+    }
+  };
+
+  VueI18n.prototype.d = function d (value) {
+      var args = [], len = arguments.length - 1;
+      while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+    var locale = this.locale;
+    var key = null;
+
+    if (args.length === 1) {
+      if (isString(args[0])) {
+        key = args[0];
+      } else if (isObject(args[0])) {
+        if (args[0].locale) {
+          locale = args[0].locale;
+        }
+        if (args[0].key) {
+          key = args[0].key;
+        }
+      }
+    } else if (args.length === 2) {
+      if (isString(args[0])) {
+        key = args[0];
+      }
+      if (isString(args[1])) {
+        locale = args[1];
+      }
+    }
+
+    return this._d(value, locale, key)
+  };
+
+  VueI18n.prototype.getNumberFormat = function getNumberFormat (locale) {
+    return looseClone(this._vm.numberFormats[locale] || {})
+  };
+
+  VueI18n.prototype.setNumberFormat = function setNumberFormat (locale, format) {
+    this._vm.$set(this._vm.numberFormats, locale, format);
+    this._clearNumberFormat(locale, format);
+  };
+
+  VueI18n.prototype.mergeNumberFormat = function mergeNumberFormat (locale, format) {
+    this._vm.$set(this._vm.numberFormats, locale, merge(this._vm.numberFormats[locale] || {}, format));
+    this._clearNumberFormat(locale, format);
+  };
+
+  VueI18n.prototype._clearNumberFormat = function _clearNumberFormat (locale, format) {
+    for (var key in format) {
+      var id = locale + "__" + key;
+
+      if (!this._numberFormatters.hasOwnProperty(id)) {
+        continue
+      }
+
+      delete this._numberFormatters[id];
+    }
+  };
+
+  VueI18n.prototype._getNumberFormatter = function _getNumberFormatter (
+    value,
+    locale,
+    fallback,
+    numberFormats,
+    key,
+    options
+  ) {
+    var _locale = locale;
+    var formats = numberFormats[_locale];
+
+    var chain = this._getLocaleChain(locale, fallback);
+    for (var i = 0; i < chain.length; i++) {
+      var current = _locale;
+      var step = chain[i];
+      formats = numberFormats[step];
+      _locale = step;
+      // fallback locale
+      if (isNull(formats) || isNull(formats[key])) {
+        if (step !== locale && "development" !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(("Fall back to '" + step + "' number formats from '" + current + "' number formats."));
+        }
+      } else {
+        break
+      }
+    }
+
+    if (isNull(formats) || isNull(formats[key])) {
+      return null
+    } else {
+      var format = formats[key];
+
+      var formatter;
+      if (options) {
+        // If options specified - create one time number formatter
+        formatter = new Intl.NumberFormat(_locale, Object.assign({}, format, options));
+      } else {
+        var id = _locale + "__" + key;
+        formatter = this._numberFormatters[id];
+        if (!formatter) {
+          formatter = this._numberFormatters[id] = new Intl.NumberFormat(_locale, format);
+        }
+      }
+      return formatter
+    }
+  };
+
+  VueI18n.prototype._n = function _n (value, locale, key, options) {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.numberFormat) {
+      {
+        warn('Cannot format a Number value due to not supported Intl.NumberFormat.');
+      }
+      return ''
+    }
+
+    if (!key) {
+      var nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+      return nf.format(value)
+    }
+
+    var formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+    var ret = formatter && formatter.format(value);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(("Fall back to number localization of root: key '" + key + "'."));
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.n(value, Object.assign({}, { key: key, locale: locale }, options))
+    } else {
+      return ret || ''
+    }
+  };
+
+  VueI18n.prototype.n = function n (value) {
+      var args = [], len = arguments.length - 1;
+      while ( len-- > 0 ) args[ len ] = arguments[ len + 1 ];
+
+    var locale = this.locale;
+    var key = null;
+    var options = null;
+
+    if (args.length === 1) {
+      if (isString(args[0])) {
+        key = args[0];
+      } else if (isObject(args[0])) {
+        if (args[0].locale) {
+          locale = args[0].locale;
+        }
+        if (args[0].key) {
+          key = args[0].key;
+        }
+
+        // Filter out number format options only
+        options = Object.keys(args[0]).reduce(function (acc, key) {
+            var obj;
+
+          if (includes(numberFormatKeys, key)) {
+            return Object.assign({}, acc, ( obj = {}, obj[key] = args[0][key], obj ))
+          }
+          return acc
+        }, null);
+      }
+    } else if (args.length === 2) {
+      if (isString(args[0])) {
+        key = args[0];
+      }
+      if (isString(args[1])) {
+        locale = args[1];
+      }
+    }
+
+    return this._n(value, locale, key, options)
+  };
+
+  VueI18n.prototype._ntp = function _ntp (value, locale, key, options) {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.numberFormat) {
+      {
+        warn('Cannot format to parts a Number value due to not supported Intl.NumberFormat.');
+      }
+      return []
+    }
+
+    if (!key) {
+      var nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options);
+      return nf.formatToParts(value)
+    }
+
+    var formatter = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options);
+    var ret = formatter && formatter.formatToParts(value);
+    if (this._isFallbackRoot(ret)) {
+      if (!this._isSilentTranslationWarn(key)) {
+        warn(("Fall back to format number to parts of root: key '" + key + "' ."));
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n._ntp(value, locale, key, options)
+    } else {
+      return ret || []
+    }
+  };
+
+  Object.defineProperties( VueI18n.prototype, prototypeAccessors );
+
+  var availabilities;
+  // $FlowFixMe
+  Object.defineProperty(VueI18n, 'availabilities', {
+    get: function get () {
+      if (!availabilities) {
+        var intlDefined = typeof Intl !== 'undefined';
+        availabilities = {
+          dateTimeFormat: intlDefined && typeof Intl.DateTimeFormat !== 'undefined',
+          numberFormat: intlDefined && typeof Intl.NumberFormat !== 'undefined'
+        };
+      }
+
+      return availabilities
+    }
+  });
+
+  VueI18n.install = install;
+  VueI18n.version = '8.20.0';
+
+  return VueI18n;
+
+})));
diff --git a/node_modules/vue-i18n/dist/vue-i18n.min.js b/node_modules/vue-i18n/dist/vue-i18n.min.js
new file mode 100644
index 0000000..8d0a5c0
--- /dev/null
+++ b/node_modules/vue-i18n/dist/vue-i18n.min.js
@@ -0,0 +1,6 @@
+/*!
+ * vue-i18n v8.20.0 
+ * (c) 2020 kazuya kawaguchi
+ * Released under the MIT License.
+ */
+var t,e;t=this,e=function(){"use strict";var t=["style","currency","currencyDisplay","useGrouping","minimumIntegerDigits","minimumFractionDigits","maximumFractionDigits","minimumSignificantDigits","maximumSignificantDigits","localeMatcher","formatMatcher","unit"];function e(t,e){"undefined"!=typeof console&&(console.warn("[vue-i18n] "+t),e&&console.warn(e.stack))}var n=Array.isArray;function r(t){return null!==t&&"object"==typeof t}function a(t){return"string"==typeof t}var i=Object.prototype.toString,o="[object Object]";function s(t){return i.call(t)===o}function l(t){return null==t}function c(){for(var t=[],e=arguments.length;e--;)t[e]=arguments[e];var n=null,a=null;return 1===t.length?r(t[0])||Array.isArray(t[0])?a=t[0]:"string"==typeof t[0]&&(n=t[0]):2===t.length&&("string"==typeof t[0]&&(n=t[0]),(r(t[1])||Array.isArray(t[1]))&&(a=t[1])),{locale:n,params:a}}function u(t){return JSON.parse(JSON.stringify(t))}function h(t,e){return!!~t.indexOf(e)}var f=Object.prototype.hasOwnProperty;function p(t,e){return f.call(t,e)}function m(t){for(var e=arguments,n=Object(t),a=1;a<arguments.length;a++){var i=e[a];if(null!=i){var o=void 0;for(o in i)p(i,o)&&(r(i[o])?n[o]=m(n[o],i[o]):n[o]=i[o])}}return n}function _(t,e){if(t===e)return!0;var n=r(t),a=r(e);if(!n||!a)return!n&&!a&&String(t)===String(e);try{var i=Array.isArray(t),o=Array.isArray(e);if(i&&o)return t.length===e.length&&t.every(function(t,n){return _(t,e[n])});if(i||o)return!1;var s=Object.keys(t),l=Object.keys(e);return s.length===l.length&&s.every(function(n){return _(t[n],e[n])})}catch(t){return!1}}var g={beforeCreate:function(){var t=this.$options;if(t.i18n=t.i18n||(t.__i18n?{}:null),t.i18n){if(t.i18n instanceof et){if(t.__i18n)try{var e={};t.__i18n.forEach(function(t){e=m(e,JSON.parse(t))}),Object.keys(e).forEach(function(n){t.i18n.mergeLocaleMessage(n,e[n])})}catch(t){}this._i18n=t.i18n,this._i18nWatcher=this._i18n.watchI18nData()}else if(s(t.i18n)){var n=this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof et?this.$root.$i18n:null;if(n&&(t.i18n.root=this.$root,t.i18n.formatter=n.formatter,t.i18n.fallbackLocale=n.fallbackLocale,t.i18n.formatFallbackMessages=n.formatFallbackMessages,t.i18n.silentTranslationWarn=n.silentTranslationWarn,t.i18n.silentFallbackWarn=n.silentFallbackWarn,t.i18n.pluralizationRules=n.pluralizationRules,t.i18n.preserveDirectiveContent=n.preserveDirectiveContent),t.__i18n)try{var r={};t.__i18n.forEach(function(t){r=m(r,JSON.parse(t))}),t.i18n.messages=r}catch(t){}var a=t.i18n.sharedMessages;a&&s(a)&&(t.i18n.messages=m(t.i18n.messages,a)),this._i18n=new et(t.i18n),this._i18nWatcher=this._i18n.watchI18nData(),(void 0===t.i18n.sync||t.i18n.sync)&&(this._localeWatcher=this.$i18n.watchLocale()),n&&n.onComponentInstanceCreated(this._i18n)}}else this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof et?this._i18n=this.$root.$i18n:t.parent&&t.parent.$i18n&&t.parent.$i18n instanceof et&&(this._i18n=t.parent.$i18n)},beforeMount:function(){var t=this.$options;t.i18n=t.i18n||(t.__i18n?{}:null),t.i18n?t.i18n instanceof et?(this._i18n.subscribeDataChanging(this),this._subscribing=!0):s(t.i18n)&&(this._i18n.subscribeDataChanging(this),this._subscribing=!0):this.$root&&this.$root.$i18n&&this.$root.$i18n instanceof et?(this._i18n.subscribeDataChanging(this),this._subscribing=!0):t.parent&&t.parent.$i18n&&t.parent.$i18n instanceof et&&(this._i18n.subscribeDataChanging(this),this._subscribing=!0)},beforeDestroy:function(){if(this._i18n){var t=this;this.$nextTick(function(){t._subscribing&&(t._i18n.unsubscribeDataChanging(t),delete t._subscribing),t._i18nWatcher&&(t._i18nWatcher(),t._i18n.destroyVM(),delete t._i18nWatcher),t._localeWatcher&&(t._localeWatcher(),delete t._localeWatcher)})}}},v={name:"i18n",functional:!0,props:{tag:{type:[String,Boolean,Object],default:"span"},path:{type:String,required:!0},locale:{type:String},places:{type:[Array,Object]}},render:function(t,e){var n=e.data,r=e.parent,a=e.props,i=e.slots,o=r.$i18n;if(o){var s=a.path,l=a.locale,c=a.places,u=i(),h=o.i(s,l,function(t){var e;for(e in t)if("default"!==e)return!1;return Boolean(e)}(u)||c?function(t,e){var n=e?function(t){return Array.isArray(t)?t.reduce(d,{}):Object.assign({},t)}(e):{};if(!t)return n;var r=(t=t.filter(function(t){return t.tag||""!==t.text.trim()})).every(y);return t.reduce(r?b:d,n)}(u.default,c):u),f=a.tag&&!0!==a.tag||!1===a.tag?a.tag:"span";return f?t(f,n,h):h}}};function b(t,e){return e.data&&e.data.attrs&&e.data.attrs.place&&(t[e.data.attrs.place]=e),t}function d(t,e,n){return t[n]=e,t}function y(t){return Boolean(t.data&&t.data.attrs&&t.data.attrs.place)}var F,k={name:"i18n-n",functional:!0,props:{tag:{type:[String,Boolean,Object],default:"span"},value:{type:Number,required:!0},format:{type:[String,Object]},locale:{type:String}},render:function(e,n){var i=n.props,o=n.parent,s=n.data,l=o.$i18n;if(!l)return null;var c=null,u=null;a(i.format)?c=i.format:r(i.format)&&(i.format.key&&(c=i.format.key),u=Object.keys(i.format).reduce(function(e,n){var r;return h(t,n)?Object.assign({},e,((r={})[n]=i.format[n],r)):e},null));var f=i.locale||l.locale,p=l._ntp(i.value,f,c,u),m=p.map(function(t,e){var n,r=s.scopedSlots&&s.scopedSlots[t.type];return r?r(((n={})[t.type]=t.value,n.index=e,n.parts=p,n)):t.value}),_=i.tag&&!0!==i.tag||!1===i.tag?i.tag:"span";return _?e(_,{attrs:s.attrs,class:s.class,staticClass:s.staticClass},m):m}};function w(t,e,n){C(t,n)&&T(t,e,n)}function $(t,e,n,r){if(C(t,n)){var a=n.context.$i18n;(function(t,e){var n=e.context;return t._locale===n.$i18n.locale})(t,n)&&_(e.value,e.oldValue)&&_(t._localeMessage,a.getLocaleMessage(a.locale))||T(t,e,n)}}function M(t,n,r,a){if(r.context){var i=r.context.$i18n||{};n.modifiers.preserve||i.preserveDirectiveContent||(t.textContent=""),t._vt=void 0,delete t._vt,t._locale=void 0,delete t._locale,t._localeMessage=void 0,delete t._localeMessage}else e("Vue instance does not exists in VNode context")}function C(t,n){var r=n.context;return r?!!r.$i18n||(e("VueI18n instance does not exists in Vue instance"),!1):(e("Vue instance does not exists in VNode context"),!1)}function T(t,n,r){var i,o,l=function(t){var e,n,r,i;a(t)?e=t:s(t)&&(e=t.path,n=t.locale,r=t.args,i=t.choice);return{path:e,locale:n,args:r,choice:i}}(n.value),c=l.path,u=l.locale,h=l.args,f=l.choice;if(c||u||h)if(c){var p=r.context;t._vt=t.textContent=null!=f?(i=p.$i18n).tc.apply(i,[c,f].concat(L(u,h))):(o=p.$i18n).t.apply(o,[c].concat(L(u,h))),t._locale=p.$i18n.locale,t._localeMessage=p.$i18n.getLocaleMessage(p.$i18n.locale)}else e("`path` is required in v-t directive");else e("value type not supported")}function L(t,e){var n=[];return t&&n.push(t),e&&(Array.isArray(e)||s(e))&&n.push(e),n}function I(t){I.installed=!0;(F=t).version&&Number(F.version.split(".")[0]);!function(t){t.prototype.hasOwnProperty("$i18n")||Object.defineProperty(t.prototype,"$i18n",{get:function(){return this._i18n}}),t.prototype.$t=function(t){for(var e=[],n=arguments.length-1;n-- >0;)e[n]=arguments[n+1];var r=this.$i18n;return r._t.apply(r,[t,r.locale,r._getMessages(),this].concat(e))},t.prototype.$tc=function(t,e){for(var n=[],r=arguments.length-2;r-- >0;)n[r]=arguments[r+2];var a=this.$i18n;return a._tc.apply(a,[t,a.locale,a._getMessages(),this,e].concat(n))},t.prototype.$te=function(t,e){var n=this.$i18n;return n._te(t,n.locale,n._getMessages(),e)},t.prototype.$d=function(t){for(var e,n=[],r=arguments.length-1;r-- >0;)n[r]=arguments[r+1];return(e=this.$i18n).d.apply(e,[t].concat(n))},t.prototype.$n=function(t){for(var e,n=[],r=arguments.length-1;r-- >0;)n[r]=arguments[r+1];return(e=this.$i18n).n.apply(e,[t].concat(n))}}(F),F.mixin(g),F.directive("t",{bind:w,update:$,unbind:M}),F.component(v.name,v),F.component(k.name,k),F.config.optionMergeStrategies.i18n=function(t,e){return void 0===e?t:e}}var D=function(){this._caches=Object.create(null)};D.prototype.interpolate=function(t,e){if(!e)return[t];var n=this._caches[t];return n||(n=function(t){var e=[],n=0,r="";for(;n<t.length;){var a=t[n++];if("{"===a){r&&e.push({type:"text",value:r}),r="";var i="";for(a=t[n++];void 0!==a&&"}"!==a;)i+=a,a=t[n++];var o="}"===a,s=O.test(i)?"list":o&&x.test(i)?"named":"unknown";e.push({value:i,type:s})}else"%"===a?"{"!==t[n]&&(r+=a):r+=a}return r&&e.push({type:"text",value:r}),e}(t),this._caches[t]=n),function(t,e){var n=[],a=0,i=Array.isArray(e)?"list":r(e)?"named":"unknown";if("unknown"===i)return n;for(;a<t.length;){var o=t[a];switch(o.type){case"text":n.push(o.value);break;case"list":n.push(e[parseInt(o.value,10)]);break;case"named":"named"===i&&n.push(e[o.value])}a++}return n}(n,e)};var O=/^(?:\d)+/,x=/^(?:\w)+/,W=0,j=1,N=2,A=3,S=0,R=4,H=5,P=6,V=7,E=8,z=[];z[S]={ws:[S],ident:[3,W],"[":[R],eof:[V]},z[1]={ws:[1],".":[2],"[":[R],eof:[V]},z[2]={ws:[2],ident:[3,W],0:[3,W],number:[3,W]},z[3]={ident:[3,W],0:[3,W],number:[3,W],ws:[1,j],".":[2,j],"[":[R,j],eof:[V,j]},z[R]={"'":[H,W],'"':[P,W],"[":[R,N],"]":[1,A],eof:E,else:[R,W]},z[H]={"'":[R,W],eof:E,else:[H,W]},z[P]={'"':[R,W],eof:E,else:[P,W]};var B=/^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/;function U(t){if(null==t)return"eof";switch(t.charCodeAt(0)){case 91:case 93:case 46:case 34:case 39:return t;case 95:case 36:case 45:return"ident";case 9:case 10:case 13:case 160:case 65279:case 8232:case 8233:return"ws"}return"ident"}function J(t){var e,n,r,a=t.trim();return("0"!==t.charAt(0)||!isNaN(t))&&(r=a,B.test(r)?(n=(e=a).charCodeAt(0))!==e.charCodeAt(e.length-1)||34!==n&&39!==n?e:e.slice(1,-1):"*"+a)}var q=function(){this._cache=Object.create(null)};q.prototype.parsePath=function(t){var e=this._cache[t];return e||(e=function(t){var e,n,r,a,i,o,s,l=[],c=-1,u=S,h=0,f=[];function p(){var e=t[c+1];if(u===H&&"'"===e||u===P&&'"'===e)return c++,r="\\"+e,f[W](),!0}for(f[j]=function(){void 0!==n&&(l.push(n),n=void 0)},f[W]=function(){void 0===n?n=r:n+=r},f[N]=function(){f[W](),h++},f[A]=function(){if(h>0)h--,u=R,f[W]();else{if(h=0,void 0===n)return!1;if(!1===(n=J(n)))return!1;f[j]()}};null!==u;)if("\\"!==(e=t[++c])||!p()){if(a=U(e),(i=(s=z[u])[a]||s.else||E)===E)return;if(u=i[0],(o=f[i[1]])&&(r=void 0===(r=i[2])?e:r,!1===o()))return;if(u===V)return l}}(t))&&(this._cache[t]=e),e||[]},q.prototype.getPathValue=function(t,e){if(!r(t))return null;var n=this.parsePath(e);if(0===n.length)return null;for(var a=n.length,i=t,o=0;o<a;){var s=i[n[o]];if(void 0===s)return null;i=s,o++}return i};var G,X=/<\/?[\w\s="/.':;#-\/]+>/,Z=/(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g,K=/^@(?:\.([a-z]+))?:/,Q=/[()]/g,Y={upper:function(t){return t.toLocaleUpperCase()},lower:function(t){return t.toLocaleLowerCase()},capitalize:function(t){return""+t.charAt(0).toLocaleUpperCase()+t.substr(1)}},tt=new D,et=function(t){var e=this;void 0===t&&(t={}),!F&&"undefined"!=typeof window&&window.Vue&&I(window.Vue);var n=t.locale||"en-US",r=!1!==t.fallbackLocale&&(t.fallbackLocale||"en-US"),a=t.messages||{},i=t.dateTimeFormats||{},o=t.numberFormats||{};this._vm=null,this._formatter=t.formatter||tt,this._modifiers=t.modifiers||{},this._missing=t.missing||null,this._root=t.root||null,this._sync=void 0===t.sync||!!t.sync,this._fallbackRoot=void 0===t.fallbackRoot||!!t.fallbackRoot,this._formatFallbackMessages=void 0!==t.formatFallbackMessages&&!!t.formatFallbackMessages,this._silentTranslationWarn=void 0!==t.silentTranslationWarn&&t.silentTranslationWarn,this._silentFallbackWarn=void 0!==t.silentFallbackWarn&&!!t.silentFallbackWarn,this._dateTimeFormatters={},this._numberFormatters={},this._path=new q,this._dataListeners=[],this._componentInstanceCreatedListener=t.componentInstanceCreatedListener||null,this._preserveDirectiveContent=void 0!==t.preserveDirectiveContent&&!!t.preserveDirectiveContent,this.pluralizationRules=t.pluralizationRules||{},this._warnHtmlInMessage=t.warnHtmlInMessage||"off",this._postTranslation=t.postTranslation||null,this.getChoiceIndex=function(t,n){var r=Object.getPrototypeOf(e);if(r&&r.getChoiceIndex)return r.getChoiceIndex.call(e,t,n);var a,i;return e.locale in e.pluralizationRules?e.pluralizationRules[e.locale].apply(e,[t,n]):(a=t,i=n,a=Math.abs(a),2===i?a?a>1?1:0:1:a?Math.min(a,2):0)},this._exist=function(t,n){return!(!t||!n)&&(!l(e._path.getPathValue(t,n))||!!t[n])},"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||Object.keys(a).forEach(function(t){e._checkLocaleMessage(t,e._warnHtmlInMessage,a[t])}),this._initVM({locale:n,fallbackLocale:r,messages:a,dateTimeFormats:i,numberFormats:o})},nt={vm:{configurable:!0},messages:{configurable:!0},dateTimeFormats:{configurable:!0},numberFormats:{configurable:!0},availableLocales:{configurable:!0},locale:{configurable:!0},fallbackLocale:{configurable:!0},formatFallbackMessages:{configurable:!0},missing:{configurable:!0},formatter:{configurable:!0},silentTranslationWarn:{configurable:!0},silentFallbackWarn:{configurable:!0},preserveDirectiveContent:{configurable:!0},warnHtmlInMessage:{configurable:!0},postTranslation:{configurable:!0}};return et.prototype._checkLocaleMessage=function(t,n,r){var i=function(t,n,r,o){if(s(r))Object.keys(r).forEach(function(e){var a=r[e];s(a)?(o.push(e),o.push("."),i(t,n,a,o),o.pop(),o.pop()):(o.push(e),i(t,n,a,o),o.pop())});else if(Array.isArray(r))r.forEach(function(e,r){s(e)?(o.push("["+r+"]"),o.push("."),i(t,n,e,o),o.pop(),o.pop()):(o.push("["+r+"]"),i(t,n,e,o),o.pop())});else if(a(r)){if(X.test(r)){var l="Detected HTML in message '"+r+"' of keypath '"+o.join("")+"' at '"+n+"'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp";"warn"===t?e(l):"error"===t&&function(t,e){"undefined"!=typeof console&&(console.error("[vue-i18n] "+t),e&&console.error(e.stack))}(l)}}};i(n,t,r,[])},et.prototype._initVM=function(t){var e=F.config.silent;F.config.silent=!0,this._vm=new F({data:t}),F.config.silent=e},et.prototype.destroyVM=function(){this._vm.$destroy()},et.prototype.subscribeDataChanging=function(t){this._dataListeners.push(t)},et.prototype.unsubscribeDataChanging=function(t){!function(t,e){if(t.length){var n=t.indexOf(e);if(n>-1)t.splice(n,1)}}(this._dataListeners,t)},et.prototype.watchI18nData=function(){var t=this;return this._vm.$watch("$data",function(){for(var e=t._dataListeners.length;e--;)F.nextTick(function(){t._dataListeners[e]&&t._dataListeners[e].$forceUpdate()})},{deep:!0})},et.prototype.watchLocale=function(){if(!this._sync||!this._root)return null;var t=this._vm;return this._root.$i18n.vm.$watch("locale",function(e){t.$set(t,"locale",e),t.$forceUpdate()},{immediate:!0})},et.prototype.onComponentInstanceCreated=function(t){this._componentInstanceCreatedListener&&this._componentInstanceCreatedListener(t,this)},nt.vm.get=function(){return this._vm},nt.messages.get=function(){return u(this._getMessages())},nt.dateTimeFormats.get=function(){return u(this._getDateTimeFormats())},nt.numberFormats.get=function(){return u(this._getNumberFormats())},nt.availableLocales.get=function(){return Object.keys(this.messages).sort()},nt.locale.get=function(){return this._vm.locale},nt.locale.set=function(t){this._vm.$set(this._vm,"locale",t)},nt.fallbackLocale.get=function(){return this._vm.fallbackLocale},nt.fallbackLocale.set=function(t){this._localeChainCache={},this._vm.$set(this._vm,"fallbackLocale",t)},nt.formatFallbackMessages.get=function(){return this._formatFallbackMessages},nt.formatFallbackMessages.set=function(t){this._formatFallbackMessages=t},nt.missing.get=function(){return this._missing},nt.missing.set=function(t){this._missing=t},nt.formatter.get=function(){return this._formatter},nt.formatter.set=function(t){this._formatter=t},nt.silentTranslationWarn.get=function(){return this._silentTranslationWarn},nt.silentTranslationWarn.set=function(t){this._silentTranslationWarn=t},nt.silentFallbackWarn.get=function(){return this._silentFallbackWarn},nt.silentFallbackWarn.set=function(t){this._silentFallbackWarn=t},nt.preserveDirectiveContent.get=function(){return this._preserveDirectiveContent},nt.preserveDirectiveContent.set=function(t){this._preserveDirectiveContent=t},nt.warnHtmlInMessage.get=function(){return this._warnHtmlInMessage},nt.warnHtmlInMessage.set=function(t){var e=this,n=this._warnHtmlInMessage;if(this._warnHtmlInMessage=t,n!==t&&("warn"===t||"error"===t)){var r=this._getMessages();Object.keys(r).forEach(function(t){e._checkLocaleMessage(t,e._warnHtmlInMessage,r[t])})}},nt.postTranslation.get=function(){return this._postTranslation},nt.postTranslation.set=function(t){this._postTranslation=t},et.prototype._getMessages=function(){return this._vm.messages},et.prototype._getDateTimeFormats=function(){return this._vm.dateTimeFormats},et.prototype._getNumberFormats=function(){return this._vm.numberFormats},et.prototype._warnDefault=function(t,e,n,r,i,o){if(!l(n))return n;if(this._missing){var s=this._missing.apply(null,[t,e,r,i]);if(a(s))return s}if(this._formatFallbackMessages){var u=c.apply(void 0,i);return this._render(e,o,u.params,e)}return e},et.prototype._isFallbackRoot=function(t){return!t&&!l(this._root)&&this._fallbackRoot},et.prototype._isSilentFallbackWarn=function(t){return this._silentFallbackWarn instanceof RegExp?this._silentFallbackWarn.test(t):this._silentFallbackWarn},et.prototype._isSilentFallback=function(t,e){return this._isSilentFallbackWarn(e)&&(this._isFallbackRoot()||t!==this.fallbackLocale)},et.prototype._isSilentTranslationWarn=function(t){return this._silentTranslationWarn instanceof RegExp?this._silentTranslationWarn.test(t):this._silentTranslationWarn},et.prototype._interpolate=function(t,e,n,r,i,o,c){if(!e)return null;var u,h=this._path.getPathValue(e,n);if(Array.isArray(h)||s(h))return h;if(l(h)){if(!s(e))return null;if(!a(u=e[n]))return null}else{if(!a(h))return null;u=h}return(u.indexOf("@:")>=0||u.indexOf("@.")>=0)&&(u=this._link(t,e,u,r,"raw",o,c)),this._render(u,i,o,n)},et.prototype._link=function(t,e,n,r,a,i,o){var s=n,l=s.match(Z);for(var c in l)if(l.hasOwnProperty(c)){var u=l[c],f=u.match(K),p=f[0],m=f[1],_=u.replace(p,"").replace(Q,"");if(h(o,_))return s;o.push(_);var g=this._interpolate(t,e,_,r,"raw"===a?"string":a,"raw"===a?void 0:i,o);if(this._isFallbackRoot(g)){if(!this._root)throw Error("unexpected error");var v=this._root.$i18n;g=v._translate(v._getMessages(),v.locale,v.fallbackLocale,_,r,a,i)}g=this._warnDefault(t,_,g,r,Array.isArray(i)?i:[i],a),this._modifiers.hasOwnProperty(m)?g=this._modifiers[m](g):Y.hasOwnProperty(m)&&(g=Y[m](g)),o.pop(),s=g?s.replace(u,g):s}return s},et.prototype._render=function(t,e,n,r){var i=this._formatter.interpolate(t,n,r);return i||(i=tt.interpolate(t,n,r)),"string"!==e||a(i)?i:i.join("")},et.prototype._appendItemToChain=function(t,e,n){var r=!1;return h(t,e)||(r=!0,e&&(r="!"!==e[e.length-1],e=e.replace(/!/g,""),t.push(e),n&&n[e]&&(r=n[e]))),r},et.prototype._appendLocaleToChain=function(t,e,n){var r,a=e.split("-");do{var i=a.join("-");r=this._appendItemToChain(t,i,n),a.splice(-1,1)}while(a.length&&!0===r);return r},et.prototype._appendBlockToChain=function(t,e,n){for(var r=!0,i=0;i<e.length&&"boolean"==typeof r;i++){var o=e[i];a(o)&&(r=this._appendLocaleToChain(t,o,n))}return r},et.prototype._getLocaleChain=function(t,e){if(""===t)return[];this._localeChainCache||(this._localeChainCache={});var i=this._localeChainCache[t];if(!i){e||(e=this.fallbackLocale),i=[];for(var o,s=[t];n(s);)s=this._appendBlockToChain(i,s,e);(s=a(o=n(e)?e:r(e)?e.default?e.default:null:e)?[o]:o)&&this._appendBlockToChain(i,s,null),this._localeChainCache[t]=i}return i},et.prototype._translate=function(t,e,n,r,a,i,o){for(var s,c=this._getLocaleChain(e,n),u=0;u<c.length;u++){var h=c[u];if(!l(s=this._interpolate(h,t[h],r,a,i,o,[r])))return s}return null},et.prototype._t=function(t,e,n,r){for(var a,i=[],o=arguments.length-4;o-- >0;)i[o]=arguments[o+4];if(!t)return"";var s=c.apply(void 0,i),l=s.locale||e,u=this._translate(n,l,this.fallbackLocale,t,r,"string",s.params);if(this._isFallbackRoot(u)){if(!this._root)throw Error("unexpected error");return(a=this._root).$t.apply(a,[t].concat(i))}return u=this._warnDefault(l,t,u,r,i,"string"),this._postTranslation&&null!=u&&(u=this._postTranslation(u,t)),u},et.prototype.t=function(t){for(var e,n=[],r=arguments.length-1;r-- >0;)n[r]=arguments[r+1];return(e=this)._t.apply(e,[t,this.locale,this._getMessages(),null].concat(n))},et.prototype._i=function(t,e,n,r,a){var i=this._translate(n,e,this.fallbackLocale,t,r,"raw",a);if(this._isFallbackRoot(i)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.i(t,e,a)}return this._warnDefault(e,t,i,r,[a],"raw")},et.prototype.i=function(t,e,n){return t?(a(e)||(e=this.locale),this._i(t,e,this._getMessages(),null,n)):""},et.prototype._tc=function(t,e,n,r,a){for(var i,o=[],s=arguments.length-5;s-- >0;)o[s]=arguments[s+5];if(!t)return"";void 0===a&&(a=1);var l={count:a,n:a},u=c.apply(void 0,o);return u.params=Object.assign(l,u.params),o=null===u.locale?[u.params]:[u.locale,u.params],this.fetchChoice((i=this)._t.apply(i,[t,e,n,r].concat(o)),a)},et.prototype.fetchChoice=function(t,e){if(!t&&!a(t))return null;var n=t.split("|");return n[e=this.getChoiceIndex(e,n.length)]?n[e].trim():t},et.prototype.tc=function(t,e){for(var n,r=[],a=arguments.length-2;a-- >0;)r[a]=arguments[a+2];return(n=this)._tc.apply(n,[t,this.locale,this._getMessages(),null,e].concat(r))},et.prototype._te=function(t,e,n){for(var r=[],a=arguments.length-3;a-- >0;)r[a]=arguments[a+3];var i=c.apply(void 0,r).locale||e;return this._exist(n[i],t)},et.prototype.te=function(t,e){return this._te(t,this.locale,this._getMessages(),e)},et.prototype.getLocaleMessage=function(t){return u(this._vm.messages[t]||{})},et.prototype.setLocaleMessage=function(t,e){"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||this._checkLocaleMessage(t,this._warnHtmlInMessage,e),this._vm.$set(this._vm.messages,t,e)},et.prototype.mergeLocaleMessage=function(t,e){"warn"!==this._warnHtmlInMessage&&"error"!==this._warnHtmlInMessage||this._checkLocaleMessage(t,this._warnHtmlInMessage,e),this._vm.$set(this._vm.messages,t,m({},this._vm.messages[t]||{},e))},et.prototype.getDateTimeFormat=function(t){return u(this._vm.dateTimeFormats[t]||{})},et.prototype.setDateTimeFormat=function(t,e){this._vm.$set(this._vm.dateTimeFormats,t,e),this._clearDateTimeFormat(t,e)},et.prototype.mergeDateTimeFormat=function(t,e){this._vm.$set(this._vm.dateTimeFormats,t,m(this._vm.dateTimeFormats[t]||{},e)),this._clearDateTimeFormat(t,e)},et.prototype._clearDateTimeFormat=function(t,e){for(var n in e){var r=t+"__"+n;this._dateTimeFormatters.hasOwnProperty(r)&&delete this._dateTimeFormatters[r]}},et.prototype._localizeDateTime=function(t,e,n,r,a){for(var i=e,o=r[i],s=this._getLocaleChain(e,n),c=0;c<s.length;c++){var u=s[c];if(i=u,!l(o=r[u])&&!l(o[a]))break}if(l(o)||l(o[a]))return null;var h=o[a],f=i+"__"+a,p=this._dateTimeFormatters[f];return p||(p=this._dateTimeFormatters[f]=new Intl.DateTimeFormat(i,h)),p.format(t)},et.prototype._d=function(t,e,n){if(!n)return new Intl.DateTimeFormat(e).format(t);var r=this._localizeDateTime(t,e,this.fallbackLocale,this._getDateTimeFormats(),n);if(this._isFallbackRoot(r)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.d(t,n,e)}return r||""},et.prototype.d=function(t){for(var e=[],n=arguments.length-1;n-- >0;)e[n]=arguments[n+1];var i=this.locale,o=null;return 1===e.length?a(e[0])?o=e[0]:r(e[0])&&(e[0].locale&&(i=e[0].locale),e[0].key&&(o=e[0].key)):2===e.length&&(a(e[0])&&(o=e[0]),a(e[1])&&(i=e[1])),this._d(t,i,o)},et.prototype.getNumberFormat=function(t){return u(this._vm.numberFormats[t]||{})},et.prototype.setNumberFormat=function(t,e){this._vm.$set(this._vm.numberFormats,t,e),this._clearNumberFormat(t,e)},et.prototype.mergeNumberFormat=function(t,e){this._vm.$set(this._vm.numberFormats,t,m(this._vm.numberFormats[t]||{},e)),this._clearNumberFormat(t,e)},et.prototype._clearNumberFormat=function(t,e){for(var n in e){var r=t+"__"+n;this._numberFormatters.hasOwnProperty(r)&&delete this._numberFormatters[r]}},et.prototype._getNumberFormatter=function(t,e,n,r,a,i){for(var o=e,s=r[o],c=this._getLocaleChain(e,n),u=0;u<c.length;u++){var h=c[u];if(o=h,!l(s=r[h])&&!l(s[a]))break}if(l(s)||l(s[a]))return null;var f,p=s[a];if(i)f=new Intl.NumberFormat(o,Object.assign({},p,i));else{var m=o+"__"+a;(f=this._numberFormatters[m])||(f=this._numberFormatters[m]=new Intl.NumberFormat(o,p))}return f},et.prototype._n=function(t,e,n,r){if(!et.availabilities.numberFormat)return"";if(!n)return(r?new Intl.NumberFormat(e,r):new Intl.NumberFormat(e)).format(t);var a=this._getNumberFormatter(t,e,this.fallbackLocale,this._getNumberFormats(),n,r),i=a&&a.format(t);if(this._isFallbackRoot(i)){if(!this._root)throw Error("unexpected error");return this._root.$i18n.n(t,Object.assign({},{key:n,locale:e},r))}return i||""},et.prototype.n=function(e){for(var n=[],i=arguments.length-1;i-- >0;)n[i]=arguments[i+1];var o=this.locale,s=null,l=null;return 1===n.length?a(n[0])?s=n[0]:r(n[0])&&(n[0].locale&&(o=n[0].locale),n[0].key&&(s=n[0].key),l=Object.keys(n[0]).reduce(function(e,r){var a;return h(t,r)?Object.assign({},e,((a={})[r]=n[0][r],a)):e},null)):2===n.length&&(a(n[0])&&(s=n[0]),a(n[1])&&(o=n[1])),this._n(e,o,s,l)},et.prototype._ntp=function(t,e,n,r){if(!et.availabilities.numberFormat)return[];if(!n)return(r?new Intl.NumberFormat(e,r):new Intl.NumberFormat(e)).formatToParts(t);var a=this._getNumberFormatter(t,e,this.fallbackLocale,this._getNumberFormats(),n,r),i=a&&a.formatToParts(t);if(this._isFallbackRoot(i)){if(!this._root)throw Error("unexpected error");return this._root.$i18n._ntp(t,e,n,r)}return i||[]},Object.defineProperties(et.prototype,nt),Object.defineProperty(et,"availabilities",{get:function(){if(!G){var t="undefined"!=typeof Intl;G={dateTimeFormat:t&&void 0!==Intl.DateTimeFormat,numberFormat:t&&void 0!==Intl.NumberFormat}}return G}}),et.install=I,et.version="8.20.0",et},"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.VueI18n=e();
\ No newline at end of file
diff --git a/node_modules/vue-i18n/package.json b/node_modules/vue-i18n/package.json
new file mode 100644
index 0000000..42cd7ae
--- /dev/null
+++ b/node_modules/vue-i18n/package.json
@@ -0,0 +1,176 @@
+{
+  "_args": [
+    [
+      "vue-i18n@8.20.0",
+      "C:\\Users\\Administrator\\Documents\\HBuilderProjects\\uView示例"
+    ]
+  ],
+  "_from": "vue-i18n@8.20.0",
+  "_id": "vue-i18n@8.20.0",
+  "_inBundle": false,
+  "_integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg==",
+  "_location": "/vue-i18n",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "vue-i18n@8.20.0",
+    "name": "vue-i18n",
+    "escapedName": "vue-i18n",
+    "rawSpec": "8.20.0",
+    "saveSpec": null,
+    "fetchSpec": "8.20.0"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
+  "_spec": "8.20.0",
+  "_where": "C:\\Users\\Administrator\\Documents\\HBuilderProjects\\uView示例",
+  "author": {
+    "name": "kazuya kawaguchi",
+    "email": "kawakazu80@gmail.com"
+  },
+  "bugs": {
+    "url": "https://github.com/kazupon/vue-i18n/issues"
+  },
+  "changelog": {
+    "labels": {
+      "Type: Feature": ":star: New Features",
+      "Type: Bug": ":bug: Bug Fixes",
+      "Type: Security": ":lock: Security Fixes",
+      "Type: Performance": ":chart_with_upwards_trend: Performance Fixes",
+      "Type: Improvement": ":zap: Improved Features",
+      "Type: Breaking": ":boom: Breaking Change",
+      "Type: Deprecated": ":warning: Deprecated Features",
+      "Type: I18n": ":globe_with_meridians: Internationalization",
+      "Type: A11y": ":wheelchair: Accessibility",
+      "Type: Documentation": ":pencil: Documentation"
+    }
+  },
+  "description": "Internationalization plugin for Vue.js",
+  "devDependencies": {
+    "@babel/core": "^7.1.0",
+    "@babel/plugin-proposal-class-properties": "^7.1.0",
+    "@babel/plugin-syntax-flow": "^7.0.0",
+    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^3.0.0",
+    "@typescript-eslint/parser": "^3.0.0",
+    "@vue/babel-preset-app": "^4.4.1",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.1.0",
+    "babel-plugin-istanbul": "^6.0.0",
+    "babel-preset-power-assert": "^3.0.0",
+    "buble": "^0.19.3",
+    "chromedriver": "^83.0.0",
+    "core-js": "^3.6.5",
+    "cross-env": "^7.0.2",
+    "cross-spawn": "^7.0.3",
+    "eslint": "^6.8.0",
+    "eslint-loader": "^4.0.2",
+    "eslint-plugin-flowtype": "^4.7.0",
+    "eslint-plugin-ie11": "^1.0.0",
+    "eslint-plugin-no-autofix": "^1.0.1",
+    "eslint-plugin-vue": "^6.2.2",
+    "eslint-plugin-vue-libs": "^4.0.0",
+    "flow-bin": "^0.38.0",
+    "http-server": "^0.12.3",
+    "intl": "^1.2.5",
+    "karma": "^5.0.9",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-coverage": "^2.0.2",
+    "karma-firefox-launcher": "^1.1.0",
+    "karma-mocha": "^2.0.1",
+    "karma-mocha-reporter": "^2.2.5",
+    "karma-safari-launcher": "^1.0.0",
+    "karma-sauce-launcher": "^4.1.5",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^4.0.2",
+    "lerna-changelog": "^1.0.0",
+    "lerna-changelog-label-schema": "^3.0.0",
+    "mocha": "^7.2.0",
+    "mocha-loader": "^5.0.0",
+    "nightwatch": "^1.3.5",
+    "nightwatch-helpers": "^1.2.0",
+    "power-assert": "^1.6.0",
+    "rollup": "^0.66.0",
+    "rollup-plugin-buble": "^0.19.2",
+    "rollup-plugin-commonjs": "^9.1.8",
+    "rollup-plugin-flow-no-whitespace": "^1.0.0",
+    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-replace": "^2.0.0",
+    "selenium-server": "^3.141.59",
+    "shipjs": "^0.17.0",
+    "sinon": "^9.0.2",
+    "terser": "^3.17.0",
+    "typescript": "^3.9.3",
+    "vue": "^2.5.17",
+    "vue-github-button": "^1.1.2",
+    "vue-template-compiler": "^2.5.17",
+    "vuepress": "^1.5.0",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.1.1",
+    "webpack-dev-middleware": "^3.7.2",
+    "webpack-dev-server": "^3.11.0"
+  },
+  "files": [
+    "dist/vue-i18n.js",
+    "dist/vue-i18n.min.js",
+    "dist/vue-i18n.common.js",
+    "dist/vue-i18n.esm.js",
+    "dist/vue-i18n.esm.browser.js",
+    "dist/vue-i18n.esm.browser.min.js",
+    "src/**/*.js",
+    "types/*.d.ts",
+    "decls",
+    "vetur/tags.json",
+    "vetur/attributes.json"
+  ],
+  "homepage": "https://github.com/kazupon/vue-i18n#readme",
+  "keywords": [
+    "i18n",
+    "internationalization",
+    "plugin",
+    "vue",
+    "vue.js"
+  ],
+  "license": "MIT",
+  "main": "dist/vue-i18n.common.js",
+  "module": "dist/vue-i18n.esm.js",
+  "name": "vue-i18n",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kazupon/vue-i18n.git"
+  },
+  "scripts": {
+    "build": "node config/build.js",
+    "clean": "rm -rf coverage && rm -rf dist/*.js* && rm ./*.log",
+    "coverage": "cat ./coverage/lcov.info",
+    "dev": "cross-env BABEL_ENV=test webpack-dev-server --inline --hot --open --content-base ./test/unit/ --config config/webpack.dev.conf.js",
+    "docs:build": "cross-env NODE_ENV=production node config/version.js && cross-env NODE_ENV=production vuepress build vuepress -d docs",
+    "docs:clean": "rm -rf docs/**",
+    "docs:dev": "vuepress dev vuepress",
+    "flow": "flow check",
+    "lint": "eslint --fix src test types/**/*.ts",
+    "release:prepare": "shipjs prepare",
+    "release:trigger": "shipjs trigger",
+    "sauce": "npm run sauce:coolkids && npm run sauce:ie && npm run sauce:mobile",
+    "sauce:coolkids": "karma start config/karma.sauce.conf.js -- 0",
+    "sauce:ie": "karma start config/karma.sauce.conf.js -- 1",
+    "sauce:mobile": "karma start config/karma.sauce.conf.js -- 2",
+    "test": "npm run lint && npm run flow && npm run test:types && npm run test:cover && npm run test:e2e",
+    "test:cover": "cross-env BABEL_ENV=test karma start config/karma.cover.conf.js",
+    "test:e2e": "npm run build && node test/e2e/runner.js",
+    "test:types": "tsc -p types",
+    "test:unit": "cross-env BABEL_ENV=test karma start config/karma.unit.conf.js",
+    "test:unit:ci": "cross-env BABEL_ENV=test karma start config/karma.unit.ci.conf.js"
+  },
+  "sideEffects": false,
+  "types": "types/index.d.ts",
+  "unpkg": "dist/vue-i18n.js",
+  "version": "8.20.0",
+  "vetur": {
+    "tags": "vetur/tags.json",
+    "attributes": "vetur/attributes.json"
+  }
+}
diff --git a/node_modules/vue-i18n/src/components/interpolation.js b/node_modules/vue-i18n/src/components/interpolation.js
new file mode 100644
index 0000000..7d31457
--- /dev/null
+++ b/node_modules/vue-i18n/src/components/interpolation.js
@@ -0,0 +1,101 @@
+/* @flow */
+
+import { warn } from '../util'
+
+export default {
+  name: 'i18n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    path: {
+      type: String,
+      required: true
+    },
+    locale: {
+      type: String
+    },
+    places: {
+      type: [Array, Object]
+    }
+  },
+  render (h: Function, { data, parent, props, slots }: Object) {
+    const { $i18n } = parent
+    if (!$i18n) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot find VueI18n instance!')
+      }
+      return
+    }
+
+    const { path, locale, places } = props
+    const params = slots()
+    const children = $i18n.i(
+      path,
+      locale,
+      onlyHasDefaultPlace(params) || places
+        ? useLegacyPlaces(params.default, places)
+        : params
+    )
+
+    const tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span'
+    return tag ? h(tag, data, children) : children
+  }
+}
+
+function onlyHasDefaultPlace (params) {
+  let prop
+  for (prop in params) {
+    if (prop !== 'default') { return false }
+  }
+  return Boolean(prop)
+}
+
+function useLegacyPlaces (children, places) {
+  const params = places ? createParamsFromPlaces(places) : {}
+
+  if (!children) { return params }
+
+  // Filter empty text nodes
+  children = children.filter(child => {
+    return child.tag || child.text.trim() !== ''
+  })
+
+  const everyPlace = children.every(vnodeHasPlaceAttribute)
+  if (process.env.NODE_ENV !== 'production' && everyPlace) {
+    warn('`place` attribute is deprecated in next major version. Please switch to Vue slots.')
+  }
+
+  return children.reduce(
+    everyPlace ? assignChildPlace : assignChildIndex,
+    params
+  )
+}
+
+function createParamsFromPlaces (places) {
+  if (process.env.NODE_ENV !== 'production') {
+    warn('`places` prop is deprecated in next major version. Please switch to Vue slots.')
+  }
+
+  return Array.isArray(places)
+    ? places.reduce(assignChildIndex, {})
+    : Object.assign({}, places)
+}
+
+function assignChildPlace (params, child) {
+  if (child.data && child.data.attrs && child.data.attrs.place) {
+    params[child.data.attrs.place] = child
+  }
+  return params
+}
+
+function assignChildIndex (params, child, index) {
+  params[index] = child
+  return params
+}
+
+function vnodeHasPlaceAttribute (vnode) {
+  return Boolean(vnode.data && vnode.data.attrs && vnode.data.attrs.place)
+}
diff --git a/node_modules/vue-i18n/src/components/number.js b/node_modules/vue-i18n/src/components/number.js
new file mode 100644
index 0000000..bb7c6ff
--- /dev/null
+++ b/node_modules/vue-i18n/src/components/number.js
@@ -0,0 +1,70 @@
+/* @flow */
+
+import { warn, isString, isObject, includes, numberFormatKeys } from '../util'
+
+export default {
+  name: 'i18n-n',
+  functional: true,
+  props: {
+    tag: {
+      type: [String, Boolean, Object],
+      default: 'span'
+    },
+    value: {
+      type: Number,
+      required: true
+    },
+    format: {
+      type: [String, Object]
+    },
+    locale: {
+      type: String
+    }
+  },
+  render (h: Function, { props, parent, data }: Object) {
+    const i18n = parent.$i18n
+
+    if (!i18n) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot find VueI18n instance!')
+      }
+      return null
+    }
+
+    let key: ?string = null
+    let options: ?NumberFormatOptions = null
+
+    if (isString(props.format)) {
+      key = props.format
+    } else if (isObject(props.format)) {
+      if (props.format.key) {
+        key = props.format.key
+      }
+
+      // Filter out number format options only
+      options = Object.keys(props.format).reduce((acc, prop) => {
+        if (includes(numberFormatKeys, prop)) {
+          return Object.assign({}, acc, { [prop]: props.format[prop] })
+        }
+        return acc
+      }, null)
+    }
+
+    const locale: Locale = props.locale || i18n.locale
+    const parts: NumberFormatToPartsResult = i18n._ntp(props.value, locale, key, options)
+
+    const values = parts.map((part, index) => {
+      const slot: ?Function = data.scopedSlots && data.scopedSlots[part.type]
+      return slot ? slot({ [part.type]: part.value, index, parts }) : part.value
+    })
+
+    const tag = (!!props.tag && props.tag !== true) || props.tag === false ? props.tag : 'span'
+    return tag
+      ? h(tag, {
+        attrs: data.attrs,
+        'class': data['class'],
+        staticClass: data.staticClass
+      }, values)
+      : values
+  }
+}
diff --git a/node_modules/vue-i18n/src/directive.js b/node_modules/vue-i18n/src/directive.js
new file mode 100644
index 0000000..ea1b2a8
--- /dev/null
+++ b/node_modules/vue-i18n/src/directive.js
@@ -0,0 +1,112 @@
+/* @flow */
+
+import { warn, isString, isPlainObject, looseEqual } from './util'
+
+export function bind (el: any, binding: Object, vnode: any): void {
+  if (!assert(el, vnode)) { return }
+
+  t(el, binding, vnode)
+}
+
+export function update (el: any, binding: Object, vnode: any, oldVNode: any): void {
+  if (!assert(el, vnode)) { return }
+
+  const i18n: any = vnode.context.$i18n
+  if (localeEqual(el, vnode) &&
+    (looseEqual(binding.value, binding.oldValue) &&
+     looseEqual(el._localeMessage, i18n.getLocaleMessage(i18n.locale)))) { return }
+
+  t(el, binding, vnode)
+}
+
+export function unbind (el: any, binding: Object, vnode: any, oldVNode: any): void {
+  const vm: any = vnode.context
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context')
+    return
+  }
+
+  const i18n: any = vnode.context.$i18n || {}
+  if (!binding.modifiers.preserve && !i18n.preserveDirectiveContent) {
+    el.textContent = ''
+  }
+  el._vt = undefined
+  delete el['_vt']
+  el._locale = undefined
+  delete el['_locale']
+  el._localeMessage = undefined
+  delete el['_localeMessage']
+}
+
+function assert (el: any, vnode: any): boolean {
+  const vm: any = vnode.context
+  if (!vm) {
+    warn('Vue instance does not exists in VNode context')
+    return false
+  }
+
+  if (!vm.$i18n) {
+    warn('VueI18n instance does not exists in Vue instance')
+    return false
+  }
+
+  return true
+}
+
+function localeEqual (el: any, vnode: any): boolean {
+  const vm: any = vnode.context
+  return el._locale === vm.$i18n.locale
+}
+
+function t (el: any, binding: Object, vnode: any): void {
+  const value: any = binding.value
+
+  const { path, locale, args, choice } = parseValue(value)
+  if (!path && !locale && !args) {
+    warn('value type not supported')
+    return
+  }
+
+  if (!path) {
+    warn('`path` is required in v-t directive')
+    return
+  }
+
+  const vm: any = vnode.context
+  if (choice != null) {
+    el._vt = el.textContent = vm.$i18n.tc(path, choice, ...makeParams(locale, args))
+  } else {
+    el._vt = el.textContent = vm.$i18n.t(path, ...makeParams(locale, args))
+  }
+  el._locale = vm.$i18n.locale
+  el._localeMessage = vm.$i18n.getLocaleMessage(vm.$i18n.locale)
+}
+
+function parseValue (value: any): Object {
+  let path: ?string
+  let locale: ?Locale
+  let args: any
+  let choice: ?number
+
+  if (isString(value)) {
+    path = value
+  } else if (isPlainObject(value)) {
+    path = value.path
+    locale = value.locale
+    args = value.args
+    choice = value.choice
+  }
+
+  return { path, locale, args, choice }
+}
+
+function makeParams (locale: Locale, args: any): Array<any> {
+  const params: Array<any> = []
+
+  locale && params.push(locale)
+  if (args && (Array.isArray(args) || isPlainObject(args))) {
+    params.push(args)
+  }
+
+  return params
+}
diff --git a/node_modules/vue-i18n/src/extend.js b/node_modules/vue-i18n/src/extend.js
new file mode 100644
index 0000000..c845d7c
--- /dev/null
+++ b/node_modules/vue-i18n/src/extend.js
@@ -0,0 +1,33 @@
+/* @flow */
+
+export default function extend (Vue: any): void {
+  if (!Vue.prototype.hasOwnProperty('$i18n')) {
+    // $FlowFixMe
+    Object.defineProperty(Vue.prototype, '$i18n', {
+      get () { return this._i18n }
+    })
+  }
+
+  Vue.prototype.$t = function (key: Path, ...values: any): TranslateResult {
+    const i18n = this.$i18n
+    return i18n._t(key, i18n.locale, i18n._getMessages(), this, ...values)
+  }
+
+  Vue.prototype.$tc = function (key: Path, choice?: number, ...values: any): TranslateResult {
+    const i18n = this.$i18n
+    return i18n._tc(key, i18n.locale, i18n._getMessages(), this, choice, ...values)
+  }
+
+  Vue.prototype.$te = function (key: Path, locale?: Locale): boolean {
+    const i18n = this.$i18n
+    return i18n._te(key, i18n.locale, i18n._getMessages(), locale)
+  }
+
+  Vue.prototype.$d = function (value: number | Date, ...args: any): DateTimeFormatResult {
+    return this.$i18n.d(value, ...args)
+  }
+
+  Vue.prototype.$n = function (value: number, ...args: any): NumberFormatResult {
+    return this.$i18n.n(value, ...args)
+  }
+}
diff --git a/node_modules/vue-i18n/src/format.js b/node_modules/vue-i18n/src/format.js
new file mode 100644
index 0000000..5b26d11
--- /dev/null
+++ b/node_modules/vue-i18n/src/format.js
@@ -0,0 +1,114 @@
+/* @flow */
+
+import { warn, isObject } from './util'
+
+export default class BaseFormatter {
+  _caches: { [key: string]: Array<Token> }
+
+  constructor () {
+    this._caches = Object.create(null)
+  }
+
+  interpolate (message: string, values: any): Array<any> {
+    if (!values) {
+      return [message]
+    }
+    let tokens: Array<Token> = this._caches[message]
+    if (!tokens) {
+      tokens = parse(message)
+      this._caches[message] = tokens
+    }
+    return compile(tokens, values)
+  }
+}
+
+type Token = {
+  type: 'text' | 'named' | 'list' | 'unknown',
+  value: string
+}
+
+const RE_TOKEN_LIST_VALUE: RegExp = /^(?:\d)+/
+const RE_TOKEN_NAMED_VALUE: RegExp = /^(?:\w)+/
+
+export function parse (format: string): Array<Token> {
+  const tokens: Array<Token> = []
+  let position: number = 0
+
+  let text: string = ''
+  while (position < format.length) {
+    let char: string = format[position++]
+    if (char === '{') {
+      if (text) {
+        tokens.push({ type: 'text', value: text })
+      }
+
+      text = ''
+      let sub: string = ''
+      char = format[position++]
+      while (char !== undefined && char !== '}') {
+        sub += char
+        char = format[position++]
+      }
+      const isClosed = char === '}'
+
+      const type = RE_TOKEN_LIST_VALUE.test(sub)
+        ? 'list'
+        : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
+          ? 'named'
+          : 'unknown'
+      tokens.push({ value: sub, type })
+    } else if (char === '%') {
+      // when found rails i18n syntax, skip text capture
+      if (format[(position)] !== '{') {
+        text += char
+      }
+    } else {
+      text += char
+    }
+  }
+
+  text && tokens.push({ type: 'text', value: text })
+
+  return tokens
+}
+
+export function compile (tokens: Array<Token>, values: Object | Array<any>): Array<any> {
+  const compiled: Array<any> = []
+  let index: number = 0
+
+  const mode: string = Array.isArray(values)
+    ? 'list'
+    : isObject(values)
+      ? 'named'
+      : 'unknown'
+  if (mode === 'unknown') { return compiled }
+
+  while (index < tokens.length) {
+    const token: Token = tokens[index]
+    switch (token.type) {
+      case 'text':
+        compiled.push(token.value)
+        break
+      case 'list':
+        compiled.push(values[parseInt(token.value, 10)])
+        break
+      case 'named':
+        if (mode === 'named') {
+          compiled.push((values: any)[token.value])
+        } else {
+          if (process.env.NODE_ENV !== 'production') {
+            warn(`Type of token '${token.type}' and format of value '${mode}' don't match!`)
+          }
+        }
+        break
+      case 'unknown':
+        if (process.env.NODE_ENV !== 'production') {
+          warn(`Detect 'unknown' type of token!`)
+        }
+        break
+    }
+    index++
+  }
+
+  return compiled
+}
diff --git a/node_modules/vue-i18n/src/index.js b/node_modules/vue-i18n/src/index.js
new file mode 100644
index 0000000..c5f6ed4
--- /dev/null
+++ b/node_modules/vue-i18n/src/index.js
@@ -0,0 +1,1049 @@
+/* @flow */
+
+import { install, Vue } from './install'
+import {
+  warn,
+  error,
+  isNull,
+  parseArgs,
+  isPlainObject,
+  isObject,
+  isArray,
+  isBoolean,
+  isString,
+  looseClone,
+  remove,
+  includes,
+  merge,
+  numberFormatKeys
+} from './util'
+import BaseFormatter from './format'
+import I18nPath from './path'
+
+import type { PathValue } from './path'
+
+const htmlTagMatcher = /<\/?[\w\s="/.':;#-\/]+>/
+const linkKeyMatcher = /(?:@(?:\.[a-z]+)?:(?:[\w\-_|.]+|\([\w\-_|.]+\)))/g
+const linkKeyPrefixMatcher = /^@(?:\.([a-z]+))?:/
+const bracketsMatcher = /[()]/g
+const defaultModifiers = {
+  'upper': str => str.toLocaleUpperCase(),
+  'lower': str => str.toLocaleLowerCase(),
+  'capitalize': str => `${str.charAt(0).toLocaleUpperCase()}${str.substr(1)}`
+}
+
+const defaultFormatter = new BaseFormatter()
+
+export default class VueI18n {
+  static install: () => void
+  static version: string
+  static availabilities: IntlAvailability
+
+  _vm: any
+  _formatter: Formatter
+  _modifiers: Modifiers
+  _root: any
+  _sync: boolean
+  _fallbackRoot: boolean
+  _localeChainCache: { [key: string]: Array<Locale>; }
+  _missing: ?MissingHandler
+  _exist: Function
+  _silentTranslationWarn: boolean | RegExp
+  _silentFallbackWarn: boolean | RegExp
+  _formatFallbackMessages: boolean
+  _dateTimeFormatters: Object
+  _numberFormatters: Object
+  _path: I18nPath
+  _dataListeners: Array<any>
+  _componentInstanceCreatedListener: ?ComponentInstanceCreatedListener
+  _preserveDirectiveContent: boolean
+  _warnHtmlInMessage: WarnHtmlInMessageLevel
+  _postTranslation: ?PostTranslationHandler
+  pluralizationRules: {
+    [lang: string]: (choice: number, choicesLength: number) => number
+  }
+  getChoiceIndex: GetChoiceIndex
+
+  constructor (options: I18nOptions = {}) {
+    // Auto install if it is not done yet and `window` has `Vue`.
+    // To allow users to avoid auto-installation in some cases,
+    // this code should be placed here. See #290
+    /* istanbul ignore if */
+    if (!Vue && typeof window !== 'undefined' && window.Vue) {
+      install(window.Vue)
+    }
+
+    const locale: Locale = options.locale || 'en-US'
+    const fallbackLocale: FallbackLocale = options.fallbackLocale === false
+      ? false
+      : options.fallbackLocale || 'en-US'
+    const messages: LocaleMessages = options.messages || {}
+    const dateTimeFormats = options.dateTimeFormats || {}
+    const numberFormats = options.numberFormats || {}
+
+    this._vm = null
+    this._formatter = options.formatter || defaultFormatter
+    this._modifiers = options.modifiers || {}
+    this._missing = options.missing || null
+    this._root = options.root || null
+    this._sync = options.sync === undefined ? true : !!options.sync
+    this._fallbackRoot = options.fallbackRoot === undefined
+      ? true
+      : !!options.fallbackRoot
+    this._formatFallbackMessages = options.formatFallbackMessages === undefined
+      ? false
+      : !!options.formatFallbackMessages
+    this._silentTranslationWarn = options.silentTranslationWarn === undefined
+      ? false
+      : options.silentTranslationWarn
+    this._silentFallbackWarn = options.silentFallbackWarn === undefined
+      ? false
+      : !!options.silentFallbackWarn
+    this._dateTimeFormatters = {}
+    this._numberFormatters = {}
+    this._path = new I18nPath()
+    this._dataListeners = []
+    this._componentInstanceCreatedListener = options.componentInstanceCreatedListener || null
+    this._preserveDirectiveContent = options.preserveDirectiveContent === undefined
+      ? false
+      : !!options.preserveDirectiveContent
+    this.pluralizationRules = options.pluralizationRules || {}
+    this._warnHtmlInMessage = options.warnHtmlInMessage || 'off'
+    this._postTranslation = options.postTranslation || null
+
+    /**
+     * @param choice {number} a choice index given by the input to $tc: `$tc('path.to.rule', choiceIndex)`
+     * @param choicesLength {number} an overall amount of available choices
+     * @returns a final choice index
+    */
+    this.getChoiceIndex = (choice: number, choicesLength: number): number => {
+      const thisPrototype = Object.getPrototypeOf(this)
+      if (thisPrototype && thisPrototype.getChoiceIndex) {
+        const prototypeGetChoiceIndex = (thisPrototype.getChoiceIndex: any)
+        return (prototypeGetChoiceIndex: GetChoiceIndex).call(this, choice, choicesLength)
+      }
+
+      // Default (old) getChoiceIndex implementation - english-compatible
+      const defaultImpl = (_choice: number, _choicesLength: number) => {
+        _choice = Math.abs(_choice)
+
+        if (_choicesLength === 2) {
+          return _choice
+            ? _choice > 1
+              ? 1
+              : 0
+            : 1
+        }
+
+        return _choice ? Math.min(_choice, 2) : 0
+      }
+
+      if (this.locale in this.pluralizationRules) {
+        return this.pluralizationRules[this.locale].apply(this, [choice, choicesLength])
+      } else {
+        return defaultImpl(choice, choicesLength)
+      }
+    }
+
+
+    this._exist = (message: Object, key: Path): boolean => {
+      if (!message || !key) { return false }
+      if (!isNull(this._path.getPathValue(message, key))) { return true }
+      // fallback for flat key
+      if (message[key]) { return true }
+      return false
+    }
+
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      Object.keys(messages).forEach(locale => {
+        this._checkLocaleMessage(locale, this._warnHtmlInMessage, messages[locale])
+      })
+    }
+
+    this._initVM({
+      locale,
+      fallbackLocale,
+      messages,
+      dateTimeFormats,
+      numberFormats
+    })
+  }
+
+  _checkLocaleMessage (locale: Locale, level: WarnHtmlInMessageLevel, message: LocaleMessageObject): void {
+    const paths: Array<string> = []
+
+    const fn = (level: WarnHtmlInMessageLevel, locale: Locale, message: any, paths: Array<string>) => {
+      if (isPlainObject(message)) {
+        Object.keys(message).forEach(key => {
+          const val = message[key]
+          if (isPlainObject(val)) {
+            paths.push(key)
+            paths.push('.')
+            fn(level, locale, val, paths)
+            paths.pop()
+            paths.pop()
+          } else {
+            paths.push(key)
+            fn(level, locale, val, paths)
+            paths.pop()
+          }
+        })
+      } else if (Array.isArray(message)) {
+        message.forEach((item, index) => {
+          if (isPlainObject(item)) {
+            paths.push(`[${index}]`)
+            paths.push('.')
+            fn(level, locale, item, paths)
+            paths.pop()
+            paths.pop()
+          } else {
+            paths.push(`[${index}]`)
+            fn(level, locale, item, paths)
+            paths.pop()
+          }
+        })
+      } else if (isString(message)) {
+        const ret = htmlTagMatcher.test(message)
+        if (ret) {
+          const msg = `Detected HTML in message '${message}' of keypath '${paths.join('')}' at '${locale}'. Consider component interpolation with '<i18n>' to avoid XSS. See https://bit.ly/2ZqJzkp`
+          if (level === 'warn') {
+            warn(msg)
+          } else if (level === 'error') {
+            error(msg)
+          }
+        }
+      }
+    }
+
+    fn(level, locale, message, paths)
+  }
+
+  _initVM (data: {
+    locale: Locale,
+    fallbackLocale: FallbackLocale,
+    messages: LocaleMessages,
+    dateTimeFormats: DateTimeFormats,
+    numberFormats: NumberFormats
+  }): void {
+    const silent = Vue.config.silent
+    Vue.config.silent = true
+    this._vm = new Vue({ data })
+    Vue.config.silent = silent
+  }
+
+  destroyVM (): void {
+    this._vm.$destroy()
+  }
+
+  subscribeDataChanging (vm: any): void {
+    this._dataListeners.push(vm)
+  }
+
+  unsubscribeDataChanging (vm: any): void {
+    remove(this._dataListeners, vm)
+  }
+
+  watchI18nData (): Function {
+    const self = this
+    return this._vm.$watch('$data', () => {
+      let i = self._dataListeners.length
+      while (i--) {
+        Vue.nextTick(() => {
+          self._dataListeners[i] && self._dataListeners[i].$forceUpdate()
+        })
+      }
+    }, { deep: true })
+  }
+
+  watchLocale (): ?Function {
+    /* istanbul ignore if */
+    if (!this._sync || !this._root) { return null }
+    const target: any = this._vm
+    return this._root.$i18n.vm.$watch('locale', (val) => {
+      target.$set(target, 'locale', val)
+      target.$forceUpdate()
+    }, { immediate: true })
+  }
+
+  onComponentInstanceCreated (newI18n: I18n) {
+    if (this._componentInstanceCreatedListener) {
+      this._componentInstanceCreatedListener(newI18n, this)
+    }
+  }
+
+  get vm (): any { return this._vm }
+
+  get messages (): LocaleMessages { return looseClone(this._getMessages()) }
+  get dateTimeFormats (): DateTimeFormats { return looseClone(this._getDateTimeFormats()) }
+  get numberFormats (): NumberFormats { return looseClone(this._getNumberFormats()) }
+  get availableLocales (): Locale[] { return Object.keys(this.messages).sort() }
+
+  get locale (): Locale { return this._vm.locale }
+  set locale (locale: Locale): void {
+    this._vm.$set(this._vm, 'locale', locale)
+  }
+
+  get fallbackLocale (): FallbackLocale { return this._vm.fallbackLocale }
+  set fallbackLocale (locale: FallbackLocale): void {
+    this._localeChainCache = {}
+    this._vm.$set(this._vm, 'fallbackLocale', locale)
+  }
+
+  get formatFallbackMessages (): boolean { return this._formatFallbackMessages }
+  set formatFallbackMessages (fallback: boolean): void { this._formatFallbackMessages = fallback }
+
+  get missing (): ?MissingHandler { return this._missing }
+  set missing (handler: MissingHandler): void { this._missing = handler }
+
+  get formatter (): Formatter { return this._formatter }
+  set formatter (formatter: Formatter): void { this._formatter = formatter }
+
+  get silentTranslationWarn (): boolean | RegExp { return this._silentTranslationWarn }
+  set silentTranslationWarn (silent: boolean | RegExp): void { this._silentTranslationWarn = silent }
+
+  get silentFallbackWarn (): boolean | RegExp { return this._silentFallbackWarn }
+  set silentFallbackWarn (silent: boolean | RegExp): void { this._silentFallbackWarn = silent }
+
+  get preserveDirectiveContent (): boolean { return this._preserveDirectiveContent }
+  set preserveDirectiveContent (preserve: boolean): void { this._preserveDirectiveContent = preserve }
+
+  get warnHtmlInMessage (): WarnHtmlInMessageLevel { return this._warnHtmlInMessage }
+  set warnHtmlInMessage (level: WarnHtmlInMessageLevel): void {
+    const orgLevel = this._warnHtmlInMessage
+    this._warnHtmlInMessage = level
+    if (orgLevel !== level && (level === 'warn' || level === 'error')) {
+      const messages = this._getMessages()
+      Object.keys(messages).forEach(locale => {
+        this._checkLocaleMessage(locale, this._warnHtmlInMessage, messages[locale])
+      })
+    }
+  }
+
+  get postTranslation (): ?PostTranslationHandler { return this._postTranslation }
+  set postTranslation (handler: PostTranslationHandler): void { this._postTranslation = handler }
+
+  _getMessages (): LocaleMessages { return this._vm.messages }
+  _getDateTimeFormats (): DateTimeFormats { return this._vm.dateTimeFormats }
+  _getNumberFormats (): NumberFormats { return this._vm.numberFormats }
+
+  _warnDefault (locale: Locale, key: Path, result: ?any, vm: ?any, values: any, interpolateMode: string): ?string {
+    if (!isNull(result)) { return result }
+    if (this._missing) {
+      const missingRet = this._missing.apply(null, [locale, key, vm, values])
+      if (isString(missingRet)) {
+        return missingRet
+      }
+    } else {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+        warn(
+          `Cannot translate the value of keypath '${key}'. ` +
+          'Use the value of keypath as default.'
+        )
+      }
+    }
+
+    if (this._formatFallbackMessages) {
+      const parsedArgs = parseArgs(...values)
+      return this._render(key, interpolateMode, parsedArgs.params, key)
+    } else {
+      return key
+    }
+  }
+
+  _isFallbackRoot (val: any): boolean {
+    return !val && !isNull(this._root) && this._fallbackRoot
+  }
+
+  _isSilentFallbackWarn (key: Path): boolean {
+    return this._silentFallbackWarn instanceof RegExp
+      ? this._silentFallbackWarn.test(key)
+      : this._silentFallbackWarn
+  }
+
+  _isSilentFallback (locale: Locale, key: Path): boolean {
+    return this._isSilentFallbackWarn(key) && (this._isFallbackRoot() || locale !== this.fallbackLocale)
+  }
+
+  _isSilentTranslationWarn (key: Path): boolean {
+    return this._silentTranslationWarn instanceof RegExp
+      ? this._silentTranslationWarn.test(key)
+      : this._silentTranslationWarn
+  }
+
+  _interpolate (
+    locale: Locale,
+    message: LocaleMessageObject,
+    key: Path,
+    host: any,
+    interpolateMode: string,
+    values: any,
+    visitedLinkStack: Array<string>
+  ): any {
+    if (!message) { return null }
+
+    const pathRet: PathValue = this._path.getPathValue(message, key)
+    if (Array.isArray(pathRet) || isPlainObject(pathRet)) { return pathRet }
+
+    let ret: mixed
+    if (isNull(pathRet)) {
+      /* istanbul ignore else */
+      if (isPlainObject(message)) {
+        ret = message[key]
+        if (!isString(ret)) {
+          if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+            warn(`Value of key '${key}' is not a string!`)
+          }
+          return null
+        }
+      } else {
+        return null
+      }
+    } else {
+      /* istanbul ignore else */
+      if (isString(pathRet)) {
+        ret = pathRet
+      } else {
+        if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallback(locale, key)) {
+          warn(`Value of key '${key}' is not a string!`)
+        }
+        return null
+      }
+    }
+
+    // Check for the existence of links within the translated string
+    if (ret.indexOf('@:') >= 0 || ret.indexOf('@.') >= 0) {
+      ret = this._link(locale, message, ret, host, 'raw', values, visitedLinkStack)
+    }
+
+    return this._render(ret, interpolateMode, values, key)
+  }
+
+  _link (
+    locale: Locale,
+    message: LocaleMessageObject,
+    str: string,
+    host: any,
+    interpolateMode: string,
+    values: any,
+    visitedLinkStack: Array<string>
+  ): any {
+    let ret: string = str
+
+    // Match all the links within the local
+    // We are going to replace each of
+    // them with its translation
+    const matches: any = ret.match(linkKeyMatcher)
+    for (let idx in matches) {
+      // ie compatible: filter custom array
+      // prototype method
+      if (!matches.hasOwnProperty(idx)) {
+        continue
+      }
+      const link: string = matches[idx]
+      const linkKeyPrefixMatches: any = link.match(linkKeyPrefixMatcher)
+      const [linkPrefix, formatterName] = linkKeyPrefixMatches
+
+      // Remove the leading @:, @.case: and the brackets
+      const linkPlaceholder: string = link.replace(linkPrefix, '').replace(bracketsMatcher, '')
+
+      if (includes(visitedLinkStack, linkPlaceholder)) {
+        if (process.env.NODE_ENV !== 'production') {
+          warn(`Circular reference found. "${link}" is already visited in the chain of ${visitedLinkStack.reverse().join(' <- ')}`)
+        }
+        return ret
+      }
+      visitedLinkStack.push(linkPlaceholder)
+
+      // Translate the link
+      let translated: any = this._interpolate(
+        locale, message, linkPlaceholder, host,
+        interpolateMode === 'raw' ? 'string' : interpolateMode,
+        interpolateMode === 'raw' ? undefined : values,
+        visitedLinkStack
+      )
+
+      if (this._isFallbackRoot(translated)) {
+        if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(linkPlaceholder)) {
+          warn(`Fall back to translate the link placeholder '${linkPlaceholder}' with root locale.`)
+        }
+        /* istanbul ignore if */
+        if (!this._root) { throw Error('unexpected error') }
+        const root: any = this._root.$i18n
+        translated = root._translate(
+          root._getMessages(), root.locale, root.fallbackLocale,
+          linkPlaceholder, host, interpolateMode, values
+        )
+      }
+      translated = this._warnDefault(
+        locale, linkPlaceholder, translated, host,
+        Array.isArray(values) ? values : [values],
+        interpolateMode
+      )
+
+      if (this._modifiers.hasOwnProperty(formatterName)) {
+        translated = this._modifiers[formatterName](translated)
+      } else if (defaultModifiers.hasOwnProperty(formatterName)) {
+        translated = defaultModifiers[formatterName](translated)
+      }
+
+      visitedLinkStack.pop()
+
+      // Replace the link with the translated
+      ret = !translated ? ret : ret.replace(link, translated)
+    }
+
+    return ret
+  }
+
+  _render (message: string, interpolateMode: string, values: any, path: string): any {
+    let ret = this._formatter.interpolate(message, values, path)
+
+    // If the custom formatter refuses to work - apply the default one
+    if (!ret) {
+      ret = defaultFormatter.interpolate(message, values, path)
+    }
+
+    // if interpolateMode is **not** 'string' ('row'),
+    // return the compiled data (e.g. ['foo', VNode, 'bar']) with formatter
+    return interpolateMode === 'string' && !isString(ret) ? ret.join('') : ret
+  }
+
+  _appendItemToChain (chain: Array<Locale>, item: Locale, blocks: any): any {
+    let follow = false
+    if (!includes(chain, item)) {
+      follow = true
+      if (item) {
+        follow = item[item.length - 1] !== '!'
+        item = item.replace(/!/g, '')
+        chain.push(item)
+        if (blocks && blocks[item]) {
+          follow = blocks[item]
+        }
+      }
+    }
+    return follow
+  }
+
+  _appendLocaleToChain (chain: Array<Locale>, locale: Locale, blocks: any): any {
+    let follow
+    const tokens = locale.split('-')
+    do {
+      const item = tokens.join('-')
+      follow = this._appendItemToChain(chain, item, blocks)
+      tokens.splice(-1, 1)
+    } while (tokens.length && (follow === true))
+    return follow
+  }
+
+  _appendBlockToChain (chain: Array<Locale>, block: Array<Locale> | Object, blocks: any): any {
+    let follow = true
+    for (let i = 0; (i < block.length) && (isBoolean(follow)); i++) {
+      const locale = block[i]
+      if (isString(locale)) {
+        follow = this._appendLocaleToChain(chain, locale, blocks)
+      }
+    }
+    return follow
+  }
+
+  _getLocaleChain (start: Locale, fallbackLocale: FallbackLocale): Array<Locale> {
+    if (start === '') { return [] }
+
+    if (!this._localeChainCache) {
+      this._localeChainCache = {}
+    }
+
+    let chain = this._localeChainCache[start]
+    if (!chain) {
+      if (!fallbackLocale) {
+        fallbackLocale = this.fallbackLocale
+      }
+      chain = []
+
+      // first block defined by start
+      let block = [start]
+
+      // while any intervening block found
+      while (isArray(block)) {
+        block = this._appendBlockToChain(
+          chain,
+          block,
+          fallbackLocale
+        )
+      }
+
+      // last block defined by default
+      let defaults
+      if (isArray(fallbackLocale)) {
+        defaults = fallbackLocale
+      } else if (isObject(fallbackLocale)) {
+        /* $FlowFixMe */
+        if (fallbackLocale['default']) {
+          defaults = fallbackLocale['default']
+        } else {
+          defaults = null
+        }
+      } else {
+        defaults = fallbackLocale
+      }
+
+      // convert defaults to array
+      if (isString(defaults)) {
+        block = [defaults]
+      } else {
+        block = defaults
+      }
+      if (block) {
+        this._appendBlockToChain(
+          chain,
+          block,
+          null
+        )
+      }
+      this._localeChainCache[start] = chain
+    }
+    return chain
+  }
+
+  _translate (
+    messages: LocaleMessages,
+    locale: Locale,
+    fallback: FallbackLocale,
+    key: Path,
+    host: any,
+    interpolateMode: string,
+    args: any
+  ): any {
+    const chain = this._getLocaleChain(locale, fallback)
+    let res
+    for (let i = 0; i < chain.length; i++) {
+      const step = chain[i]
+      res =
+        this._interpolate(step, messages[step], key, host, interpolateMode, args, [key])
+      if (!isNull(res)) {
+        if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(("Fall back to translate the keypath '" + key + "' with '" + step + "' locale."))
+        }
+        return res
+      }
+    }
+    return null
+  }
+
+  _t (key: Path, _locale: Locale, messages: LocaleMessages, host: any, ...values: any): any {
+    if (!key) { return '' }
+
+    const parsedArgs = parseArgs(...values)
+    const locale: Locale = parsedArgs.locale || _locale
+
+    let ret: any = this._translate(
+      messages, locale, this.fallbackLocale, key,
+      host, 'string', parsedArgs.params
+    )
+    if (this._isFallbackRoot(ret)) {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(`Fall back to translate the keypath '${key}' with root locale.`)
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$t(key, ...values)
+    } else {
+      ret = this._warnDefault(locale, key, ret, host, values, 'string')
+      if (this._postTranslation && ret !== null && ret !== undefined) {
+        ret = this._postTranslation(ret, key)
+      }
+      return ret
+    }
+  }
+
+  t (key: Path, ...values: any): TranslateResult {
+    return this._t(key, this.locale, this._getMessages(), null, ...values)
+  }
+
+  _i (key: Path, locale: Locale, messages: LocaleMessages, host: any, values: Object): any {
+    const ret: any =
+      this._translate(messages, locale, this.fallbackLocale, key, host, 'raw', values)
+    if (this._isFallbackRoot(ret)) {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+        warn(`Fall back to interpolate the keypath '${key}' with root locale.`)
+      }
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.i(key, locale, values)
+    } else {
+      return this._warnDefault(locale, key, ret, host, [values], 'raw')
+    }
+  }
+
+  i (key: Path, locale: Locale, values: Object): TranslateResult {
+    /* istanbul ignore if */
+    if (!key) { return '' }
+
+    if (!isString(locale)) {
+      locale = this.locale
+    }
+
+    return this._i(key, locale, this._getMessages(), null, values)
+  }
+
+  _tc (
+    key: Path,
+    _locale: Locale,
+    messages: LocaleMessages,
+    host: any,
+    choice?: number,
+    ...values: any
+  ): any {
+    if (!key) { return '' }
+    if (choice === undefined) {
+      choice = 1
+    }
+
+    const predefined = { 'count': choice, 'n': choice }
+    const parsedArgs = parseArgs(...values)
+    parsedArgs.params = Object.assign(predefined, parsedArgs.params)
+    values = parsedArgs.locale === null ? [parsedArgs.params] : [parsedArgs.locale, parsedArgs.params]
+    return this.fetchChoice(this._t(key, _locale, messages, host, ...values), choice)
+  }
+
+  fetchChoice (message: string, choice: number): ?string {
+    /* istanbul ignore if */
+    if (!message && !isString(message)) { return null }
+    const choices: Array<string> = message.split('|')
+
+    choice = this.getChoiceIndex(choice, choices.length)
+    if (!choices[choice]) { return message }
+    return choices[choice].trim()
+  }
+
+  tc (key: Path, choice?: number, ...values: any): TranslateResult {
+    return this._tc(key, this.locale, this._getMessages(), null, choice, ...values)
+  }
+
+  _te (key: Path, locale: Locale, messages: LocaleMessages, ...args: any): boolean {
+    const _locale: Locale = parseArgs(...args).locale || locale
+    return this._exist(messages[_locale], key)
+  }
+
+  te (key: Path, locale?: Locale): boolean {
+    return this._te(key, this.locale, this._getMessages(), locale)
+  }
+
+  getLocaleMessage (locale: Locale): LocaleMessageObject {
+    return looseClone(this._vm.messages[locale] || {})
+  }
+
+  setLocaleMessage (locale: Locale, message: LocaleMessageObject): void {
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      this._checkLocaleMessage(locale, this._warnHtmlInMessage, message)
+    }
+    this._vm.$set(this._vm.messages, locale, message)
+  }
+
+  mergeLocaleMessage (locale: Locale, message: LocaleMessageObject): void {
+    if (this._warnHtmlInMessage === 'warn' || this._warnHtmlInMessage === 'error') {
+      this._checkLocaleMessage(locale, this._warnHtmlInMessage, message)
+    }
+    this._vm.$set(this._vm.messages, locale, merge({}, this._vm.messages[locale] || {}, message))
+  }
+
+  getDateTimeFormat (locale: Locale): DateTimeFormat {
+    return looseClone(this._vm.dateTimeFormats[locale] || {})
+  }
+
+  setDateTimeFormat (locale: Locale, format: DateTimeFormat): void {
+    this._vm.$set(this._vm.dateTimeFormats, locale, format)
+    this._clearDateTimeFormat(locale, format)
+  }
+
+  mergeDateTimeFormat (locale: Locale, format: DateTimeFormat): void {
+    this._vm.$set(this._vm.dateTimeFormats, locale, merge(this._vm.dateTimeFormats[locale] || {}, format))
+    this._clearDateTimeFormat(locale, format)
+  }
+
+  _clearDateTimeFormat (locale: Locale, format: DateTimeFormat): void {
+    for (let key in format) {
+      const id = `${locale}__${key}`
+
+      if (!this._dateTimeFormatters.hasOwnProperty(id)) {
+        continue
+      }
+
+      delete this._dateTimeFormatters[id]
+    }
+  }
+
+  _localizeDateTime (
+    value: number | Date,
+    locale: Locale,
+    fallback: FallbackLocale,
+    dateTimeFormats: DateTimeFormats,
+    key: string
+  ): ?DateTimeFormatResult {
+    let _locale: Locale = locale
+    let formats: DateTimeFormat = dateTimeFormats[_locale]
+
+    const chain = this._getLocaleChain(locale, fallback)
+    for (let i = 0; i < chain.length; i++) {
+      const current = _locale
+      const step = chain[i]
+      formats = dateTimeFormats[step]
+      _locale = step
+      // fallback locale
+      if (isNull(formats) || isNull(formats[key])) {
+        if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(`Fall back to '${step}' datetime formats from '${current}' datetime formats.`)
+        }
+      } else {
+        break
+      }
+    }
+
+    if (isNull(formats) || isNull(formats[key])) {
+      return null
+    } else {
+      const format: ?DateTimeFormatOptions = formats[key]
+      const id = `${_locale}__${key}`
+      let formatter = this._dateTimeFormatters[id]
+      if (!formatter) {
+        formatter = this._dateTimeFormatters[id] = new Intl.DateTimeFormat(_locale, format)
+      }
+      return formatter.format(value)
+    }
+  }
+
+  _d (value: number | Date, locale: Locale, key: ?string): DateTimeFormatResult {
+    /* istanbul ignore if */
+    if (process.env.NODE_ENV !== 'production' && !VueI18n.availabilities.dateTimeFormat) {
+      warn('Cannot format a Date value due to not supported Intl.DateTimeFormat.')
+      return ''
+    }
+
+    if (!key) {
+      return new Intl.DateTimeFormat(locale).format(value)
+    }
+
+    const ret: ?DateTimeFormatResult =
+      this._localizeDateTime(value, locale, this.fallbackLocale, this._getDateTimeFormats(), key)
+    if (this._isFallbackRoot(ret)) {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(`Fall back to datetime localization of root: key '${key}'.`)
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.d(value, key, locale)
+    } else {
+      return ret || ''
+    }
+  }
+
+  d (value: number | Date, ...args: any): DateTimeFormatResult {
+    let locale: Locale = this.locale
+    let key: ?string = null
+
+    if (args.length === 1) {
+      if (isString(args[0])) {
+        key = args[0]
+      } else if (isObject(args[0])) {
+        if (args[0].locale) {
+          locale = args[0].locale
+        }
+        if (args[0].key) {
+          key = args[0].key
+        }
+      }
+    } else if (args.length === 2) {
+      if (isString(args[0])) {
+        key = args[0]
+      }
+      if (isString(args[1])) {
+        locale = args[1]
+      }
+    }
+
+    return this._d(value, locale, key)
+  }
+
+  getNumberFormat (locale: Locale): NumberFormat {
+    return looseClone(this._vm.numberFormats[locale] || {})
+  }
+
+  setNumberFormat (locale: Locale, format: NumberFormat): void {
+    this._vm.$set(this._vm.numberFormats, locale, format)
+    this._clearNumberFormat(locale, format)
+  }
+
+  mergeNumberFormat (locale: Locale, format: NumberFormat): void {
+    this._vm.$set(this._vm.numberFormats, locale, merge(this._vm.numberFormats[locale] || {}, format))
+    this._clearNumberFormat(locale, format)
+  }
+
+  _clearNumberFormat (locale: Locale, format: NumberFormat): void {
+    for (let key in format) {
+      const id = `${locale}__${key}`
+
+      if (!this._numberFormatters.hasOwnProperty(id)) {
+        continue
+      }
+
+      delete this._numberFormatters[id]
+    }
+  }
+
+  _getNumberFormatter (
+    value: number,
+    locale: Locale,
+    fallback: FallbackLocale,
+    numberFormats: NumberFormats,
+    key: string,
+    options: ?NumberFormatOptions
+  ): ?Object {
+    let _locale: Locale = locale
+    let formats: NumberFormat = numberFormats[_locale]
+
+    const chain = this._getLocaleChain(locale, fallback)
+    for (let i = 0; i < chain.length; i++) {
+      const current = _locale
+      const step = chain[i]
+      formats = numberFormats[step]
+      _locale = step
+      // fallback locale
+      if (isNull(formats) || isNull(formats[key])) {
+        if (step !== locale && process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+          warn(`Fall back to '${step}' number formats from '${current}' number formats.`)
+        }
+      } else {
+        break
+      }
+    }
+
+    if (isNull(formats) || isNull(formats[key])) {
+      return null
+    } else {
+      const format: ?NumberFormatOptions = formats[key]
+
+      let formatter
+      if (options) {
+        // If options specified - create one time number formatter
+        formatter = new Intl.NumberFormat(_locale, Object.assign({}, format, options))
+      } else {
+        const id = `${_locale}__${key}`
+        formatter = this._numberFormatters[id]
+        if (!formatter) {
+          formatter = this._numberFormatters[id] = new Intl.NumberFormat(_locale, format)
+        }
+      }
+      return formatter
+    }
+  }
+
+  _n (value: number, locale: Locale, key: ?string, options: ?NumberFormatOptions): NumberFormatResult {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.numberFormat) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot format a Number value due to not supported Intl.NumberFormat.')
+      }
+      return ''
+    }
+
+    if (!key) {
+      const nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options)
+      return nf.format(value)
+    }
+
+    const formatter: ?Object = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options)
+    const ret: ?NumberFormatResult = formatter && formatter.format(value)
+    if (this._isFallbackRoot(ret)) {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key) && !this._isSilentFallbackWarn(key)) {
+        warn(`Fall back to number localization of root: key '${key}'.`)
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n.n(value, Object.assign({}, { key, locale }, options))
+    } else {
+      return ret || ''
+    }
+  }
+
+  n (value: number, ...args: any): NumberFormatResult {
+    let locale: Locale = this.locale
+    let key: ?string = null
+    let options: ?NumberFormatOptions = null
+
+    if (args.length === 1) {
+      if (isString(args[0])) {
+        key = args[0]
+      } else if (isObject(args[0])) {
+        if (args[0].locale) {
+          locale = args[0].locale
+        }
+        if (args[0].key) {
+          key = args[0].key
+        }
+
+        // Filter out number format options only
+        options = Object.keys(args[0]).reduce((acc, key) => {
+          if (includes(numberFormatKeys, key)) {
+            return Object.assign({}, acc, { [key]: args[0][key] })
+          }
+          return acc
+        }, null)
+      }
+    } else if (args.length === 2) {
+      if (isString(args[0])) {
+        key = args[0]
+      }
+      if (isString(args[1])) {
+        locale = args[1]
+      }
+    }
+
+    return this._n(value, locale, key, options)
+  }
+
+  _ntp (value: number, locale: Locale, key: ?string, options: ?NumberFormatOptions): NumberFormatToPartsResult {
+    /* istanbul ignore if */
+    if (!VueI18n.availabilities.numberFormat) {
+      if (process.env.NODE_ENV !== 'production') {
+        warn('Cannot format to parts a Number value due to not supported Intl.NumberFormat.')
+      }
+      return []
+    }
+
+    if (!key) {
+      const nf = !options ? new Intl.NumberFormat(locale) : new Intl.NumberFormat(locale, options)
+      return nf.formatToParts(value)
+    }
+
+    const formatter: ?Object = this._getNumberFormatter(value, locale, this.fallbackLocale, this._getNumberFormats(), key, options)
+    const ret: ?NumberFormatToPartsResult = formatter && formatter.formatToParts(value)
+    if (this._isFallbackRoot(ret)) {
+      if (process.env.NODE_ENV !== 'production' && !this._isSilentTranslationWarn(key)) {
+        warn(`Fall back to format number to parts of root: key '${key}' .`)
+      }
+      /* istanbul ignore if */
+      if (!this._root) { throw Error('unexpected error') }
+      return this._root.$i18n._ntp(value, locale, key, options)
+    } else {
+      return ret || []
+    }
+  }
+}
+
+let availabilities: IntlAvailability
+// $FlowFixMe
+Object.defineProperty(VueI18n, 'availabilities', {
+  get () {
+    if (!availabilities) {
+      const intlDefined = typeof Intl !== 'undefined'
+      availabilities = {
+        dateTimeFormat: intlDefined && typeof Intl.DateTimeFormat !== 'undefined',
+        numberFormat: intlDefined && typeof Intl.NumberFormat !== 'undefined'
+      }
+    }
+
+    return availabilities
+  }
+})
+
+VueI18n.install = install
+VueI18n.version = '__VERSION__'
diff --git a/node_modules/vue-i18n/src/install.js b/node_modules/vue-i18n/src/install.js
new file mode 100644
index 0000000..62edbc2
--- /dev/null
+++ b/node_modules/vue-i18n/src/install.js
@@ -0,0 +1,40 @@
+import { warn } from './util'
+import extend from './extend'
+import mixin from './mixin'
+import interpolationComponent from './components/interpolation'
+import numberComponent from './components/number'
+import { bind, update, unbind } from './directive'
+
+export let Vue
+
+export function install (_Vue) {
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && install.installed && _Vue === Vue) {
+    warn('already installed.')
+    return
+  }
+  install.installed = true
+
+  Vue = _Vue
+
+  const version = (Vue.version && Number(Vue.version.split('.')[0])) || -1
+  /* istanbul ignore if */
+  if (process.env.NODE_ENV !== 'production' && version < 2) {
+    warn(`vue-i18n (${install.version}) need to use Vue 2.0 or later (Vue: ${Vue.version}).`)
+    return
+  }
+
+  extend(Vue)
+  Vue.mixin(mixin)
+  Vue.directive('t', { bind, update, unbind })
+  Vue.component(interpolationComponent.name, interpolationComponent)
+  Vue.component(numberComponent.name, numberComponent)
+
+  // use simple mergeStrategies to prevent i18n instance lose '__proto__'
+  const strats = Vue.config.optionMergeStrategies
+  strats.i18n = function (parentVal, childVal) {
+    return childVal === undefined
+      ? parentVal
+      : childVal
+  }
+}
diff --git a/node_modules/vue-i18n/src/mixin.js b/node_modules/vue-i18n/src/mixin.js
new file mode 100644
index 0000000..0190b16
--- /dev/null
+++ b/node_modules/vue-i18n/src/mixin.js
@@ -0,0 +1,139 @@
+/* @flow */
+
+import VueI18n from './index'
+import { isPlainObject, warn, error, merge } from './util'
+
+export default {
+  beforeCreate (): void {
+    const options: any = this.$options
+    options.i18n = options.i18n || (options.__i18n ? {} : null)
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            let localeMessages = {}
+            options.__i18n.forEach(resource => {
+              localeMessages = merge(localeMessages, JSON.parse(resource))
+            })
+            Object.keys(localeMessages).forEach((locale: Locale) => {
+              options.i18n.mergeLocaleMessage(locale, localeMessages[locale])
+            })
+          } catch (e) {
+            if (process.env.NODE_ENV !== 'production') {
+              error(`Cannot parse locale messages via custom blocks.`, e)
+            }
+          }
+        }
+        this._i18n = options.i18n
+        this._i18nWatcher = this._i18n.watchI18nData()
+      } else if (isPlainObject(options.i18n)) {
+        const rootI18n = this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n
+          ? this.$root.$i18n
+          : null
+        // component local i18n
+        if (rootI18n) {
+          options.i18n.root = this.$root
+          options.i18n.formatter = rootI18n.formatter
+          options.i18n.fallbackLocale = rootI18n.fallbackLocale
+          options.i18n.formatFallbackMessages = rootI18n.formatFallbackMessages
+          options.i18n.silentTranslationWarn = rootI18n.silentTranslationWarn
+          options.i18n.silentFallbackWarn = rootI18n.silentFallbackWarn
+          options.i18n.pluralizationRules = rootI18n.pluralizationRules
+          options.i18n.preserveDirectiveContent = rootI18n.preserveDirectiveContent
+        }
+
+        // init locale messages via custom blocks
+        if (options.__i18n) {
+          try {
+            let localeMessages = {}
+            options.__i18n.forEach(resource => {
+              localeMessages = merge(localeMessages, JSON.parse(resource))
+            })
+            options.i18n.messages = localeMessages
+          } catch (e) {
+            if (process.env.NODE_ENV !== 'production') {
+              warn(`Cannot parse locale messages via custom blocks.`, e)
+            }
+          }
+        }
+
+        const { sharedMessages } = options.i18n
+        if (sharedMessages && isPlainObject(sharedMessages)) {
+          options.i18n.messages = merge(options.i18n.messages, sharedMessages)
+        }
+
+        this._i18n = new VueI18n(options.i18n)
+        this._i18nWatcher = this._i18n.watchI18nData()
+
+        if (options.i18n.sync === undefined || !!options.i18n.sync) {
+          this._localeWatcher = this.$i18n.watchLocale()
+        }
+
+        if (rootI18n) {
+          rootI18n.onComponentInstanceCreated(this._i18n)
+        }
+      } else {
+        if (process.env.NODE_ENV !== 'production') {
+          warn(`Cannot be interpreted 'i18n' option.`)
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      // root i18n
+      this._i18n = this.$root.$i18n
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      // parent i18n
+      this._i18n = options.parent.$i18n
+    }
+  },
+
+  beforeMount (): void {
+    const options: any = this.$options
+    options.i18n = options.i18n || (options.__i18n ? {} : null)
+
+    if (options.i18n) {
+      if (options.i18n instanceof VueI18n) {
+        // init locale messages via custom blocks
+        this._i18n.subscribeDataChanging(this)
+        this._subscribing = true
+      } else if (isPlainObject(options.i18n)) {
+        this._i18n.subscribeDataChanging(this)
+        this._subscribing = true
+      } else {
+        if (process.env.NODE_ENV !== 'production') {
+          warn(`Cannot be interpreted 'i18n' option.`)
+        }
+      }
+    } else if (this.$root && this.$root.$i18n && this.$root.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this)
+      this._subscribing = true
+    } else if (options.parent && options.parent.$i18n && options.parent.$i18n instanceof VueI18n) {
+      this._i18n.subscribeDataChanging(this)
+      this._subscribing = true
+    }
+  },
+
+  beforeDestroy (): void {
+    if (!this._i18n) { return }
+
+    const self = this
+    this.$nextTick(() => {
+      if (self._subscribing) {
+        self._i18n.unsubscribeDataChanging(self)
+        delete self._subscribing
+      }
+
+      if (self._i18nWatcher) {
+        self._i18nWatcher()
+        self._i18n.destroyVM()
+        delete self._i18nWatcher
+      }
+
+      if (self._localeWatcher) {
+        self._localeWatcher()
+        delete self._localeWatcher
+      }
+    })
+  }
+}
diff --git a/node_modules/vue-i18n/src/path.js b/node_modules/vue-i18n/src/path.js
new file mode 100644
index 0000000..3be65af
--- /dev/null
+++ b/node_modules/vue-i18n/src/path.js
@@ -0,0 +1,302 @@
+/* @flow */
+
+import { isObject } from './util'
+
+/**
+ *  Path parser
+ *  - Inspired:
+ *    Vue.js Path parser
+ */
+
+// actions
+const APPEND = 0
+const PUSH = 1
+const INC_SUB_PATH_DEPTH = 2
+const PUSH_SUB_PATH = 3
+
+// states
+const BEFORE_PATH = 0
+const IN_PATH = 1
+const BEFORE_IDENT = 2
+const IN_IDENT = 3
+const IN_SUB_PATH = 4
+const IN_SINGLE_QUOTE = 5
+const IN_DOUBLE_QUOTE = 6
+const AFTER_PATH = 7
+const ERROR = 8
+
+const pathStateMachine: any = []
+
+pathStateMachine[BEFORE_PATH] = {
+  'ws': [BEFORE_PATH],
+  'ident': [IN_IDENT, APPEND],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+}
+
+pathStateMachine[IN_PATH] = {
+  'ws': [IN_PATH],
+  '.': [BEFORE_IDENT],
+  '[': [IN_SUB_PATH],
+  'eof': [AFTER_PATH]
+}
+
+pathStateMachine[BEFORE_IDENT] = {
+  'ws': [BEFORE_IDENT],
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND]
+}
+
+pathStateMachine[IN_IDENT] = {
+  'ident': [IN_IDENT, APPEND],
+  '0': [IN_IDENT, APPEND],
+  'number': [IN_IDENT, APPEND],
+  'ws': [IN_PATH, PUSH],
+  '.': [BEFORE_IDENT, PUSH],
+  '[': [IN_SUB_PATH, PUSH],
+  'eof': [AFTER_PATH, PUSH]
+}
+
+pathStateMachine[IN_SUB_PATH] = {
+  "'": [IN_SINGLE_QUOTE, APPEND],
+  '"': [IN_DOUBLE_QUOTE, APPEND],
+  '[': [IN_SUB_PATH, INC_SUB_PATH_DEPTH],
+  ']': [IN_PATH, PUSH_SUB_PATH],
+  'eof': ERROR,
+  'else': [IN_SUB_PATH, APPEND]
+}
+
+pathStateMachine[IN_SINGLE_QUOTE] = {
+  "'": [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_SINGLE_QUOTE, APPEND]
+}
+
+pathStateMachine[IN_DOUBLE_QUOTE] = {
+  '"': [IN_SUB_PATH, APPEND],
+  'eof': ERROR,
+  'else': [IN_DOUBLE_QUOTE, APPEND]
+}
+
+/**
+ * Check if an expression is a literal value.
+ */
+
+const literalValueRE: RegExp = /^\s?(?:true|false|-?[\d.]+|'[^']*'|"[^"]*")\s?$/
+function isLiteral (exp: string): boolean {
+  return literalValueRE.test(exp)
+}
+
+/**
+ * Strip quotes from a string
+ */
+
+function stripQuotes (str: string): string | boolean {
+  const a: number = str.charCodeAt(0)
+  const b: number = str.charCodeAt(str.length - 1)
+  return a === b && (a === 0x22 || a === 0x27)
+    ? str.slice(1, -1)
+    : str
+}
+
+/**
+ * Determine the type of a character in a keypath.
+ */
+
+function getPathCharType (ch: ?string): string {
+  if (ch === undefined || ch === null) { return 'eof' }
+
+  const code: number = ch.charCodeAt(0)
+
+  switch (code) {
+    case 0x5B: // [
+    case 0x5D: // ]
+    case 0x2E: // .
+    case 0x22: // "
+    case 0x27: // '
+      return ch
+
+    case 0x5F: // _
+    case 0x24: // $
+    case 0x2D: // -
+      return 'ident'
+
+    case 0x09: // Tab
+    case 0x0A: // Newline
+    case 0x0D: // Return
+    case 0xA0:  // No-break space
+    case 0xFEFF:  // Byte Order Mark
+    case 0x2028:  // Line Separator
+    case 0x2029:  // Paragraph Separator
+      return 'ws'
+  }
+
+  return 'ident'
+}
+
+/**
+ * Format a subPath, return its plain form if it is
+ * a literal string or number. Otherwise prepend the
+ * dynamic indicator (*).
+ */
+
+function formatSubPath (path: string): boolean | string {
+  const trimmed: string = path.trim()
+  // invalid leading 0
+  if (path.charAt(0) === '0' && isNaN(path)) { return false }
+
+  return isLiteral(trimmed) ? stripQuotes(trimmed) : '*' + trimmed
+}
+
+/**
+ * Parse a string path into an array of segments
+ */
+
+function parse (path: Path): ?Array<string> {
+  const keys: Array<string> = []
+  let index: number = -1
+  let mode: number = BEFORE_PATH
+  let subPathDepth: number = 0
+  let c: ?string
+  let key: any
+  let newChar: any
+  let type: string
+  let transition: number
+  let action: Function
+  let typeMap: any
+  const actions: Array<Function> = []
+
+  actions[PUSH] = function () {
+    if (key !== undefined) {
+      keys.push(key)
+      key = undefined
+    }
+  }
+
+  actions[APPEND] = function () {
+    if (key === undefined) {
+      key = newChar
+    } else {
+      key += newChar
+    }
+  }
+
+  actions[INC_SUB_PATH_DEPTH] = function () {
+    actions[APPEND]()
+    subPathDepth++
+  }
+
+  actions[PUSH_SUB_PATH] = function () {
+    if (subPathDepth > 0) {
+      subPathDepth--
+      mode = IN_SUB_PATH
+      actions[APPEND]()
+    } else {
+      subPathDepth = 0
+      if (key === undefined) { return false }
+      key = formatSubPath(key)
+      if (key === false) {
+        return false
+      } else {
+        actions[PUSH]()
+      }
+    }
+  }
+
+  function maybeUnescapeQuote (): ?boolean {
+    const nextChar: string = path[index + 1]
+    if ((mode === IN_SINGLE_QUOTE && nextChar === "'") ||
+      (mode === IN_DOUBLE_QUOTE && nextChar === '"')) {
+      index++
+      newChar = '\\' + nextChar
+      actions[APPEND]()
+      return true
+    }
+  }
+
+  while (mode !== null) {
+    index++
+    c = path[index]
+
+    if (c === '\\' && maybeUnescapeQuote()) {
+      continue
+    }
+
+    type = getPathCharType(c)
+    typeMap = pathStateMachine[mode]
+    transition = typeMap[type] || typeMap['else'] || ERROR
+
+    if (transition === ERROR) {
+      return // parse error
+    }
+
+    mode = transition[0]
+    action = actions[transition[1]]
+    if (action) {
+      newChar = transition[2]
+      newChar = newChar === undefined
+        ? c
+        : newChar
+      if (action() === false) {
+        return
+      }
+    }
+
+    if (mode === AFTER_PATH) {
+      return keys
+    }
+  }
+}
+
+export type PathValue = PathValueObject | PathValueArray | string | number | boolean | null
+export type PathValueObject = { [key: string]: PathValue }
+export type PathValueArray = Array<PathValue>
+
+export default class I18nPath {
+  _cache: Object
+
+  constructor () {
+    this._cache = Object.create(null)
+  }
+
+  /**
+   * External parse that check for a cache hit first
+   */
+  parsePath (path: Path): Array<string> {
+    let hit: ?Array<string> = this._cache[path]
+    if (!hit) {
+      hit = parse(path)
+      if (hit) {
+        this._cache[path] = hit
+      }
+    }
+    return hit || []
+  }
+
+  /**
+   * Get path value from path string
+   */
+  getPathValue (obj: mixed, path: Path): PathValue {
+    if (!isObject(obj)) { return null }
+
+    const paths: Array<string> = this.parsePath(path)
+    if (paths.length === 0) {
+      return null
+    } else {
+      const length: number = paths.length
+      let last: any = obj
+      let i: number = 0
+      while (i < length) {
+        const value: any = last[paths[i]]
+        if (value === undefined) {
+          return null
+        }
+        last = value
+        i++
+      }
+
+      return last
+    }
+  }
+}
diff --git a/node_modules/vue-i18n/src/util.js b/node_modules/vue-i18n/src/util.js
new file mode 100644
index 0000000..61b04de
--- /dev/null
+++ b/node_modules/vue-i18n/src/util.js
@@ -0,0 +1,165 @@
+/* @flow */
+
+/**
+ * constants
+ */
+
+export const numberFormatKeys = [
+  'style',
+  'currency',
+  'currencyDisplay',
+  'useGrouping',
+  'minimumIntegerDigits',
+  'minimumFractionDigits',
+  'maximumFractionDigits',
+  'minimumSignificantDigits',
+  'maximumSignificantDigits',
+  'localeMatcher',
+  'formatMatcher',
+  'unit'
+]
+
+/**
+ * utilities
+ */
+
+export function warn (msg: string, err: ?Error): void {
+  if (typeof console !== 'undefined') {
+    console.warn('[vue-i18n] ' + msg)
+    /* istanbul ignore if */
+    if (err) {
+      console.warn(err.stack)
+    }
+  }
+}
+
+export function error (msg: string, err: ?Error): void {
+  if (typeof console !== 'undefined') {
+    console.error('[vue-i18n] ' + msg)
+    /* istanbul ignore if */
+    if (err) {
+      console.error(err.stack)
+    }
+  }
+}
+
+export const isArray = Array.isArray
+
+export function isObject (obj: mixed): boolean %checks {
+  return obj !== null && typeof obj === 'object'
+}
+
+export function isBoolean (val: mixed): boolean %checks {
+  return typeof val === 'boolean'
+}
+
+export function isString (val: mixed): boolean %checks {
+  return typeof val === 'string'
+}
+
+const toString: Function = Object.prototype.toString
+const OBJECT_STRING: string = '[object Object]'
+export function isPlainObject (obj: any): boolean {
+  return toString.call(obj) === OBJECT_STRING
+}
+
+export function isNull (val: mixed): boolean {
+  return val === null || val === undefined
+}
+
+export function parseArgs (...args: Array<mixed>): Object {
+  let locale: ?string = null
+  let params: mixed = null
+  if (args.length === 1) {
+    if (isObject(args[0]) || Array.isArray(args[0])) {
+      params = args[0]
+    } else if (typeof args[0] === 'string') {
+      locale = args[0]
+    }
+  } else if (args.length === 2) {
+    if (typeof args[0] === 'string') {
+      locale = args[0]
+    }
+    /* istanbul ignore if */
+    if (isObject(args[1]) || Array.isArray(args[1])) {
+      params = args[1]
+    }
+  }
+
+  return { locale, params }
+}
+
+export function looseClone (obj: Object): Object {
+  return JSON.parse(JSON.stringify(obj))
+}
+
+export function remove (arr: Array<any>, item: any): Array<any> | void {
+  if (arr.length) {
+    const index = arr.indexOf(item)
+    if (index > -1) {
+      return arr.splice(index, 1)
+    }
+  }
+}
+
+export function includes (arr: Array<any>, item: any): boolean {
+  return !!~arr.indexOf(item)
+}
+
+const hasOwnProperty = Object.prototype.hasOwnProperty
+export function hasOwn (obj: Object | Array<*>, key: string): boolean {
+  return hasOwnProperty.call(obj, key)
+}
+
+export function merge (target: Object): Object {
+  const output = Object(target)
+  for (let i = 1; i < arguments.length; i++) {
+    const source = arguments[i]
+    if (source !== undefined && source !== null) {
+      let key
+      for (key in source) {
+        if (hasOwn(source, key)) {
+          if (isObject(source[key])) {
+            output[key] = merge(output[key], source[key])
+          } else {
+            output[key] = source[key]
+          }
+        }
+      }
+    }
+  }
+  return output
+}
+
+export function looseEqual (a: any, b: any): boolean {
+  if (a === b) { return true }
+  const isObjectA: boolean = isObject(a)
+  const isObjectB: boolean = isObject(b)
+  if (isObjectA && isObjectB) {
+    try {
+      const isArrayA: boolean = Array.isArray(a)
+      const isArrayB: boolean = Array.isArray(b)
+      if (isArrayA && isArrayB) {
+        return a.length === b.length && a.every((e: any, i: number): boolean => {
+          return looseEqual(e, b[i])
+        })
+      } else if (!isArrayA && !isArrayB) {
+        const keysA: Array<string> = Object.keys(a)
+        const keysB: Array<string> = Object.keys(b)
+        return keysA.length === keysB.length && keysA.every((key: string): boolean => {
+          return looseEqual(a[key], b[key])
+        })
+      } else {
+        /* istanbul ignore next */
+        return false
+      }
+    } catch (e) {
+      /* istanbul ignore next */
+      return false
+    }
+  } else if (!isObjectA && !isObjectB) {
+    return String(a) === String(b)
+  } else {
+    return false
+  }
+}
diff --git a/node_modules/vue-i18n/types/index.d.ts b/node_modules/vue-i18n/types/index.d.ts
new file mode 100644
index 0000000..03b767c
--- /dev/null
+++ b/node_modules/vue-i18n/types/index.d.ts
@@ -0,0 +1,269 @@
+import Vue, { PluginFunction } from 'vue';
+
+declare namespace VueI18n {
+  type Path = string;
+  type Locale = string;
+  type FallbackLocale = string | string[] | false | { [locale: string]: string[] }
+  type Values = any[] | { [key: string]: any };
+  type Choice = number;
+  type LocaleMessage = string | LocaleMessageObject | LocaleMessageArray;
+  interface LocaleMessageObject { [key: string]: LocaleMessage; }
+  interface LocaleMessageArray { [index: number]: LocaleMessage; }
+  interface LocaleMessages { [key: string]: LocaleMessageObject; }
+  type TranslateResult = string | LocaleMessages;
+
+  type LocaleMatcher = 'lookup' | 'best-fit';
+  type FormatMatcher = 'basic' | 'best-fit';
+
+  type DateTimeHumanReadable = 'long' | 'short' | 'narrow';
+  type DateTimeDigital = 'numeric' | '2-digit';
+
+  interface SpecificDateTimeFormatOptions extends Intl.DateTimeFormatOptions {
+    year?: DateTimeDigital;
+    month?: DateTimeDigital | DateTimeHumanReadable;
+    day?: DateTimeDigital;
+    hour?: DateTimeDigital;
+    minute?: DateTimeDigital;
+    second?: DateTimeDigital;
+    weekday?: DateTimeHumanReadable;
+    era?: DateTimeHumanReadable;
+    timeZoneName?: 'long' | 'short';
+    localeMatcher?: LocaleMatcher;
+    formatMatcher?: FormatMatcher;
+  }
+
+  type DateTimeFormatOptions = Intl.DateTimeFormatOptions | SpecificDateTimeFormatOptions;
+
+  interface DateTimeFormat { [key: string]: DateTimeFormatOptions; }
+  interface DateTimeFormats { [locale: string]: DateTimeFormat; }
+  type DateTimeFormatResult = string;
+
+  type CurrencyDisplay = 'symbol' | 'code' | 'name';
+
+  interface SpecificNumberFormatOptions extends Intl.NumberFormatOptions {
+    style?: 'decimal' | 'percent';
+    currency?: string;
+    currencyDisplay?: CurrencyDisplay;
+    localeMatcher?: LocaleMatcher;
+    formatMatcher?: FormatMatcher;
+  }
+
+  interface CurrencyNumberFormatOptions extends Intl.NumberFormatOptions {
+    style: 'currency';
+    currency: string; // Obligatory if style is 'currency'
+    currencyDisplay?: CurrencyDisplay;
+    localeMatcher?: LocaleMatcher;
+    formatMatcher?: FormatMatcher;
+  }
+
+  type NumberFormatOptions = Intl.NumberFormatOptions | SpecificNumberFormatOptions | CurrencyNumberFormatOptions;
+
+  interface NumberFormat { [key: string]: NumberFormatOptions; }
+  interface NumberFormats { [locale: string]: NumberFormat; }
+  type NumberFormatResult = string;
+  type PluralizationRulesMap = {
+    /**
+     * @param choice {number} a choice index given by the input to $tc: `$tc('path.to.rule', choiceIndex)`
+     * @param choicesLength {number} an overall amount of available choices
+     * @returns a final choice index
+    */
+    [lang: string]: (choice: number, choicesLength: number) => number;
+  };
+  type Modifiers = { [key: string]: (str : string) => string };
+
+  type FormattedNumberPartType = 'currency' | 'decimal' | 'fraction' | 'group' | 'infinity' | 'integer' | 'literal' | 'minusSign' | 'nan' | 'plusSign' | 'percentSign';
+
+  type WarnHtmlInMessageLevel = 'off' | 'warn' | 'error';
+
+  interface FormattedNumberPart {
+    type: FormattedNumberPartType;
+    value: string;
+  }
+  interface NumberFormatToPartsResult { [index: number]: FormattedNumberPart; }
+
+  interface Formatter {
+    interpolate(message: string, values: Values | undefined, path: string): (any[] | null);
+  }
+
+  type MissingHandler = (locale: Locale, key: Path, vm: Vue | null, values: any) => string | void;
+  type PostTranslationHandler = (str: string, key?: string) => string;
+  type ComponentInstanceCreatedListener = (newVm: VueI18n & IVueI18n, rootVm: VueI18n & IVueI18n) => void;
+
+  interface IntlAvailability {
+    dateTimeFormat: boolean;
+    numberFormat: boolean;
+  }
+
+  // tslint:disable-next-line:interface-name
+  interface I18nOptions {
+    locale?: Locale;
+    fallbackLocale?: FallbackLocale;
+    messages?: LocaleMessages;
+    dateTimeFormats?: DateTimeFormats;
+    numberFormats?: NumberFormats;
+    formatter?: Formatter;
+    modifiers?: Modifiers,
+    missing?: MissingHandler;
+    fallbackRoot?: boolean;
+    formatFallbackMessages?: boolean;
+    sync?: boolean;
+    silentTranslationWarn?: boolean | RegExp;
+    silentFallbackWarn?: boolean | RegExp;
+    preserveDirectiveContent?: boolean;
+    pluralizationRules?: PluralizationRulesMap;
+    warnHtmlInMessage?: WarnHtmlInMessageLevel;
+    sharedMessages?: LocaleMessages;
+    postTranslation?: PostTranslationHandler;
+    componentInstanceCreatedListener?: ComponentInstanceCreatedListener;
+  }
+}
+
+export type Path = VueI18n.Path;
+export type Locale = VueI18n.Locale;
+export type FallbackLocale = VueI18n.FallbackLocale;
+export type Values = VueI18n.Values;
+export type Choice = VueI18n.Choice;
+export type LocaleMessage = VueI18n.LocaleMessage;
+export type LocaleMessageObject = VueI18n.LocaleMessageObject;
+export type LocaleMessageArray = VueI18n.LocaleMessageArray;
+export type LocaleMessages = VueI18n.LocaleMessages;
+export type TranslateResult = VueI18n.TranslateResult;
+export type DateTimeFormatOptions = VueI18n.DateTimeFormatOptions;
+export type DateTimeFormat = VueI18n.DateTimeFormat;
+export type DateTimeFormats = VueI18n.DateTimeFormats;
+export type DateTimeFormatResult = VueI18n.DateTimeFormatResult;
+export type NumberFormatOptions = VueI18n.NumberFormatOptions;
+export type NumberFormat = VueI18n.NumberFormat;
+export type NumberFormats = VueI18n.NumberFormats;
+export type NumberFormatResult = VueI18n.NumberFormatResult;
+export type NumberFormatToPartsResult = VueI18n.NumberFormatToPartsResult;
+export type WarnHtmlInMessageLevel = VueI18n.WarnHtmlInMessageLevel;
+export type Formatter = VueI18n.Formatter;
+export type MissingHandler = VueI18n.MissingHandler;
+export type PostTranslationHandler = VueI18n.PostTranslationHandler;
+export type IntlAvailability = VueI18n.IntlAvailability;
+export type I18nOptions = VueI18n.I18nOptions;
+
+export declare interface IVueI18n {
+  readonly messages: VueI18n.LocaleMessages;
+  readonly dateTimeFormats: VueI18n.DateTimeFormats;
+  readonly numberFormats: VueI18n.NumberFormats;
+
+  locale: VueI18n.Locale;
+  fallbackLocale: VueI18n.FallbackLocale;
+  missing: VueI18n.MissingHandler;
+  formatter: VueI18n.Formatter;
+  formatFallbackMessages: boolean;
+  silentTranslationWarn: boolean | RegExp;
+  silentFallbackWarn: boolean | RegExp;
+  preserveDirectiveContent: boolean;
+  pluralizationRules: VueI18n.PluralizationRulesMap;
+  warnHtmlInMessage: VueI18n.WarnHtmlInMessageLevel;
+  postTranslation: VueI18n.PostTranslationHandler;
+  t(key: VueI18n.Path, values?: VueI18n.Values): VueI18n.TranslateResult;
+  t(key: VueI18n.Path, locale: VueI18n.Locale, values?: VueI18n.Values): VueI18n.TranslateResult;
+  tc(key: VueI18n.Path, choice?: VueI18n.Choice, values?: VueI18n.Values): string;
+  tc(
+    key: VueI18n.Path,
+    choice: VueI18n.Choice,
+    locale: VueI18n.Locale,
+    values?: VueI18n.Values,
+  ): string;
+  te(key: VueI18n.Path, locale?: VueI18n.Locale): boolean;
+  d(
+    value: number | Date,
+    key?: VueI18n.Path,
+    locale?: VueI18n.Locale,
+  ): VueI18n.DateTimeFormatResult;
+  d(value: number | Date, args?: { [key: string]: string }): VueI18n.DateTimeFormatResult;
+  n(value: number, key?: VueI18n.Path, locale?: VueI18n.Locale): VueI18n.NumberFormatResult;
+  n(value: number, args?: { [key: string]: string }): VueI18n.NumberFormatResult;
+  getLocaleMessage(locale: VueI18n.Locale): VueI18n.LocaleMessageObject;
+  setLocaleMessage(locale: VueI18n.Locale, message: VueI18n.LocaleMessageObject): void;
+  mergeLocaleMessage(locale: VueI18n.Locale, message: VueI18n.LocaleMessageObject): void;
+  getDateTimeFormat(locale: VueI18n.Locale): VueI18n.DateTimeFormat;
+  setDateTimeFormat(locale: VueI18n.Locale, format: VueI18n.DateTimeFormat): void;
+  mergeDateTimeFormat(locale: VueI18n.Locale, format: VueI18n.DateTimeFormat): void;
+  getNumberFormat(locale: VueI18n.Locale): VueI18n.NumberFormat;
+  setNumberFormat(locale: VueI18n.Locale, format: VueI18n.NumberFormat): void;
+  mergeNumberFormat(locale: VueI18n.Locale, format: VueI18n.NumberFormat): void;
+  getChoiceIndex: (choice: number, choicesLength: number) => number;
+}
+
+declare class VueI18n {
+  constructor(options?: VueI18n.I18nOptions)
+
+  readonly messages: VueI18n.LocaleMessages;
+  readonly dateTimeFormats: VueI18n.DateTimeFormats;
+  readonly numberFormats: VueI18n.NumberFormats;
+  readonly availableLocales: VueI18n.Locale[];
+
+  locale: VueI18n.Locale;
+  fallbackLocale: VueI18n.FallbackLocale;
+  missing: VueI18n.MissingHandler;
+  formatter: VueI18n.Formatter;
+  formatFallbackMessages: boolean;
+  silentTranslationWarn: boolean | RegExp;
+  silentFallbackWarn: boolean | RegExp;
+  preserveDirectiveContent: boolean;
+  pluralizationRules: VueI18n.PluralizationRulesMap;
+  warnHtmlInMessage: VueI18n.WarnHtmlInMessageLevel;
+  postTranslation: VueI18n.PostTranslationHandler;
+
+  t(key: VueI18n.Path, values?: VueI18n.Values): VueI18n.TranslateResult;
+  t(key: VueI18n.Path, locale: VueI18n.Locale, values?: VueI18n.Values): VueI18n.TranslateResult;
+  tc(key: VueI18n.Path, choice?: VueI18n.Choice, values?: VueI18n.Values): string;
+  tc(key: VueI18n.Path, choice: VueI18n.Choice, locale: VueI18n.Locale, values?: VueI18n.Values): string;
+  te(key: VueI18n.Path, locale?: VueI18n.Locale): boolean;
+  d(value: number | Date, key?: VueI18n.Path, locale?: VueI18n.Locale): VueI18n.DateTimeFormatResult;
+  d(value: number | Date, args?: { [key: string]: string }): VueI18n.DateTimeFormatResult;
+  n(value: number, key?: VueI18n.Path, locale?: VueI18n.Locale): VueI18n.NumberFormatResult;
+  n(value: number, args?: { [key: string]: string }): VueI18n.NumberFormatResult;
+
+  getLocaleMessage(locale: VueI18n.Locale): VueI18n.LocaleMessageObject;
+  setLocaleMessage(locale: VueI18n.Locale, message: VueI18n.LocaleMessageObject): void;
+  mergeLocaleMessage(locale: VueI18n.Locale, message: VueI18n.LocaleMessageObject): void;
+
+  getDateTimeFormat(locale: VueI18n.Locale): VueI18n.DateTimeFormat;
+  setDateTimeFormat(locale: VueI18n.Locale, format: VueI18n.DateTimeFormat): void;
+  mergeDateTimeFormat(locale: VueI18n.Locale, format: VueI18n.DateTimeFormat): void;
+
+  getNumberFormat(locale: VueI18n.Locale): VueI18n.NumberFormat;
+  setNumberFormat(locale: VueI18n.Locale, format: VueI18n.NumberFormat): void;
+  mergeNumberFormat(locale: VueI18n.Locale, format: VueI18n.NumberFormat): void;
+
+  /**
+   * @param choice {number} a choice index given by the input to $tc: `$tc('path.to.rule', choiceIndex)`
+   * @param choicesLength {number} an overall amount of available choices
+   * @returns a final choice index
+  */
+  getChoiceIndex: (choice: number, choicesLength: number) => number;
+
+  static install: PluginFunction<never>;
+  static version: string;
+  static availabilities: VueI18n.IntlAvailability;
+}
+
+declare module 'vue/types/vue' {
+  interface Vue {
+    readonly $i18n: VueI18n & IVueI18n;
+    $t: typeof VueI18n.prototype.t;
+    $tc: typeof VueI18n.prototype.tc;
+    $te: typeof VueI18n.prototype.te;
+    $d: typeof VueI18n.prototype.d;
+    $n: typeof VueI18n.prototype.n;
+  }
+}
+
+declare module 'vue/types/options' {
+  interface ComponentOptions<V extends Vue> {
+    i18n?: {
+      messages?: VueI18n.LocaleMessages;
+      dateTimeFormats?: VueI18n.DateTimeFormats;
+      numberFormats?: VueI18n.NumberFormats;
+      sharedMessages?: VueI18n.LocaleMessages;
+    };
+  }
+}
+
+export default VueI18n;
diff --git a/node_modules/vue-i18n/vetur/attributes.json b/node_modules/vue-i18n/vetur/attributes.json
new file mode 100644
index 0000000..2b64f23
--- /dev/null
+++ b/node_modules/vue-i18n/vetur/attributes.json
@@ -0,0 +1,34 @@
+{
+  "i18n/path" : {
+    "description": "[required]\nKeypath of the locale message",
+    "type": "string"
+  },
+  "i18n/locale" : {
+    "description": "[optional]\nLocale to be used in this translation",
+    "type": "string"
+  },
+  "i18n/tag" : {
+    "description": "[optional]\nWhich tag to render, default is \"span\"",
+    "type": "string"
+  },
+  "i18n/places": {
+    "description": "[optional after v8.14]\nWill be removed in the next major version, use the slot syntax instead\n\nhttp://kazupon.github.io/vue-i18n/guide/interpolation.html#slots-syntax-usage",
+    "type": "array|object"
+  },
+  "i18n-n/value" : {
+    "description": "[required]\nNumber to be used in formatting",
+    "type": "number"
+  },
+  "i18n-n/format": {
+    "description": "[optional]\nNumber format name or object with explicit format options",
+    "type": "string|object"
+  },
+  "i18n-n/locale" : {
+    "description": "[optional]\nLocale to be used in this translation",
+    "type": "string"
+  },
+  "i18n-n/tag" : {
+    "description": "[optional]\nWhich tag to render, default is `span`",
+    "type": "string"
+  }
+}
diff --git a/node_modules/vue-i18n/vetur/tags.json b/node_modules/vue-i18n/vetur/tags.json
new file mode 100644
index 0000000..f6f4222
--- /dev/null
+++ b/node_modules/vue-i18n/vetur/tags.json
@@ -0,0 +1,20 @@
+{
+  "i18n": {
+    "attributes": [
+      "path",
+      "locale",
+      "tag",
+      "places"
+    ],
+    "description": "This is a functional component that can be used when HTML interpolation is needed.\n\nhttp://kazupon.github.io/vue-i18n/guide/interpolation.html#basic-usage"
+  },
+  "i18n-n": {
+    "attributes": [
+      "value",
+      "format",
+      "locale",
+      "tag"
+    ],
+    "description": "This functional component provides a way to use HTML interpolation in pair with number formatting.\n\nhttp://kazupon.github.io/vue-i18n/guide/number.html#custom-formatting"
+  }
+}
diff --git a/node_modules/vue-jsonp/LICENSE b/node_modules/vue-jsonp/LICENSE
new file mode 100644
index 0000000..794bf00
--- /dev/null
+++ b/node_modules/vue-jsonp/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 LancerComet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/node_modules/vue-jsonp/README.md b/node_modules/vue-jsonp/README.md
new file mode 100644
index 0000000..d1f1a9e
--- /dev/null
+++ b/node_modules/vue-jsonp/README.md
@@ -0,0 +1,153 @@
+# Vue-jsonp
+
+[![VueJsonp](https://github.com/LancerComet/vue-jsonp/workflows/Test/badge.svg)](https://github.com/LancerComet/vue-jsonp/actions)
+
+A tiny library for handling JSONP request.
+
+## Quick Start
+
+As Vue plugin:
+
+```ts
+import { VueJsonp } from 'vue-jsonp'
+
+// Vue Plugin.
+Vue.use(VueJsonp)
+
+// Now you can use this.$jsonp in Vue components.
+const vm = new Vue()
+vm.$jsonp('/some-jsonp-url', {
+  myCustomUrlParam: 'veryNice'
+})
+```
+
+Use function directly:
+
+```ts
+import { jsonp } from 'vue-jsonp'
+
+jsonp('/some-jsonp-url', {
+  myCustomUrlParam: 'veryNice'
+})
+```
+
+## Send data and set query & function name
+
+### Send data
+
+```ts
+// The request url will be "/some-jsonp-url?name=LancerComet&age=100&callback=jsonp_{RANDOM_STR}".
+jsonp('/some-jsonp-url', {
+  name: 'LancerComet',
+  age: 100
+})
+```
+
+### Custom query & function name
+
+The url uniform is `/url?{callbackQuery}={callbackName}&...`, the default is `/url?callback=jsonp_{RANDOM_STRING}&...`.
+
+And you can change it like this:
+
+```ts
+// The request url will be "/some-jsonp-url?name=LancerComet&age=100&cb=jsonp_func".
+jsonp('/some-jsonp-url', {
+  callbackQuery: 'cb',
+  callbackName: 'jsonp_func',
+  name: 'LancerComet',
+  age: 100
+})
+```
+
+## Module exports
+
+ - `VueJsonp: PluginObject<never>`
+ 
+ - `jsonp<T>: (url: string, param?: IJsonpParam, timeout?: number) => Promise<T>`
+ 
+## API
+
+### IJsonpParam
+
+IJsonpParam is the type of param for jsonp function.
+
+```ts
+/**
+ * JSONP parameter declaration.
+ */
+interface IJsonpParam {
+  /**
+   * Callback query name.
+   * This param is used to define the query name of the callback function.
+   *
+   * @example
+   * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
+   * jsonp('/some-url', {
+   *   callbackQuery: 'myCallback',
+   *   callbackName: 'jsonp_func',
+   *   myCustomUrlParam: 'veryNice'
+   * })
+   *
+   * @default callback
+   */
+  callbackQuery?: string
+
+  /**
+   * Callback function name.
+   * This param is used to define the jsonp function name.
+   *
+   * @example
+   * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
+   * jsonp('/some-url', {
+   *   callbackQuery: 'myCallback',
+   *   callbackName: 'jsonp_func',
+   *   myCustomUrlParam: 'veryNice'
+   * })
+   *
+   * @default jsonp_ + randomStr()
+   */
+  callbackName?: string
+
+  /**
+   * Custom data.
+   */
+  [key: string]: any
+}
+```
+
+## Example
+
+```ts
+import Vue from 'vue'
+import { VueJsonp } from 'vue-jsonp'
+
+Vue.use(VueJsonp)
+
+const vm = new Vue()
+const { code, data, message } = await vm.$jsonp<{
+  code: number,
+  message: string,
+  data: {
+    id: number,
+    nickname: string
+  }
+}>('/my-awesome-url', {
+  name: 'MyName', age: 20
+})
+
+assert(code === 0)
+assert(message === 'ok')
+assert(data.id === 1)
+assert(data.nickname === 'John Smith')
+```
+
+```ts
+import { jsonp } from 'vue-jsonp'
+
+const result = await jsonp<string>('/my-awesome-url')
+assert(result === 'such a jsonp')
+```
+
+## License
+
+MIT
diff --git a/node_modules/vue-jsonp/dist/index.d.ts b/node_modules/vue-jsonp/dist/index.d.ts
new file mode 100644
index 0000000..4f3f502
--- /dev/null
+++ b/node_modules/vue-jsonp/dist/index.d.ts
@@ -0,0 +1,73 @@
+/**
+ * Vue Jsonp.
+ * # Carry Your World #
+ *
+ * @author: LancerComet
+ * @license: MIT
+ */
+import { PluginObject } from 'vue/types/plugin';
+declare module 'vue/types/vue' {
+    interface Vue {
+        $jsonp: typeof jsonp;
+    }
+}
+/**
+ * Vue JSONP.
+ */
+declare const VueJsonp: PluginObject<never>;
+/**
+ * JSONP function.
+ *
+ * @param { string } url Target URL address.
+ * @param { IJsonpParam } param Querying params object.
+ * @param { number } timeout Timeout setting (ms).
+ *
+ * @example
+ * jsonp('/url', {
+ *   callbackQuery: ''
+ *   callbackName: '',
+ *   name: 'LancerComet',
+ *   age: 26
+ * }, 1000)
+ */
+declare function jsonp<T = any>(url: string, param?: IJsonpParam, timeout?: number): Promise<T>;
+export { VueJsonp, jsonp };
+/**
+ * JSONP parameter declaration.
+ */
+interface IJsonpParam {
+    /**
+     * Callback query name.
+     * This param is used to define the query name of the callback function.
+     *
+     * @example
+     * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
+     * jsonp('/some-url', {
+     *   callbackQuery: 'myCallback',
+     *   callbackName: 'jsonp_func',
+     *   myCustomUrlParam: 'veryNice'
+     * })
+     *
+     * @default callback
+     */
+    callbackQuery?: string;
+    /**
+     * Callback function name.
+     * This param is used to define the jsonp function name.
+     *
+     * @example
+     * // The request url will be "/some-url?myCallback=jsonp_func&myCustomUrlParam=veryNice"
+     * jsonp('/some-url', {
+     *   callbackQuery: 'myCallback',
+     *   callbackName: 'jsonp_func',
+     *   myCustomUrlParam: 'veryNice'
+     * })
+     *
+     * @default jsonp_ + randomStr()
+     */
+    callbackName?: string;
+    /**
+     * Custom data.
+     */
+    [key: string]: any;
+}
diff --git a/node_modules/vue-jsonp/dist/index.esm.js b/node_modules/vue-jsonp/dist/index.esm.js
new file mode 100644
index 0000000..893bec4
--- /dev/null
+++ b/node_modules/vue-jsonp/dist/index.esm.js
@@ -0,0 +1,8 @@
+function e(t,n){t=t.replace(/=/g,"");var o=[];switch(n.constructor){case String:case Number:case Boolean:o.push(encodeURIComponent(t)+"="+encodeURIComponent(n));break;case Array:n.forEach((function(n){o=o.concat(e(t+"[]=",n))}));break;case Object:Object.keys(n).forEach((function(r){var a=n[r];o=o.concat(e(t+"["+r+"]",a))}))}return o}function t(e){var n=[];return e.forEach((function(e){"string"==typeof e?n.push(e):n=n.concat(t(e))})),n}
+/**
+ * Vue Jsonp.
+ * # Carry Your World #
+ *
+ * @author: LancerComet
+ * @license: MIT
+ */var n={install:function(e){e.prototype.$jsonp=o}};function o(n,o,r){if(void 0===o&&(o={}),"string"!=typeof n)throw new Error('[Vue-jsonp] Type of param "url" is not string.');if("object"!=typeof o||!o)throw new Error("[Vue-jsonp] Invalid params, should be an object.");return r="number"==typeof r?r:5e3,new Promise((function(a,c){var u="string"==typeof o.callbackQuery?o.callbackQuery:"callback",i="string"==typeof o.callbackName?o.callbackName:"jsonp_"+(Math.floor(1e5*Math.random())*Date.now()).toString(16);o[u]=i,delete o.callbackQuery,delete o.callbackName;var s=[];Object.keys(o).forEach((function(t){s=s.concat(e(t,o[t]))}));var l=t(s).join("&"),f=function(){p(),clearTimeout(m),c({status:400,statusText:"Bad Request"})},p=function(){b.removeEventListener("error",f)},d=function(){document.body.removeChild(b),delete window[i]},m=null;r>-1&&(m=setTimeout((function(){p(),d(),c({statusText:"Request Timeout",status:408})}),r)),window[i]=function(e){clearTimeout(m),p(),d(),a(e)};var b=document.createElement("script");b.addEventListener("error",f),b.src=n+(/\?/.test(n)?"&":"?")+l,document.body.appendChild(b)}))}export{n as VueJsonp,o as jsonp};
diff --git a/node_modules/vue-jsonp/dist/index.js b/node_modules/vue-jsonp/dist/index.js
new file mode 100644
index 0000000..c5e0aee
--- /dev/null
+++ b/node_modules/vue-jsonp/dist/index.js
@@ -0,0 +1,8 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).VueJsonp={})}(this,(function(e){"use strict";function t(e,o){e=e.replace(/=/g,"");var n=[];switch(o.constructor){case String:case Number:case Boolean:n.push(encodeURIComponent(e)+"="+encodeURIComponent(o));break;case Array:o.forEach((function(o){n=n.concat(t(e+"[]=",o))}));break;case Object:Object.keys(o).forEach((function(r){var c=o[r];n=n.concat(t(e+"["+r+"]",c))}))}return n}function o(e){var t=[];return e.forEach((function(e){"string"==typeof e?t.push(e):t=t.concat(o(e))})),t}
+/**
+   * Vue Jsonp.
+   * # Carry Your World #
+   *
+   * @author: LancerComet
+   * @license: MIT
+   */var n={install:function(e){e.prototype.$jsonp=r}};function r(e,n,r){if(void 0===n&&(n={}),"string"!=typeof e)throw new Error('[Vue-jsonp] Type of param "url" is not string.');if("object"!=typeof n||!n)throw new Error("[Vue-jsonp] Invalid params, should be an object.");return r="number"==typeof r?r:5e3,new Promise((function(c,a){var i="string"==typeof n.callbackQuery?n.callbackQuery:"callback",s="string"==typeof n.callbackName?n.callbackName:"jsonp_"+(Math.floor(1e5*Math.random())*Date.now()).toString(16);n[i]=s,delete n.callbackQuery,delete n.callbackName;var u=[];Object.keys(n).forEach((function(e){u=u.concat(t(e,n[e]))}));var f=o(u).join("&"),l=function(){p(),clearTimeout(b),a({status:400,statusText:"Bad Request"})},p=function(){m.removeEventListener("error",l)},d=function(){document.body.removeChild(m),delete window[s]},b=null;r>-1&&(b=setTimeout((function(){p(),d(),a({statusText:"Request Timeout",status:408})}),r)),window[s]=function(e){clearTimeout(b),p(),d(),c(e)};var m=document.createElement("script");m.addEventListener("error",l),m.src=e+(/\?/.test(e)?"&":"?")+f,document.body.appendChild(m)}))}e.VueJsonp=n,e.jsonp=r,Object.defineProperty(e,"__esModule",{value:!0})}));
diff --git a/node_modules/vue-jsonp/dist/utils/index.d.ts b/node_modules/vue-jsonp/dist/utils/index.d.ts
new file mode 100644
index 0000000..e78bb4b
--- /dev/null
+++ b/node_modules/vue-jsonp/dist/utils/index.d.ts
@@ -0,0 +1,20 @@
+/**
+ * Generate random string.
+ *
+ * @return { string }
+ */
+declare function randomStr(): string;
+/**
+ * Format params into querying string.
+ *
+ * @return {string[]}
+ */
+declare function formatParams(queryKey: string, value: any): string[];
+/**
+ * Flat querys.
+ *
+ * @param {string[] | (string[])[]} array
+ * @returns
+ */
+declare function flatten(array: string[] | (string[])[]): string[];
+export { formatParams, flatten, randomStr };
diff --git a/node_modules/vue-jsonp/package.json b/node_modules/vue-jsonp/package.json
new file mode 100644
index 0000000..c268779
--- /dev/null
+++ b/node_modules/vue-jsonp/package.json
@@ -0,0 +1,50 @@
+{
+  "name": "vue-jsonp",
+  "version": "2.0.0",
+  "description": "A tiny library for handling JSONP request.",
+  "main": "./dist/index.js",
+  "module": "./dist/index.esm.js",
+  "keywords": [
+    "Vue",
+    "JSONP"
+  ],
+  "files": [
+    "dist/",
+    "index.d.ts",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "rollup -c",
+    "test": "jest",
+    "pretest": "npm run build",
+    "preversion": "npm run test",
+    "prepublish": "npm run test"
+  },
+  "author": {
+    "name": "LancerComet",
+    "email": "chw644@hotmail.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/LancerComet/vue-jsonp.git"
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "@types/expect-puppeteer": "^4.4.3",
+    "@types/jest": "^26.0.14",
+    "@types/jest-environment-puppeteer": "^4.4.0",
+    "@types/puppeteer": "^3.0.2",
+    "jest": "^26.4.2",
+    "jest-puppeteer": "^4.4.0",
+    "puppeteer": "^5.3.1",
+    "rollup": "^2.28.2",
+    "rollup-plugin-cleanup": "^3.2.1",
+    "rollup-plugin-delete": "^2.0.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-typescript2": "^0.27.3",
+    "ts-jest": "^26.4.1",
+    "tslint": "^6.1.3",
+    "typescript": "^4.0.3",
+    "vue": "^2.6.12"
+  }
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..8f8ab19
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,155 @@
+{
+  "name": "uView",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "uView",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "crypto-js": "^4.2.0",
+        "html2canvas": "^1.4.1",
+        "js-md5": "^0.8.3",
+        "jweixin-module": "^1.6.0",
+        "vue-i18n": "^8.20.0",
+        "vue-jsonp": "^2.0.0"
+      }
+    },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/js-md5": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz",
+      "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
+    },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
+    "node_modules/vue-i18n": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
+      "integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg=="
+    },
+    "node_modules/vue-jsonp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
+      "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
+    }
+  },
+  "dependencies": {
+    "base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
+    },
+    "crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
+    "css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "requires": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "requires": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      }
+    },
+    "js-md5": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz",
+      "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
+    },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
+    "text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "requires": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "requires": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
+    "vue-i18n": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
+      "integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg=="
+    },
+    "vue-jsonp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
+      "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..60d1f82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "uView",
+  "version": "1.0.0",
+  "description": "<p align=\"center\">\r     <img alt=\"logo\" src=\"https://uviewui.com/common/logo.png\" width=\"120\" height=\"120\" style=\"margin-bottom: 10px;\">\r </p>\r <h3 align=\"center\" style=\"margin: 30px 0 30px;font-weight: bold;font-size:40px;\">uView</h3>\r <h3 align=\"center\">多平台快速开发的UI框架</h3>",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/YanxinNet/uView.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/YanxinNet/uView/issues"
+  },
+  "homepage": "https://github.com/YanxinNet/uView#readme",
+  "dependencies": {
+    "crypto-js": "^4.2.0",
+    "html2canvas": "^1.4.1",
+    "js-md5": "^0.8.3",
+    "jweixin-module": "^1.6.0",
+    "vue-i18n": "^8.20.0",
+    "vue-jsonp": "^2.0.0"
+  }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..dbd1b97
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,678 @@
+{
+  "easycom": {
+    "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+  },
+  "condition": {
+    //模式配置，仅开发期间生效
+    "current": 0,
+    //当前激活的模式(list 的索引项)
+    "list": [
+      {
+        "name": "test",
+        //模式名称
+        "path": "pages/login/login/login"
+        //启动页面，必选
+        // "query": "uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1" //启动参数，在页面的onLoad函数里面得到
+      }
+    ]
+  },
+  "pages": [
+    // 登录
+    {
+      "path": "pages/login/login/login",
+      "style": {
+        "navigationBarTitleText": "登录",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
+    // 注册,
+    {
+      "path": "pages/login/register/register",
+      "style": {
+        "navigationBarTitleText": "注册",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    //实名验证
+    // 完善信息
+    {
+      "path": "pages/login/perfect/perfect",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 毕业生认证
+    {
+      "path": "pages/login/graduateCertification/graduateCertification",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 首页,
+    {
+      "path": "pages/home/home/home",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 全部服务,
+    {
+      "path": "pages/home/home/components/recommend/allServices",
+      "style": {
+        "navigationBarTitleText": "全部服务",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 更多好友,
+    {
+      "path": "pages/home/home/components/recommend/moreFriends",
+      "style": {
+        "navigationBarTitleText": "更多好友",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 话题广场,
+    {
+      "path": "pages/home/home/components/topic/topicSquare",
+      "style": {
+        "navigationBarTitleText": "话题广场",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 话题详情,
+    {
+      "path": "pages/home/home/components/topic/topicDetail",
+      "style": {
+        "navigationBarTitleText": "话题详情",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 搜索页,
+    {
+      "path": "pages/home/home/components/searchPage/index",
+      "style": {
+        "navigationBarTitleText": "搜索",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 帖子详情,
+    {
+      "path": "pages/home/home/components/contentDetail/index",
+      "style": {
+        "navigationBarTitleText": "详情",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 找校友,
+    {
+      "path": "pages/main/index/index",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 消息列表,
+    {
+      "path": "pages/message/msgList/msgList",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 校友圈,
+    {
+      "path": "pages/AlumniCircle/alumnus/alumnus",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/AlumniCircle/forward/forward",
+      "style": {
+        "navigationBarTitleText": "转发",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 我的,
+    {
+      "path": "pages/my/my/my",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 查看实名信息
+    // {
+    // 	"path": "pages/my/realDetail/realDetail",
+    // 	"style": {
+    // 		"navigationBarTitleText": "实名认证",
+    // 		"enablePullDownRefresh": false
+    // 	}
+    // },
+    // 添加教育经历
+    {
+      "path": "pages/my/AddEducation/AddEducation",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 对话框,
+    {
+      "path": "pages/message/dialogBox/dialogBox",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 互动消息,
+    {
+      "path": "pages/message/interactionList/interactionList",
+      "style": {
+        "navigationBarTitleText": "互动消息",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 管理列表,
+    {
+      "path": "pages/message/adminList/adminList",
+      "style": {
+        "navigationBarTitleText": "管理列表",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 系统消息,
+    {
+      "path": "pages/message/sysList/sysList",
+      "style": {
+        "navigationBarTitleText": "系统消息",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 新增关注,
+    {
+      "path": "pages/message/attentionList/attentionList",
+      "style": {
+        "navigationBarTitleText": "新增关注",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 搜索校友圈,
+    {
+      "path": "pages/AlumniCircle/searchAlumnus/searchAlumnus",
+      "style": {
+        "navigationBarTitleText": "搜索",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 设置,
+    {
+      "path": "pages/my/mySeting/mySeting",
+      "style": {
+        "navigationBarTitleText": "设置",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 我的信息详情,
+    {
+      "path": "pages/my/myDetails/myDetails",
+      "style": {
+        "navigationBarTitleText": "我的",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 头像裁剪
+    {
+      "path": "uview-ui/components/u-avatar-cropper/u-avatar-cropper",
+      "style": {
+        "navigationBarTitleText": "头像裁剪",
+        "navigationBarBackgroundColor": "#000000",
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 官方认证,
+    {
+      "path": "pages/my/authentication/authentication",
+      "style": {
+        "navigationBarTitleText": "官方认证",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    //认证详情,
+    {
+      "path": "pages/my/certificationDetails/certificationDetails",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 搜索,
+    {
+      "path": "pages/main/search/search",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 忘记密码,
+    {
+      "path": "pages/login/ForgetPassword/ForgetPassword",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 文章详情,
+    {
+      "path": "pages/AlumniCircle/ArticleDetails/ArticleDetails",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 评论详情,
+    {
+      "path": "pages/AlumniCircle/ReplyDetails/ReplyDetails",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    // 文章发布页面,
+    {
+      "path": "pages/AlumniCircle/release/release",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/AlumniCircle/Alumni/Alumni",
+      "style": {
+        "navigationBarTitleText": "校友",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/AlumniCircle/userDetail/userDetail",
+      "style": {
+        "navigationBarTitleText": "个人主页",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/login/confirmPwd/confirmPwd",
+      "style": {
+        "navigationBarTitleText": "确认密码",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/ShoolList/ShoolList",
+      "style": {
+        "navigationBarTitleText": "教育经历",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/TeacherList/TeacherList",
+      "style": {
+        "navigationBarTitleText": "任职院校",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/shoolAuthentication/shoolAuthentication",
+      "style": {
+        "navigationBarTitleText": "学历认证",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/ReleaseList/ReleaseList",
+      "style": {
+        "navigationBarTitleText": "我的发布",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/examine/examine",
+      "style": {
+        "navigationBarTitleText": "审核",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/AuditDeatil/AuditDeatil",
+      "style": {
+        "navigationBarTitleText": "审核资料",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/Feedback/Feedback",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/wishlist/wishlist",
+      "style": {
+        "navigationBarTitleText": "心愿单",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/wishlist/addwishlist",
+      "style": {
+        "navigationBarTitleText": "添加心愿",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/BackSchool/BackSchool",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/BackApply/BackApply",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/BackDetail/BackDetail",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/BackCode/BackCode",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/BackSuccess/BackSuccess",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/personalResume/personalResume",
+      "style": {
+        "navigationBarTitleText": "个人简历",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/personalResume/online",
+      "style": {
+        "navigationBarTitleText": "在线简历",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/personalResume/workPage",
+      "style": {
+        "navigationBarTitleText": "工作经历",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/personalResume/proPage",
+      "style": {
+        "navigationBarTitleText": "工作经历",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/BackCodeLook/BackCodeLook",
+      "style": {
+        "navigationBarTitleText": "返校核验",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/fileAcc/fileAcc",
+      "style": {
+        "navigationBarTitleText": "附件简历",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/login/roleSelection",
+      "style": {
+        "navigationBarTitleText": "角色选择",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/login/teacherCertification",
+      "style": {
+        "navigationBarTitleText": "教职工认证",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/webview/index",
+      "style": {
+        "navigationBarTitleText": "网页链接",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/login/recognitionResult/recognitionResult",
+      "style": {
+        "navigationBarTitleText": "提示",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/login/recognitionResult/recognitionFailed",
+      "style": {
+        "navigationBarTitleText": "认证失败",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/mySeting/mySetPwd",
+      "style": {
+        "navigationBarTitleText": "设置密码",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    },
+    {
+      "path": "pages/my/myDetails/myInterest",
+      "style": {
+        "navigationBarTitleText": "兴趣爱好",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+        // 隐藏系统导航栏
+      }
+    }
+  ],
+  "subPackages": [],
+  // "preloadRule": {
+  //     "pages/example/components": {
+  //         "network": "all",
+  //         "packages": ["pages/componentsA", "pages/componentsB", "pages/componentsC"]
+  //     }
+  // },
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uView",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#FFFFFF"
+  },
+  "tabBar": {
+    "color": "#909399",
+    "selectedColor": "#303133",
+    "backgroundColor": "#FFFFFF",
+    "borderStyle": "black",
+    "list": [
+      {
+        "pagePath": "pages/home/home/home",
+        "iconPath": "/static/common/tabbar/index.png",
+        "selectedIconPath": "/static/common/tabbar/selectindex.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/message/msgList/msgList",
+        "iconPath": "static/common/tabbar/message.png",
+        "selectedIconPath": "static/common/tabbar/selectmessage.png",
+        "text": "消息"
+      },
+      {
+        "pagePath": "pages/main/index/index",
+        "iconPath": "/static/common/tabbar/findFriends.png",
+        "selectedIconPath": "/static/common/tabbar/selectFindFridend.png",
+        "text": "找校友"
+      },
+      {
+        "pagePath": "pages/AlumniCircle/alumnus/alumnus",
+        "iconPath": "static/common/tabbar/AlumniCircle.png",
+        "selectedIconPath": "static/common/tabbar/selectAlumniCircle.png",
+        "text": "校友圈"
+      },
+      {
+        "pagePath": "pages/my/my/my",
+        "iconPath": "static/common/tabbar/my.png",
+        "selectedIconPath": "static/common/tabbar/selectmy.png",
+        "text": "我的"
+      }
+    ]
+  }
+}
diff --git a/pages/AlumniCircle/Alumni/Alumni copy.vue b/pages/AlumniCircle/Alumni/Alumni copy.vue
new file mode 100644
index 0000000..2df3e2b
--- /dev/null
+++ b/pages/AlumniCircle/Alumni/Alumni copy.vue	
@@ -0,0 +1,249 @@
+<template>
+	<view style="background: #fff">
+		<u-navbar back-text="" title="校友找找" ></u-navbar>
+		<view class="slot-wrap">
+			<u-tabs-swiper ref="uTabs" :list="navList" :current="current" :is-scroll="true" gutter='60'
+				:active-item-style="{ color: '#3CB5FB',transition:'all 0.5s'}" :bar-style="{ background: '#3CB5FB' }"
+				@change="tabsChange"></u-tabs-swiper>
+		</view>
+		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
+			style="height: calc(100vh - 0.8rem); width: 100%">
+			<swiper-item class="swiper-item" v-for="(item, index) in navList" :key="index"
+				style="height: calc(100vh - 0.8rem); width: 100%">
+				<scroll-view scroll-y="true" style="height: calc(100vh - 0.8rem); width: 100%"
+					@scrolltolower="onreachBottom" @refresherrefresh='' :scroll-with-animation="true">
+					<!-- 学生 -->
+					<template v-if='item.List.length'>
+						<view class="flex-col student_list group_7">
+							<view class="flex-row list-item group_8" :key="i" v-for="(v, i) in item.List"
+								@click="toDetil(v.userId)">
+								<u-avatar :src="$u.http.config.imgUrl+v.imageUrl" class="image_1" ></u-avatar>
+								<view class="justify-between section_4">
+									<view class="flex-col items-start group_9 view_1">
+										<text class="text_6">{{v.name}}</text>
+										<text class="text_24">{{v.college+' '+ v.major}} {{v.startYear}}级</text>
+									</view>
+									<image src="/static/common/img/16486889538940144558.png" class="image_3" />
+								</view>
+							</view>
+						</view>
+					</template>
+					<view v-else style='padding-top:30vh'>
+						<u-empty text="没有找到匹配的校友" mode="message"></u-empty>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				swiperCurrent: 0,
+				current: 0,
+				List: [],
+				navList: [{
+						name: "全部",
+						List: [],
+					},
+					{
+						name: "学院",
+						List: [],
+					},
+					{
+						name: "同专业",
+						List: [],
+					},
+					{
+						name: "同届",
+						List: [],
+					},
+					{
+						name: "同行",
+						List: [],
+					},
+					{
+						name: "同城",
+						List: [],
+					},
+				],
+				PageIndex: 1,
+				PageSize: 10,
+			};
+		},
+		watch: {
+			current() {
+				this.PageIndex = 1
+				this.getList(1);
+			},
+		},
+		onLoad() {
+			this.getList(1);
+		},
+		onShow() {
+			// this.getList(1);
+		},
+		methods: {
+			getList(type) {
+				const data = {
+					PageIndex: this.PageIndex,
+					PageSize: this.PageSize,
+					type: this.current
+				}
+				this.$u.api.AlumnSearchList(data).then(res => {
+					if (this.navList[this.current].List.length == 0 || type == 1) {
+						this.navList[this.current].List = res.items
+					} else {
+						this.navList[this.current].List = this.navList[this.current].List.concat(res.items)
+					}
+				})
+			},
+			toDetil(id) {
+				this.$u.route({
+					url: '/pages/AlumniCircle/userDetail/userDetail?id=' + id + '&type=2'
+				})
+			},
+			// tabs通知swiper切换
+			tabsChange(index) {
+				this.swiperCurrent = index;
+			},
+			// swiper-item左右移动，通知tabs的滑块跟随移动
+			transition(e) {
+				let dx = e.detail.dx;
+				this.$refs.uTabs.setDx(dx);
+			},
+			// 由于swiper的内部机制问速切题，快换swiper不会触发dx的连续变化，需要在结束时重置状态
+			// swiper滑动结束，分别设置tabs和swiper的状态
+			animationfinish(e) {
+				let current = e.detail.current;
+				this.$refs.uTabs.setFinishCurrent(current);
+				this.swiperCurrent = current;
+				this.current = current;
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {
+				this.PageIndex++
+				this.getList(2)
+			},
+			//返回上一级
+			router() {
+				uni.switchTab({
+					url: '../../AlumniCircle/alumnus/alumnus'
+				});
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-avatar__sex {
+		width: 0.1rem !important;
+		height: 0.1rem !important;
+		border: none;
+	}
+
+	.student_list {
+		.list-item {
+			padding: 0.05rem 0.2rem;
+			box-shadow: 0px 0.0063rem #eaeaea;
+
+			.image_1 {
+				flex-shrink: 0;
+				align-self: center;
+				width: 0.5rem !important;
+				height: 0.5rem !important;  
+				border-radius: 50%;
+				flex:0 0 0.5rem !important;
+			}
+
+			.section_4 {
+				margin-left: 0.05rem;
+				padding: 0.1rem;
+				flex: 1 1 auto;
+
+				.group_9 {
+					align-self: flex-start;
+					color: #020202;
+					font-size: 0.19rem;
+					letter-spacing: 0.019rem;
+
+					.text_6 {
+						color: #020202;
+						font-size: 0.16rem;
+						line-height: 1;
+						letter-spacing: 0.019rem;
+					}
+
+					.text_24 {
+						margin-top: 0.1rem;
+						color: #b4b6bd;
+						font-size: 0.14rem;
+						line-height: 1;
+						letter-spacing: 0.015rem;
+						width: 2rem;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
+
+				.view_1 {
+					align-self: initial;
+					color: initial;
+					font-size: initial;
+					line-height: initial;
+					letter-spacing: initial;
+					white-space: initial;
+				}
+
+				.image_3 {
+					align-self: center;
+					width: 0.075rem;
+					height: 0.14rem;
+					border-radius: 50%;
+				}
+			}
+		}
+	}
+
+	.list {
+		margin-top: 0.17rem;
+		padding: 0 5%;
+
+		.list-item {
+			padding: 0.13rem 0.12rem 0.13rem 0.33rem;
+			background-color: #f6f7fa;
+			border-radius: 0.05rem;
+
+			.text_6 {
+				color: #373b48;
+				font-size: 0.15rem;
+				font-family: PingFang;
+				line-height: 0.14rem;
+			}
+
+			.text_10 {
+				color: #ffffff;
+				line-height: 0.16rem;
+			}
+
+			.image_1 {
+				margin-bottom: 0.02rem;
+				width: 0.06rem;
+				height: 0.11rem;
+			}
+
+			.image_5 {
+				margin-bottom: 0.04rem;
+			}
+		}
+
+		.section_5 {
+			padding: 0.12rem 0.12rem 0.12rem 0.34rem;
+			background-color: #2e9bff;
+			margin-top: 0.07rem;
+		}
+	}
+</style>
diff --git a/pages/AlumniCircle/Alumni/Alumni.vue b/pages/AlumniCircle/Alumni/Alumni.vue
new file mode 100644
index 0000000..74bbe90
--- /dev/null
+++ b/pages/AlumniCircle/Alumni/Alumni.vue
@@ -0,0 +1,349 @@
+<template>
+  <view style="background: #fff">
+    <u-navbar back-text="" title="校友找找"></u-navbar>
+    <view class="slot-wrap">
+      <u-tabs-swiper ref="uTabs" :list="navList" :current="current" :is-scroll="true" gutter="60"
+        :active-item-style="{ color: '#3CB5FB', transition: 'all 0.5s' }" :bar-style="{ background: '#3CB5FB' }"
+        @change="tabsChange"></u-tabs-swiper>
+    </view>
+    <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
+      style="height: calc(100vh - 0.8rem); width: 100%">
+      <swiper-item class="swiper-item" v-for="(item, index) in navList" :key="index"
+        style="height: calc(100vh - 0.8rem); width: 100%">
+        <scroll-view scroll-y="true" style="height: calc(100vh - 0.8rem); width: 100%" @scrolltolower="onreachBottom"
+          @refresherrefresh="" :scroll-with-animation="true">
+          <!-- 学生 -->
+          <template v-if="item.List.length">
+            <view class="flex-col student_list group_7">
+              <view class="flex-row list-item group_8" :key="i" v-for="(v, i) in item.List" @click="toDetil(v.userId)">
+                <u-avatar :src="$u.http.config.imgUrl + v.imageUrl" class="image_1"></u-avatar>
+                <view class="justify-between section_4">
+                  <view class="flex-col items-start group_9 view_1">
+                    <text class="text_6">{{ v.name }}</text>
+                    <!-- <text class="text_24">
+                      {{ v.college + " " + v.major }} {{ v.startYear }}级
+                    </text> -->
+                    <!-- <u-tag
+                      :text="v.college + ' ' + v.major"
+                      type="primary"
+                      mode="plain"
+                      style="margin-top: 0.05rem"
+                    ></u-tag> -->
+                    <view class="tag">
+                      <text class="tag-item">{{ v.college }}</text>
+                      <text class="tag-item">{{ v.major }}</text>
+                    </view>
+                  </view>
+                  <!-- <u-button
+                    class="follow-btn"
+                    shape="circle"
+                    :type="v.isFollowed ? 'default' : 'primary'"
+                    @click="handleFollow(v.userId)"
+                  >
+                    {{ v.isFollowed ? "已关注" : "未关注" }}
+                  </u-button> -->
+                  <view class="flex-row ">
+                    <text class="message" @click.stop="toMessage(v.userId)">私信</text>
+                    <!-- <image
+                    src="/static/common/img/16486889538940144558.png"
+                    class="image_3"
+                    /> -->
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+          <view v-else style="padding-top: 30vh">
+            <!-- <u-empty text="没有找到匹配的校友" mode="message"></u-empty> -->
+            <no-data type="friends" text="没有找到匹配的校友"></no-data>
+          </view>
+        </scroll-view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+import NoData from "components/NoData.vue";
+export default {
+  components: {
+    NoData,
+  },
+  data() {
+    return {
+      swiperCurrent: 0,
+      current: 0,
+      List: [],
+      navList: [
+        {
+          name: "全部",
+          List: [],
+        },
+        {
+          name: "学院",
+          List: [],
+        },
+        {
+          name: "同专业",
+          List: [],
+        },
+        {
+          name: "同届",
+          List: [],
+        },
+        {
+          name: "同行",
+          List: [],
+        },
+        {
+          name: "同城",
+          List: [],
+        },
+      ],
+      PageIndex: 1,
+      PageSize: 10,
+    };
+  },
+  watch: {
+    current() {
+      this.PageIndex = 1;
+      this.getList(1);
+    },
+  },
+  onLoad() {
+    this.getList(1);
+  },
+  onShow() {
+    // this.getList(1);
+  },
+  methods: {
+    getList(type) {
+      const data = {
+        PageIndex: this.PageIndex,
+        PageSize: this.PageSize,
+        type: this.current,
+      };
+      this.$u.api.AlumnSearchList(data).then((res) => {
+        if (this.navList[this.current].List.length == 0 || type == 1) {
+          this.navList[this.current].List = res.items;
+        } else {
+          this.navList[this.current].List = this.navList[
+            this.current
+          ].List.concat(res.items);
+        }
+      });
+    },
+    toDetil(id) {
+      this.$u.route({
+        url: "/pages/AlumniCircle/userDetail/userDetail?id=" + id + "&type=2",
+      });
+    },
+    toMessage(id) {
+      uni.navigateTo({
+        url: "../../message/dialogBox/dialogBox?id=" + id + "&chatType=0",
+      });
+    },
+    // tabs通知swiper切换
+    tabsChange(index) {
+      this.swiperCurrent = index;
+    },
+    // swiper-item左右移动，通知tabs的滑块跟随移动
+    transition(e) {
+      let dx = e.detail.dx;
+      this.$refs.uTabs.setDx(dx);
+    },
+    // 由于swiper的内部机制问速切题，快换swiper不会触发dx的连续变化，需要在结束时重置状态
+    // swiper滑动结束，分别设置tabs和swiper的状态
+    animationfinish(e) {
+      let current = e.detail.current;
+      this.$refs.uTabs.setFinishCurrent(current);
+      this.swiperCurrent = current;
+      this.current = current;
+    },
+    // scroll-view到底部加载更多
+    onreachBottom() {
+      this.PageIndex++;
+      this.getList(2);
+    },
+
+    // 关注
+    handleFollow(id) {
+      const data = {
+        userId: this.vuex_user.id,
+        carewId: id,
+      };
+      this.$u.apiList.InsertOrDelFollow(data).then((res) => {
+        this.getList(this.current);
+      });
+    },
+
+    //返回上一级
+    router() {
+      uni.switchTab({
+        url: "../../AlumniCircle/alumnus/alumnus",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .u-avatar__sex {
+  width: 0.1rem !important;
+  height: 0.1rem !important;
+  border: none;
+}
+
+.student_list {
+  background: #f6f8f9;
+
+  .list-item {
+    width: calc(100% - 48rpx);
+    margin: 10rpx auto;
+    padding: 24rpx;
+    // box-shadow: 0px 0.0063rem #eaeaea;
+    background: #FFFFFF;
+    border-radius: 24rpx;
+
+    .image_1 {
+      flex-shrink: 0;
+      align-self: center;
+      width: 0.5rem !important;
+      height: 0.5rem !important;
+      border-radius: 50%;
+      flex: 0 0 0.5rem !important;
+    }
+
+    .section_4 {
+      margin-left: 0.05rem;
+      // padding: 0.1rem;
+      flex: 1 1 auto;
+
+      .group_9 {
+        align-self: flex-start;
+        color: #020202;
+        font-size: 0.19rem;
+        letter-spacing: 0.019rem;
+
+        .text_6 {
+          color: #020202;
+          font-size: 32rpx;
+          line-height: 1;
+          margin-top: 15rpx;
+          // letter-spacing: 0.019rem;
+        }
+
+        .text_24 {
+          margin-top: 0.1rem;
+          color: #b4b6bd;
+          font-size: 0.14rem;
+          line-height: 1;
+          letter-spacing: 0.015rem;
+          width: 2rem;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+
+      .view_1 {
+        align-self: initial;
+        color: initial;
+        font-size: initial;
+        line-height: initial;
+        letter-spacing: initial;
+        white-space: initial;
+      }
+
+      .image_3 {
+        align-self: center;
+        width: 0.075rem;
+        height: 0.14rem;
+        border-radius: 50%;
+      }
+
+      .message {
+        display: inline-block;
+        width: 100rpx;
+        height: 60rpx;
+        box-shadow: inset 4rpx 8rpx 32rpx 0rpx rgba(248, 248, 248, 0.06);
+        border-radius: 64rpx 64rpx 64rpx 64rpx;
+        border: 2rpx solid #3cb5fb;
+        text-align: center;
+        line-height: 55rpx;
+        font-weight: 500;
+        font-size: 24rpx;
+        color: #3CB5FB;
+      }
+    }
+
+    .follow-btn {
+      width: 120rpx;
+      height: 64rpx;
+      line-height: 64rpx;
+      font-size: 28rpx;
+    }
+  }
+}
+
+.list {
+  margin-top: 0.17rem;
+  padding: 0 5%;
+
+  .list-item {
+    padding: 0.13rem 0.12rem 0.13rem 0.33rem;
+    background-color: #f6f7fa;
+    border-radius: 0.05rem;
+
+    .text_6 {
+      color: #373b48;
+      font-size: 0.15rem;
+      font-family: PingFang;
+      line-height: 0.14rem;
+    }
+
+    .text_10 {
+      color: #ffffff;
+      line-height: 0.16rem;
+    }
+
+    .image_1 {
+      margin-bottom: 0.02rem;
+      width: 0.06rem;
+      height: 0.11rem;
+    }
+
+    .image_5 {
+      margin-bottom: 0.04rem;
+    }
+  }
+
+  .section_5 {
+    padding: 0.12rem 0.12rem 0.12rem 0.34rem;
+    background-color: #2e9bff;
+    margin-top: 0.07rem;
+  }
+}
+
+.tag {
+  display: inline-block;
+
+  margin-top: 40rpx;
+  width: 400rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  .tag-item {
+    background: #F6F8F9;
+    border-radius: 12rpx;
+    font-size: 24rpx;
+    color: rgba(0, 0, 0, 0.8);
+    font-weight: 400;
+    padding: 12rpx;
+    &:first-child {
+      margin-right: 12rpx;
+    }
+  }
+}
+</style>
diff --git a/pages/AlumniCircle/ArticleDetails/ArticleDetails.vue b/pages/AlumniCircle/ArticleDetails/ArticleDetails.vue
new file mode 100644
index 0000000..3ee5aae
--- /dev/null
+++ b/pages/AlumniCircle/ArticleDetails/ArticleDetails.vue
@@ -0,0 +1,1221 @@
+<template>
+  <view>
+    <u-navbar title="详情">
+      <template #right>
+        <!-- <view style="width: 50rpx; font-size: 32rpx; margin-right: 0.1rem">
+          <u-icon
+            style="font-size: 0.22rem; color: #b4b6bd"
+            v-if="!detailsData.isCllect"
+            name="star"
+            @click="onStar(0)"
+          ></u-icon>
+          <u-icon
+            style="font-size: 0.22rem; color: #ffc300"
+            v-else
+            name="star-fill"
+            @click="onStar(1)"
+          ></u-icon>
+        </view> -->
+      </template>
+    </u-navbar>
+
+    <!-- <view class="detail">
+      <view class="flex-col section_3">
+        <view class="justify-between group">
+          <view class="flex-row">
+            <image
+              :src="$u.http.config.imgUrl + detailsData.userHead"
+              class="image image_4"
+            />
+            <view class="flex-col items-start group_3">
+              <text class="text_1">{{detailsData.userName}}</text>
+              <text class="text_2">{{detailsData.schoolName}}</text>
+            </view>
+          </view>
+          <text class="text_3">{{detailsData.creationTime}}</text>
+        </view>
+        <text class="text_4">{{detailsData.title}}</text>
+        <view class="flex-col group_4">
+          <view class="flex-col group_31">
+			  {{detailsData.content}}
+          </view>
+		  <view v-if="detailsData.imageUrl.indexOf('.')>0">
+			  <image
+			  v-for="(v, i) in detailsData.imageUrl.split(',')" :key="i" :src="v?$u.http.config.imgUrl + v:''"
+			    class="image_5"
+			  />
+		  </view>
+        </view>
+		<view class="flex-row" v-if="detailsData.type==1">
+        <text v-for="(v, i) in detailsData.sysSignStr.split(',')" :key="i" class="text_21" ># {{v}}</text>
+		</view>
+      </view>
+    </view> -->
+    <information :list="[detailsData]" :type="2" :nolink="true" :isDel="isDel" @onDelete="onDelete"></information>
+    <!-- 评论 -->
+    <view class="comment" v-if="detailsData.type != 3">
+      <view class="flex-col section_4">
+        <view class="justify-between group_8">
+          <text class="text_22">评论 {{ detailsData.commentCount }}</text>
+          <!-- {{ detailsData.collectCount }} 收藏 -->
+          <text class="text_23">
+            <text v-if="detailsData.type != 0" style="padding: 0 0.1rem">|</text><text v-if="detailsData.type != 0">{{
+              detailsData.forwardCount }} 转发</text></text>
+        </view>
+        <scroll-view scroll-y="true" style="width: 100%; height: calc(100vh - 1.4rem)" @scrolltolower="onreachBottom">
+          <view class="flex-col group_27">
+            <view class="flex-col group" v-for="(item, index) in commonData" :key="index">
+              <view class="justify-between group_6">
+                <view class="flex-row reply-title">
+                  <u-avatar :src="$u.http.config.imgUrl + item.userHead" class="image image_6"></u-avatar>
+                  <text class="text_24">{{ item.userName }}</text>
+                  <text class="author" v-if="item.userId == detailsData.userId">作者</text>
+                  <text class="text_27">{{ item.creationTime }}</text>
+                </view>
+
+                <!-- <view class="text-delete" v-if="
+                  item.userId == vuex_user.id ||
+                  detailsData.userId == vuex_user.id
+                " @tap="DelateComment(item.commendId,item.listCount)"> 删除
+                </view> -->
+                <view class="flex-row" style="align-items: center;">
+                <!-- flex-row group_12 -->
+                  <view  @click="onLike(item, index)">
+                    <image src="/static/common/img/homepage/like.png" class="icon-like" v-if="!item.isLike" />
+                    <image src="/static/common/img/homepage/like-active.png" class="icon-like" v-else />
+                    <!-- <text class="text_25">{{ item.likesCount }}</text> -->
+                  </view>
+                  <u-icon class="icon-1" name="trash" color="#999" size="40" v-if="
+                    item.userId == vuex_user.id ||
+                    detailsData.userId == vuex_user.id
+                  " @click="DelateComment(item.commendId, item.listCount)"></u-icon>
+                </view>
+
+              </view>
+              <view class="flex-col gruop_8">
+                <view class="justify-around group_8_1">
+                  <text class="text_26" @click="onreply(item)">{{
+                    item.content
+                  }}</text>
+
+                </view>
+
+
+
+              </view>
+              <view class="flex-col items-start group_9" v-for="i in item.list" :key="i.commendId">
+                <view class="flex-row group_13">
+                  <u-avatar :src="$u.http.config.imgUrl + i.userHead" class="image image_9"></u-avatar>
+                  <view class="flex-col group_14">
+                    <view class="justify-between">
+                      <view>
+
+                        <text class="text_28">{{ i.userName }}</text>
+                        <text class="author" v-if="i.userId == detailsData.userId">作者</text>
+                        <text class="text_30">{{ i.creationTime }}</text>
+                      </view>
+                      <u-icon class="icon-1" name="trash" color="#999" size="40" v-if="
+                          item.userId == vuex_user.id ||
+                          detailsData.userId == vuex_user.id
+                        " @click="DelateComment(item.commendId, item.listCount)"></u-icon>
+                    </view>
+                    <view class="flex-col items-start group_15">
+                      <view class="justify-between" style="width: 100%;">
+                        <text class="text_29">{{ i.content }}</text>
+                        <!-- <text style="color: #999;" v-if="
+                          item.userId == vuex_user.id ||
+                          detailsData.userId == vuex_user.id
+                        " @tap="DelateComment(i.commendId)">删除</text> -->
+
+                        
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view class="justify-evenly section_5" @click="onReplyDetails(item)" v-show="item.listCount > 3">
+                <text class="text_42">{{ item.listCount }}回复</text>
+                <image src="/static/common/img/16486282410596443868.png" class="image_12" />
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <u-mask :show="show" @click="isMask">
+      <view @tap.stop>
+        <msgbox :isCommonWords="true" @onsend="onSend" @onmsgShow="onMsgShow" ref="msg" :placeholder="placeholder">
+        </msgbox>
+      </view>
+    </u-mask>
+    <view v-if="detailsData.type != 3">
+      <view class="flex-row btn" v-show="!isMsgShow">
+        <view class="icon-1" @click="onMsg()">
+          <image src="/static/common/img/homepage/comment.png" class="image_7" />
+          <!-- <text>评论</text> -->
+          <text>{{ detailsData.commentCount }}</text>
+        </view>
+        <view class="icon-2">
+          <!-- <u-icon
+            style="font-size: 0.22rem; color: #b4b6bd"
+            v-if="!detailsData.isCllect"
+            name="star"
+            @click="onStar(0)"
+          ></u-icon> -->
+          <image v-if="!detailsData.isCllect" src="/static/common/img/homepage/star.png" class="image_7"
+            @click="onStar(0)" />
+          <u-icon style="font-size: 0.2rem; color: #ffc300" v-else class="image_8" name="star-fill"
+            @click="onStar(1)"></u-icon>
+          {{ detailsData.collectCount }}
+        </view>
+        <!--  <view class="icon-2">
+				   <image src="/static/common/img/16486275583636337201.png" class="image_8" />
+				   <text>转发</text>
+			   </view> -->
+      </view>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import information from "../../../components/Information.vue";
+import msgbox from "../../../components/messageBox.vue";
+export default {
+  data() {
+    return {
+      detailsData: {},
+      obj: {},
+      commonData: [],
+      isMsgShow: false,
+      level: "",
+      replyUserId: "",
+      placeholder: "",
+      show: false,
+      commendId: "",
+      PageIndex: 1,
+      PageSize: 10,
+      total: 0,
+      flag: "",
+      isDel: false, // 是否显示删除按钮
+    };
+  },
+  onLoad(e) {
+    this.isDel = e.isDel
+    this.detailsData = JSON.parse(e.data);
+    console.log('this.detailsData======>', this.detailsData);
+
+    if (this.detailsData.type == undefined) {
+      this.detailsData.type = this.detailsData.mytype;
+    }
+    console.log(JSON.parse(e.data));
+    // console.log(this.detailsData)
+    if (this.detailsData.flag == "Collection") {
+      // console.log('收藏')
+      // this.detailsData.mytype = this.detailsData.type
+      this.detailsData.id = this.detailsData.articleId;
+      this.detailsData.isCllect = true;
+    }
+
+    this.getJournaArticle();
+  },
+  methods: {
+    //删除我的发布
+    onDelete(val) {
+      const data = {
+        type: 1,
+        id: val.id
+      }
+      if (this.type == 0) {
+        data.type = 3
+      }
+      uni.showModal({
+        content: '确定删除此内容？',
+        success: (res) => {
+          if (res.confirm) {
+            this.$u.apiList.DelateArticle(data).then(res => {
+              this.$refs.uToast.show({
+                title: '删除成功',
+                type: 'success',
+              })
+              uni.navigateBack({
+                delta: 1
+              })
+            })
+              .catch(err => {
+                this.$refs.uToast.show({
+                  title: '删除失败',
+                  type: 'error',
+                })
+              })
+          } else if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        }
+      });
+
+    },
+    // 删除评论
+    async DelateComment(id, listCount) {
+      // 判断当前学校是否认证，未认证不可删除
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(res)), "res");
+      const edcationList = res.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行删除操作",
+          type: "none",
+        });
+      }
+      const findRow = edcationList.find((x) => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行删除操作",
+          type: "none",
+        });
+      }
+
+      uni.showModal({
+        // title: "提示",
+        content: "确定删除该评论",
+        success: (res) => {
+          if (res.confirm) {
+            this.$u.api
+              .DelateComment({
+                id: id,
+              })
+              .then((res) => {
+                this.commonData = [];
+                this.PageIndex = 1;
+                this.getJournaArticle(2, listCount);
+                this.$refs.uToast.show({
+                  title: "删除成功",
+                  type: "success",
+                });
+              })
+              .catch((err) => {
+                this.$refs.uToast.show({
+                  title: "删除失败",
+                  type: "error",
+                });
+              });
+          } else if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    onSend(msg) {
+      const data = {
+        commendId: this.commendId,
+        articleId: this.detailsData.id,
+        userId: this.vuex_user.id,
+        replyUserId: this.replyUserId,
+        content: msg,
+        level: this.level,
+        type: this.detailsData.mytype,
+      };
+      if (!this.detailsData.id) {
+        data.articleId = this.detailsData.articleId;
+      }
+      if (this.detailsData.mytype == 2) {
+        if (this.detailsData.type || this.detailsData.type == 0) {
+          data.type = this.detailsData.type;
+        } else {
+          data.type = 1;
+        }
+      }
+      this.$u.apiList.InsertComment(data).then((res) => {
+        this.commonData = [];
+        this.PageIndex = 1;
+        this.getJournaArticle(1);
+      });
+    },
+    getJournaArticle(val, listCount) {
+      const data = {
+        PageIndex: this.PageIndex,
+        PageSize: this.PageSize,
+        Title: this.detailsData.title,
+        Keyword: this.detailsData.content,
+        id: this.detailsData.id,
+        type: this.detailsData.mytype,
+      };
+      if (this.detailsData.mytype == 2) {
+        if (this.detailsData.type || this.detailsData.type == 0) {
+          data.type = this.detailsData.type;
+        } else {
+          data.type = 1;
+        }
+      }
+      if (!this.detailsData.id) {
+        data.id = this.detailsData.articleId;
+      }
+      this.$u.apiList.GetJournaArticle(data).then((res) => {
+        this.total = res.total;
+        if (this.commonData.length == 0) {
+          this.commonData = res.items;
+        } else if (this.commonData.length < res.total) {
+          this.commonData = this.commonData.concat(res.items);
+        }
+        if (val == 1) {
+          this.detailsData.commentCount++;
+        }
+
+        if (val == 2) {
+          if (listCount) {
+            console.log('listCount======>', listCount, this.detailsData.commentCount);
+            this.detailsData.commentCount = this.detailsData.commentCount - listCount - 1;
+            console.log('listCount======>', listCount, this.detailsData.commentCount);
+          } else {
+            this.detailsData.commentCount--;
+          }
+        }
+        uni.$emit("echoList", {
+          type: "evaluate",
+          data: {
+            commentCount: this.detailsData.commentCount,
+          },
+        });
+      });
+    },
+    //收藏
+    async onStar(val) {
+      // 判断当前学校是否认证，未认证不可收藏
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(res)), "res");
+      const edcationList = res.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      const findRow = edcationList.find((x) => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      const data = {
+        id: this.detailsData.id,
+        type: this.detailsData.type,
+      };
+      if (!this.detailsData.id) {
+        data.id = this.detailsData.articleId;
+      }
+      this.$u.apiList
+        .LikeCollect(data)
+        .then((res) => {
+          if (val == 0) {
+            let a = this.detailsData;
+            a.isCllect = true;
+            this.detailsData = "";
+            this.detailsData = a;
+            this.$refs.uToast.show({
+              title: "收藏成功",
+              type: "success",
+            });
+            this.detailsData.collectCount++;
+            uni.$emit("echoList", {
+              type: "star",
+              data: {
+                isCllect: true,
+              },
+            });
+          } else if (val == 1) {
+            let a = this.detailsData;
+            a.isCllect = false;
+            this.detailsData = "";
+            this.detailsData = a;
+            this.$refs.uToast.show({
+              title: "取消收藏成功",
+              type: "success",
+            });
+            this.detailsData.collectCount--;
+            uni.$emit("echoList", {
+              type: "star",
+              data: {
+                isCllect: false,
+              },
+            });
+          }
+        })
+        .catch((err) => {
+          this.$refs.uToast.show({
+            title: "收藏失败",
+            type: "error",
+          });
+        });
+    },
+    //评论
+    async onMsg() {
+      // 判断当前学校是否认证，未认证不可评论
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(res)), "res");
+      const edcationList = res.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行评论操作",
+          type: "none",
+        });
+      }
+      const findRow = edcationList.find((x) => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行评论操作",
+          type: "none",
+        });
+      }
+      this.show = true;
+      this.isMsgShow = true;
+      //   this.$refs.msg.placeholder = "请输入内容";
+      this.$refs.msg.placeholder = "高楼平地起，评论全靠你...";
+      this.$refs.msg.inputFocus();
+      this.level = 0;
+    },
+    //点赞
+    async onLike(item, index) {
+      // 判断当前学校是否认证，未认证不可点赞
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(res)), "res");
+      const edcationList = res.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行点赞操作",
+          type: "none",
+        });
+      }
+      const findRow = edcationList.find((x) => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行点赞操作",
+          type: "none",
+        });
+      }
+      const data = {
+        id: item.commendId,
+        type: 2,
+      };
+      this.$u.apiList
+        .LikeHe(data)
+        .then((res) => {
+          if (this.commonData[index].isLike == false) {
+            this.commonData[index].isLike = true;
+            this.commonData[index].likesCount++;
+            this.$refs.uToast.show({
+              title: "点赞成功",
+              type: "success",
+            });
+          } else {
+            if (this.commonData[index].likesCount > 0) {
+              this.commonData[index].isLike = false;
+              this.commonData[index].likesCount--;
+              this.$refs.uToast.show({
+                title: "取消点赞成功",
+                type: "success",
+              });
+            }
+          }
+        })
+        .catch((err) => {
+          this.$refs.uToast.show({
+            title: "点赞失败",
+            type: "error",
+          });
+        });
+    },
+    //回复
+    onreply(item) {
+      this.show = true;
+      this.placeholder = "回复@" + item.userName;
+      this.$refs.msg.placeholder = this.placeholder;
+      this.$refs.msg.inputFocus();
+      this.level = 1;
+      this.replyUserId = item.userId;
+      this.commendId = item.commendId;
+    },
+    isMask() {
+      this.show = false;
+      this.isMsgShow = false;
+    },
+    onMsgShow(val) {
+      this.isMsgShow = val;
+      this.show = val;
+    },
+    onReplyDetails(item) {
+      const data = {
+        Title: this.detailsData.title,
+        Keyword: this.detailsData.content,
+        id: item.commendId,
+      };
+      item.type = this.detailsData.mytype;
+      item.articleId = this.detailsData.id;
+      this.$u.route({
+        url: "pages/AlumniCircle/ReplyDetails/ReplyDetails",
+        params: {
+          data: JSON.stringify(data),
+          head: JSON.stringify(item),
+        },
+      });
+    },
+    onreachBottom() {
+      let num = this.PageIndex * this.PageSize;
+      if (num > this.total) return;
+      this.PageIndex++;
+      this.getJournaArticle();
+    },
+    //返回上一级
+    router() {
+      if (this.detailsData.route == 1) {
+        uni.switchTab({
+          url: "../../my/my/my",
+        });
+      } else if (this.detailsData.route == 2) {
+        if (this.detailsData.flag == 0) {
+          this.$u.route({
+            url:
+              "pages/AlumniCircle/userDetail/userDetail?id=" +
+              this.detailsData.userId +
+              "&type=0",
+          });
+        } else {
+          this.$u.route({
+            url:
+              "pages/AlumniCircle/userDetail/userDetail?id=" +
+              this.detailsData.userId +
+              "&type=3",
+          });
+        }
+      } else if (this.detailsData.route == 3) {
+        this.$u.route({
+          url:
+            "pages/my/ReleaseList/ReleaseList?Id=" +
+            this.detailsData.myschoolId +
+            "&type=" +
+            this.detailsData.mytype,
+        });
+      } else {
+        uni.switchTab({
+          url: "/pages/AlumniCircle/alumnus/alumnus",
+        });
+      }
+    },
+  },
+  components: {
+    msgbox,
+    information,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  .section_3 {
+    padding: 0.11rem 0.14rem 0.11rem 0.15rem;
+    background-color: rgb(255, 255, 255);
+
+    .group {
+      padding: 0 0.005rem;
+
+      .text_3 {
+        margin-top: 0.035rem;
+        color: rgb(180, 182, 189);
+        font-size: 0.12rem;
+        font-family: PingFang;
+        line-height: 0.12rem;
+      }
+
+      .image {
+        width: 0.3rem;
+        height: 0.3rem;
+      }
+
+      .image_4 {
+        margin-bottom: 0.02rem;
+      }
+
+      .group_3 {
+        margin-left: 0.05rem;
+        margin-top: 0.02rem;
+
+        .text_1 {
+          margin-left: 0.02rem;
+          color: rgb(2, 2, 2);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.13rem;
+        }
+
+        .text_2 {
+          margin-top: 0.055rem;
+          color: rgb(180, 182, 189);
+          font-size: 0.12rem;
+          font-family: PingFang;
+          line-height: 0.12rem;
+        }
+      }
+    }
+
+    .text_4 {
+      margin-left: 0.01rem;
+      margin-top: 0.23rem;
+      color: rgb(2, 2, 2);
+      font-size: 0.18rem;
+      font-family: Adobe Heiti Std;
+      line-height: 0.17rem;
+    }
+
+    .group_4 {
+      margin-top: 0.2rem;
+
+      .image_5 {
+        margin-top: 0.025rem;
+        width: 3.45rem;
+        height: 1.66rem;
+      }
+
+      .group_31 {
+        padding: 0 0.01rem;
+
+        .group_5 {
+          margin-left: 0.01rem;
+          align-self: flex-start;
+
+          .text_5 {
+            margin-top: 0.015rem;
+            color: rgb(160, 162, 172);
+            font-size: 0.15rem;
+            font-family: PingFang;
+            line-height: 0.14rem;
+          }
+
+          .text_6 {
+            margin-left: 0.07rem;
+            color: rgb(255, 88, 109);
+            font-size: 0.18rem;
+            font-family: PingFang;
+            line-height: 0.16rem;
+          }
+        }
+
+        .group_28 {
+          margin-top: 0.065rem;
+          align-self: flex-start;
+
+          .text_7 {
+            color: rgb(160, 162, 172);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+
+          .text_8 {
+            margin-left: 0.05rem;
+            color: rgb(55, 59, 72);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+        }
+
+        .group_7 {
+          margin-left: 0.01rem;
+          align-self: flex-start;
+
+          .text_9 {
+            color: rgb(180, 182, 189);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+
+          .text_10 {
+            margin-left: 0.055rem;
+            color: rgb(55, 59, 72);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+        }
+
+        .group_29 {
+          align-self: flex-start;
+
+          .text_11 {
+            color: rgb(180, 182, 189);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+
+          .text_12 {
+            margin-left: 0.04rem;
+            color: rgb(55, 59, 72);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+        }
+
+        .group_30 {
+          align-self: flex-start;
+
+          .text_13 {
+            color: rgb(180, 182, 189);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+
+          .text_14 {
+            margin-left: 0.05rem;
+            color: rgb(55, 59, 72);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+        }
+
+        .group_10 {
+          align-self: flex-start;
+
+          .text_15 {
+            color: rgb(180, 182, 189);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+
+          .text_16 {
+            margin-left: 0.04rem;
+            color: rgb(55, 59, 72);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+        }
+
+        .group_11 {
+          align-self: flex-start;
+
+          .text_17 {
+            color: rgb(180, 182, 189);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+
+          .text_18 {
+            margin-left: 0.04rem;
+            color: rgb(55, 59, 72);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.24rem;
+          }
+        }
+
+        .text_19 {
+          color: rgb(180, 182, 189);
+          font-size: 0.15rem;
+          font-family: Adobe Heiti Std;
+          line-height: 0.24rem;
+        }
+
+        .text_20 {
+          margin-left: 0.065rem;
+          color: rgb(55, 59, 72);
+          font-size: 0.15rem;
+          font-family: Adobe Heiti Std;
+          line-height: 0.24rem;
+        }
+      }
+    }
+
+    .text_21 {
+      margin-left: 0.05rem;
+      margin-top: 0.11rem;
+      align-self: flex-start;
+      color: rgb(44, 109, 255);
+      font-size: 0.14rem;
+      font-family: PingFang;
+      line-height: 0.16rem;
+    }
+  }
+}
+
+.comment {
+  .section_4 {
+    padding: 0.2rem 0 0.5rem 0;
+    background-color: rgb(255, 255, 255);
+    // margin-top: 0.1rem;
+
+    .section_5 {
+      margin: 0.13rem 0.85rem;
+      padding: 0.04rem 0.05rem 0.05rem 0.095rem;
+      background-color: rgb(246, 247, 250);
+      border-radius: 8rpx;
+      width: 0.6rem;
+
+      .text_42 {
+        color: rgb(2, 2, 2);
+        font-size: 0.12rem;
+        font-family: Adobe Heiti Std;
+        line-height: 0.11rem;
+      }
+
+      .image_12 {
+        margin-top: 0.015rem;
+        width: 0.05rem;
+        height: 0.09rem;
+      }
+    }
+
+    .group_8 {
+      margin-left: 0.025rem;
+      padding: 0 0.15rem;
+
+      .text_22 {
+        margin-bottom: 0.1rem;
+        color: rgba(0, 0, 0, 0.9);
+        font-size: 32rpx;
+        font-family: Adobe Heiti Std;
+        line-height: 0.14rem;
+      }
+
+      .text_23 {
+        color: rgb(180, 182, 189);
+        font-size: 0.15rem;
+        font-family: Adobe Heiti Std;
+        line-height: 0.17rem;
+      }
+    }
+
+    .group_27 {
+      margin-top: 0.1rem;
+
+      .group {
+        padding: 0.1rem 0.2rem;
+        // border-bottom: 1px solid #eee;
+
+        .gruop_8 {
+          .group_8_1 {
+            padding-right: 0.2rem;
+          }
+        }
+
+        .group_12 {
+          margin-right: 4rpx;
+          margin-top: 0.1rem;
+          // width: 100%;
+          // display: flex;
+          justify-content: flex-end;
+
+          .text_25 {
+            // margin-top: 0.04rem;
+            margin-top: 7rpx;
+            color: #797979;
+            font-size: 28rpx;
+            font-family: Adobe Heiti Std;
+            line-height: 0.12rem;
+          }
+
+          .image_8 {
+            margin-left: 0.045rem;
+            flex-shrink: 0;
+            width: 0.16rem;
+            height: 0.15rem;
+          }
+        }
+
+        .group_6 {
+          // padding-right: 2rpx;
+          // margin-right: 0.02rem;
+
+
+
+          .image_6 {
+            border-radius: 50%;
+            flex-shrink: 0;
+            width: 0.3rem !important;
+            height: 0.3rem !important;
+            flex: 0 0 0.3rem !important;
+          }
+
+          .text_24 {
+            margin-left: 0.13rem;
+            margin-top: 0.07rem;
+            color: rgb(2, 2, 2);
+            font-size: 0.15rem;
+            font-family: Adobe Heiti Std;
+            line-height: 0.13rem;
+          }
+
+          .author {
+            color: #797979;
+            background-color: #f2f2f2;
+            margin-top: 0.05rem;
+            font-size: 0.13rem;
+            line-height: 0.2rem;
+            margin-left: 0.13rem;
+            height: 0.2rem;
+            padding: 0 0.05rem;
+            border-radius: 1rem;
+          }
+
+          //  .author {
+          // border-radius: 25%;
+          //          margin-left: 0.13rem;
+          //          margin-top: 0.04rem;
+          // padding:0 0.05rem;
+          //          color: #797979;
+          //          font-size: 0.12rem;
+          //          font-family: Adobe Heiti Std;
+          // height: 0.13rem;
+          //          line-height: 0.13rem;
+          // background-color: #F2F2F2;
+          //        }
+
+          .reply-title {
+            display: flex;
+            // justify-content: space-between;
+            align-items: flex-start;
+          }
+        }
+
+        .text_26 {
+          width: 100%;
+          padding-left: 0.45rem;
+          align-self: center;
+          color: rgb(55, 59, 72);
+          font-size: 0.13rem;
+          font-family: Adobe Heiti Std;
+          word-break: break-all;
+        }
+
+        .text_27 {
+          margin-left: 0.13rem;
+          // margin-top: 0.13rem;
+          margin-top: 0.08rem;
+          align-self: flex-start;
+          color: rgb(180, 182, 189);
+          font-size: 0.12rem;
+          font-family: Adobe Heiti Std;
+          line-height: 0.12rem;
+        }
+      }
+
+      .group_9 {
+        margin-top: 0.14rem;
+        padding: 0 0 0 0.38rem;
+
+        view {
+          // width: 100%;
+        }
+
+        .group_13 {
+          // margin-left: 0.035rem;
+          width: 100%;
+
+          .image_9 {
+            width: 0.3rem !important;
+            height: 0.3rem !important;
+            flex: 0 0 0.3rem !important;
+            border-radius: 50%;
+            flex-shrink: 0;
+          }
+
+          .group_14 {
+            margin-left: 0.18rem;
+            margin-top: 0.05rem;
+            flex: 1 1 auto;
+
+            .author {
+              color: #797979;
+              background-color: #f2f2f2;
+              margin-top: 0.05rem;
+              font-size: 0.13rem;
+              line-height: 0.2rem;
+              margin-left: 0.13rem;
+              height: 0.2rem;
+              padding: 0 0.05rem;
+              border-radius: 30%;
+            }
+
+            .text_28 {
+              align-self: flex-start;
+              color: rgb(2, 2, 2);
+              font-size: 0.13rem;
+              font-family: Adobe Heiti Std;
+              line-height: 0.13rem;
+            }
+
+            .group_15 {
+              margin-top: 0.12rem;
+              width: 100%;
+
+              .text_29 {
+                color: rgb(55, 59, 72);
+                font-size: 0.13rem;
+                font-family: Adobe Heiti Std;
+                // line-height: 0.14rem;
+                width: 90%;
+                word-break: break-all;
+              }
+            }
+
+            .text_30 {
+              margin-left: 0.13rem;
+              margin-top: 0.045rem;
+              color: rgb(180, 182, 189);
+              font-size: 0.12rem;
+              font-family: Adobe Heiti Std;
+              line-height: 0.12rem;
+            }
+          }
+        }
+
+        .group_16 {
+          margin-left: 0.035rem;
+          margin-top: 0.11rem;
+          width: 1.09rem;
+
+          .group_17 {
+            margin-top: 0.075rem;
+
+            .text_31 {
+              align-self: flex-start;
+              color: rgb(2, 2, 2);
+              font-size: 0.13rem;
+              font-family: Adobe Heiti Std;
+              line-height: 0.1rem;
+            }
+
+            .group_18 {
+              margin-top: 0.14rem;
+              padding-left: 0.015rem;
+
+              .text_32 {
+                color: rgb(55, 59, 72);
+                font-size: 0.15rem;
+                font-family: Adobe Heiti Std;
+                line-height: 0.14rem;
+              }
+
+              .text_33 {
+                margin-top: 0.03rem;
+                color: rgb(180, 182, 189);
+                font-size: 0.12rem;
+                font-family: Adobe Heiti Std;
+                line-height: 0.12rem;
+              }
+            }
+          }
+        }
+
+        .group_19 {
+          margin-left: 0.05rem;
+          margin-top: 0.12rem;
+          width: 1.07rem;
+
+          .group_20 {
+            margin-top: 0.07rem;
+
+            .text_34 {
+              align-self: flex-start;
+              color: rgb(2, 2, 2);
+              font-size: 0.13rem;
+              font-family: Adobe Heiti Std;
+              line-height: 0.12rem;
+            }
+
+            .group_21 {
+              margin-top: 0.14rem;
+
+              .text_35 {
+                color: rgb(55, 59, 72);
+                font-size: 0.15rem;
+                font-family: Adobe Heiti Std;
+                line-height: 0.14rem;
+              }
+
+              .text_36 {
+                margin-left: 0.01rem;
+                margin-top: 0.03rem;
+                color: rgb(180, 182, 189);
+                font-size: 0.12rem;
+                font-family: Adobe Heiti Std;
+                line-height: 0.12rem;
+              }
+            }
+          }
+        }
+      }
+
+      .image {
+        width: 0.3rem;
+        height: 0.3rem;
+      }
+    }
+
+    .group_27:first-child {
+      margin-top: 0;
+    }
+  }
+
+  .icon-like {
+    width: 40rpx;
+    height: 40rpx;
+    margin-right: 10rpx;
+    margin-top: 6rpx;
+  }
+
+  .text-delete {
+    color: #999;
+    margin-top: 0.05rem;
+  }
+}
+
+.btn {
+  background-color: #fff;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  height: 0.5rem;
+  line-height: 0.5rem;
+  width: 100%;
+
+  .icon-1,
+  .icon-2 {
+    flex: 1;
+    text-align: center;
+
+    .image_7 {
+      margin-right: 0.05rem;
+      flex-shrink: 0;
+      width: 0.2rem;
+      height: 0.2rem;
+      transform: translateY(0.04rem);
+    }
+
+    .image_8 {
+      margin-right: 0.05rem;
+      width: 0.2rem;
+      height: 0.2rem;
+      //   transform: translateY(0.04rem);
+    }
+  }
+}
+</style>
diff --git a/pages/AlumniCircle/ReplyDetails/ReplyDetails.vue b/pages/AlumniCircle/ReplyDetails/ReplyDetails.vue
new file mode 100644
index 0000000..7b7114f
--- /dev/null
+++ b/pages/AlumniCircle/ReplyDetails/ReplyDetails.vue
@@ -0,0 +1,349 @@
+<template>
+	<view>
+		<u-navbar title="评论详细">
+		  <template #right
+		    ><view style="width: 50rpx; font-size: 32rpx">
+		      <!-- <u-icon name="star" v-if="true"></u-icon> -->
+			  <!-- <u-icon style="font-size:0.22rem;color:#ffc300" v-else  name="star-fill"></u-icon> -->
+		    </view>
+		  </template>
+		</u-navbar>
+		<!-- 评论 -->
+		<view class="comment">
+		  <view class="flex-col section_4">
+		    <view class="justify-between group_8">
+		      <text class="text_22">回复 {{total}}</text>
+		    </view>
+		    <view class="flex-col group_27">
+		      <view class="flex-col group">
+		       <view class="justify-between group_6">
+		          <view class="flex-row">
+		            <image
+		              :src="$u.http.config.imgUrl + headData.userHead"
+		              class="image image_6"
+		            />
+		            <text class="text_24">{{headData.userName}}</text>
+					<text class="text_27">{{headData.creationTime}}</text>
+		          </view>
+		          <view class="flex-row group_12">
+		            <text class="text_25">{{headData.likesCount}}</text>
+		            <image
+		              src="/static/common/img/homepage/like.png"
+		              class="image_8"
+		            />
+		          </view>
+		        </view>
+			<view class="flex-col">
+					<text class="text_26" @click="onreply">{{headData.content}}</text>
+				<!-- 	<view class="justify-evenly section_5">
+					  <text class="text_42">{{total}}回复</text>
+					  <image
+					    src="/static/common/img/16486282410596443868.png"
+					    class="image_12"
+					  />
+					</view> -->
+					<!-- <text class="text_27">{{headData.creationTime}}</text> -->
+				</view>
+				<view class="flex-col items-start group_9" v-for="(i,index) in commonData" :key="index">
+				  <view class="flex-row group_13">
+				    <image
+				      :src="$u.http.config.imgUrl + i.userHead"
+				      class="image image_9"
+				    />
+				    <view class="group_14">
+				      <text class="text_28">{{i.userName}}</text>
+					  <text class="text_30">{{i.creationTime}}</text>
+				      <view class="flex-col items-start group_15">
+				        <text class="text_29">{{i.content}}</text>
+				      </view>
+				    </view>
+				  </view>
+				</view>
+		      </view>
+		    </view>
+		  </view>
+		</view>
+		<u-mask :show="show" @click="isMask">
+			   <msgbox  @onsend="onSend" @onmsgShow="onMsgShow" ref="msg" :placeholder="placeholder"></msgbox>	   
+		</u-mask>
+	</view>
+</template>
+
+<script>
+	import msgbox from "../../../components/messageBox.vue";
+	export default {
+		data(){
+			return {
+				data : {
+					PageIndex:1,
+					PageSize:10,
+					Title:"",
+					Keyword:"",
+					id:"",
+				},
+				show:false,
+				headData:{},
+				commonData:[],
+				placeholder:"",
+				total:0,
+			}
+		},
+		onLoad(e){
+			this.headData = JSON.parse(e.head)
+			this.data = JSON.parse(e.data)
+			this.data.PageIndex = 1
+			this.data.PageSize = 10
+		},
+		created(){
+			this.getComment()
+		},
+		methods:{
+			getComment(){
+				this.$u.apiList.GetComment(this.data).then((res)=>{
+					this.commonData = res.items
+					this.total = res.items.length
+				})
+			},
+			onreply(){
+				this.show = true
+				this.placeholder = '回复'+this.headData.userName
+				this.$refs.msg.placeholder = this.placeholder
+			},
+			isMask(){
+				this.show =false
+			},
+			onSend(msg){
+				  const data = {
+						commendId:this.headData.commendId,
+						articleId:this.headData.articleId,
+						userId:this.vuex_user.id,
+						replyUserId:this.headData.userId,
+						content:msg,
+						level:1,
+						type:this.headData.type
+				  }
+				  this.$u.apiList.InsertComment(data).then((res)=>{
+						this.getComment()
+				  })
+			},
+			onMsgShow(val){
+				  this.isMsgShow = val
+				  this.show = val
+			},
+		},
+		components: {
+		  msgbox: msgbox,
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.comment {
+	  .section_4 {
+	    padding: 0.26rem 0.14rem 0.61rem 0.16rem;
+	    background-color: rgb(255, 255, 255);
+		// margin-top:0.1rem;
+		.section_5 {
+		  margin-top: 0.13rem;
+		  padding: 0.04rem 0.05rem 0.05rem 0.095rem;
+		  background-color: rgb(246, 247, 250);
+		  border-radius: 0.1rem;
+		  width: 0.6rem;
+		  .text_42 {
+		    color: rgb(2, 2, 2);
+		    font-size: 0.12rem;
+		    font-family: Adobe Heiti Std;
+		    line-height: 0.11rem;
+		  }
+		  .image_12 {
+		    margin-top: 0.015rem;
+		    width: 0.05rem;
+		    height: 0.09rem;
+		  }
+		}
+	    .group_8 {
+	      margin-left: 0.025rem;
+	      .text_22 {
+	        margin-bottom: 0.02rem;
+	        color: rgb(2, 2, 2);
+	        font-size: 0.15rem;
+	        font-family: Adobe Heiti Std;
+	        line-height: 0.14rem;
+	      }
+	      .text_23 {
+	        color: rgb(180, 182, 189);
+	        font-size: 0.15rem;
+	        font-family: Adobe Heiti Std;
+	        line-height: 0.17rem;
+	      }
+	    }	
+	    .group_27 {
+	      margin-top: 0.25rem;
+	      .group {
+	        padding: 0 0.005rem;
+	        .group_6 {
+	          margin-right: 0.02rem;
+	          .group_12 {
+	            margin-top: 0.04rem;
+	            .text_25 {
+	              margin-top: 0.04rem;
+	              color: rgb(2, 2, 2);
+	              font-size: 0.15rem;
+	              font-family: Adobe Heiti Std;
+	              line-height: 0.12rem;
+	            }
+	            .image_8 {
+	              margin-left: 0.045rem;
+	              flex-shrink: 0;
+	              width: 0.16rem;
+	              height: 0.15rem;
+				  transform: translateY(0.02rem);
+	            }
+	          }
+
+	          .image_6 {
+	            flex-shrink: 0;
+	          }
+	          .text_24 {
+	            margin-left: 0.13rem;
+	            margin-top: 0.07rem;
+	            color: rgb(2, 2, 2);
+	            font-size: 0.13rem;
+	            font-family: Adobe Heiti Std;
+	            line-height: 0.13rem;
+	          }
+
+			  .text_27 {
+				margin-left: 0.13rem;
+				margin-top: 0.07rem;
+				align-self: flex-start;
+				color: rgb(180, 182, 189);
+				font-size: 0.12rem;
+				font-family: Adobe Heiti Std;
+				line-height: 0.12rem;
+			  }
+	        }
+	        .text_26 {
+			  width: 100%;
+			  padding-left: 0.4rem;
+	          margin-top: 0.075rem;
+	          align-self: center;
+	          color: rgb(55, 59, 72);
+	          font-size: 0.15rem;
+	          font-family: Adobe Heiti Std;
+	          line-height: 0.14rem;
+	        }
+	      }
+	      .group_9 {
+	        margin-top: 0.14rem;
+	        padding: 0 0.38rem;
+	        .group_13 {
+	          margin-left: 0.035rem;
+	          .image_9 {
+	            flex-shrink: 0;
+	          }
+	          .group_14 {
+	            margin-left: 0.18rem;
+	            margin-top: 0.05rem;
+	            flex: 1 1 auto;
+	            .text_28 {
+	              align-self: flex-start;
+	              color: rgb(2, 2, 2);
+	              font-size: 0.13rem;
+	              font-family: Adobe Heiti Std;
+	              line-height: 0.13rem;
+	            }
+				.text_30 {
+	                margin-left: 0.13rem;
+	                margin-top: 0.045rem;
+	                color: rgb(180, 182, 189);
+	                font-size: 0.12rem;
+	                font-family: Adobe Heiti Std;
+	                line-height: 0.12rem;
+	              }
+	            .group_15 {
+	              margin-top: 0.12rem;
+	              .text_29 {
+	                color: rgb(55, 59, 72);
+	                font-size: 0.15rem;
+	                font-family: Adobe Heiti Std;
+	                line-height: 0.14rem;
+	              }
+	            }
+	          }
+	        }
+	        .group_16 {
+	          margin-left: 0.035rem;
+	          margin-top: 0.11rem;
+	          width: 1.09rem;
+	          .group_17 {
+	            margin-top: 0.075rem;
+	            .text_31 {
+	              align-self: flex-start;
+	              color: rgb(2, 2, 2);
+	              font-size: 0.13rem;
+	              font-family: Adobe Heiti Std;
+	              line-height: 0.1rem;
+	            }
+	            .group_18 {
+	              margin-top: 0.14rem;
+	              padding-left: 0.015rem;
+	              .text_32 {
+	                color: rgb(55, 59, 72);
+	                font-size: 0.15rem;
+	                font-family: Adobe Heiti Std;
+	                line-height: 0.14rem;
+	              }
+	              .text_33 {
+	                margin-top: 0.03rem;
+	                color: rgb(180, 182, 189);
+	                font-size: 0.12rem;
+	                font-family: Adobe Heiti Std;
+	                line-height: 0.12rem;
+	              }
+	            }
+	          }
+	        }
+	        .group_19 {
+	          margin-left: 0.05rem;
+	          margin-top: 0.12rem;
+	          width: 1.07rem;
+	          .group_20 {
+	            margin-top: 0.07rem;
+	            .text_34 {
+	              align-self: flex-start;
+	              color: rgb(2, 2, 2);
+	              font-size: 0.13rem;
+	              font-family: Adobe Heiti Std;
+	              line-height: 0.12rem;
+	            }
+	            .group_21 {
+	              margin-top: 0.14rem;
+	              .text_35 {
+	                color: rgb(55, 59, 72);
+	                font-size: 0.15rem;
+	                font-family: Adobe Heiti Std;
+	                line-height: 0.14rem;
+	              }
+	              .text_36 {
+	                margin-left: 0.01rem;
+	                margin-top: 0.03rem;
+	                color: rgb(180, 182, 189);
+	                font-size: 0.12rem;
+	                font-family: Adobe Heiti Std;
+	                line-height: 0.12rem;
+	              }
+	            }
+	          }
+	        }
+	       
+	      }
+	      .image {
+	        width: 0.3rem;
+	        height: 0.3rem;
+			border-radius:50%;
+	      }
+	    }
+	  }
+	}
+</style>
\ No newline at end of file
diff --git a/pages/AlumniCircle/alumnus/alumnus.vue b/pages/AlumniCircle/alumnus/alumnus.vue
new file mode 100644
index 0000000..a033726
--- /dev/null
+++ b/pages/AlumniCircle/alumnus/alumnus.vue
@@ -0,0 +1,1281 @@
+<template>
+	<view>
+		<view class="page-title">校友圈</view>
+		<view class="content-top">
+
+
+			<!-- <u-navbar :is-back="false" title="" :border-bottom="false">
+				<view class="slot-wrap">
+					<u-search :input-style="searchStyle" placeholder="搜索资讯或需求" search-icon="search" :show-action="true"
+						action-text="搜索" v-model="Title" @custom="onSearch">
+					</u-search>
+				</view>
+			</u-navbar> -->
+			<drag-button :isDock="true" :current='current' :existTabBar="true" @reload='reload' />
+			<!-- <u-tabs-swiper ref="uTabs" :list="navList" :current="current" :is-scroll="false"
+			:active-item-style="{ color: '#3CB5FB', fontSize: '0.15rem' }" :bar-style="{ background: '#3CB5FB' }"
+			@change="tabsChange"></u-tabs-swiper> -->
+			<view class="tabs-wrap">
+
+				<view class="tabs-box">
+					<view class="tabs-item" :class="{ 'tabs-item-active': current == item.type }"
+						v-for="(item, index) in navList" :key="index" @click="tabsChange(item.type)">
+						<text>{{ item.name }}</text>
+					</view>
+				</view>
+				<view class="search-box" @click="searchClick">
+					<image src="/static/common/img/search.svg" style="width: 40rpx;height: 40rpx;"></image>
+				</view>
+				<view class="search-box" @click="btnClick"
+					v-if="(current == 0 && vuex_user.isAttestationGLY && vuex_user.isAttestationJZG && (vuex_user.isAttestationXY || true)) || (current == 1 && (vuex_user.isAttestationXY || true))">
+					<image src="/static/common/img/add.svg" style="width: 50rpx;height: 50rpx;"></image>
+				</view>
+			</view>
+			<view class="flex-row section_5" :class="{ NavShow: NavShow }" v-if="current == 1">
+				<text :class="{ 'text_3': currentIdx === index }" v-for="(item, index) in sysList" :key="index"
+					@click="oncurrent(index, item)">{{ item }}</text>
+			</view>
+		</view>
+
+		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
+			style="height: calc(100vh - 410rpx); width: 100%">
+			<swiper-item class="swiper-item" v-for="(item, index) in navList" :key="index"
+				style="height: calc(100vh - 410rpx); width: 100%">
+				<scroll-view scroll-y="true" style=" width: 100%"
+					:style="{ height: vuex_iPhone ? 'calc(100vh - 410rpx)' : 'calc(100vh - 1.5rem)' }"
+					@scrolltolower="onreachBottom" scroll-with-animation='true'
+					:scroll-top='index == 0 ? isScroll : isScroll2' @scroll='scroll' :data-index='index'>
+					<view class="flex-col group" v-if="index == 0">
+						<view class="flex-col" v-if="(state === false) && false">
+							<view class="flex-col group_1"> </view>
+							<view class="flex-col group_2">
+								<view class="flex-col section_4">
+									<view class="flex-row section_5">
+										<text class="text_3">待认证，请先完成认证~</text>
+										<text class="text_4" @click="onAuto">去认证 >></text>
+									</view>
+								</view>
+								<view class="flex-col group_3">
+									<view class="flex-col">
+										<image src="/static/common/img/16535374500948048054.png" class="image_1" />
+									</view>
+									<text class="text_5">暂无数据，请尽快认证补充资料~</text>
+								</view>
+							</view>
+						</view>
+						<template v-if="(state === true) && true">
+							<!-- <view class="flex-col xyzz" v-if='Alumn.length'>
+								<view class="flex-col group_3">
+									<view class="flex-col">
+										<view class="flex-row group_4">
+											<view>
+												<image src="/static/common/img/16486275579950463634.png"
+													class="image_2" />
+												<text class="text_3">校友找找</text>
+											</view>
+											<text style='float:right;' @click='toAlumni()'>更多</text>
+										</view>
+										<view class="group_23">
+											<view class="flex-row horiz-list">
+												<view class="flex-col items-center list-item_2" :key="idx"
+													v-for="(item, idx) in Alumn" v-if='idx < 5'
+													@click='toDetil(item.userId)'>
+													<u-avatar :src="$u.http.config.imgUrl + item.imageUrl"
+														class="image_3"></u-avatar>
+													<text class="text_4">{{ handleStr(item) }}</text>
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view> -->
+							<!-- <view class="info-item"> -->
+
+							<information @clickImg="clickImg" @onStar="onStar" :list="shoolList" type="0"
+								:bottom="bottomState2" :borderRadius="true"></information>
+							<!-- </view> -->
+						</template>
+					</view>
+					<view class="flex-col group" v-if="index == 1">
+						<view class="flex-col" v-if="(state === false) && false">
+							<view class="flex-col group_1"> </view>
+							<view class="flex-col group_2">
+								<view class="flex-col section_4">
+									<view class="flex-row section_5">
+										<text class="text_3">待认证，请先完成认证~</text>
+										<text class="text_4" @click="onAuto">去认证 >></text>
+									</view>
+								</view>
+								<view class="flex-col group_3">
+									<view class="flex-col">
+										<image src="/static/common/img/16535374500948048054.png" class="image_1" />
+									</view>
+									<text class="text_5">暂无数据，请尽快认证补充资料~</text>
+								</view>
+							</view>
+						</view>
+						<template v-if="(state === true) && true">
+							<view class="flex-col group_18">
+								<view class="flex-col group_17">
+									<u-sticky offset-top="85" @fixed="onFixed"> </u-sticky>
+									<u-sticky offset-top="84" @unfixed="onFixed"> </u-sticky>
+
+									<!-- <view class="info-item"> -->
+
+									<information @onStar="onStar" @clickImg="clickImg" :list="helpList" type="1"
+										:bottom="bottomState" @onSign="onSign" :borderRadius="true">
+									</information>
+
+									<!-- </view> -->
+								</view>
+							</view>
+						</template>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<u-toast ref="uToast" />
+		<u-tabbar :list="vuex_tabbar" :class="{ phone: vuex_iPhone }" :active-color="vuex_tabbar_config.activeColor"
+			:inactive-color="vuex_tabbar_config.inactiveColor"></u-tabbar>
+
+		<!-- <u-back-top :scroll-top="scrollTop"></u-back-top> -->
+	</view>
+</template>
+
+<script>
+import dragButton from '../../../components/drag-button';
+import information from "../../../components/Information.vue";
+export default {
+	data() {
+		return {
+			scrollTop: 0,
+			isScroll: 0,
+			isScroll2: 0,
+			// 状态
+			state: false,
+			NavShow: false,
+			searchStyle: {
+				width: "100%",
+			},
+			sysList: ['全部', '企业招聘', '租房', '生活', '找工作', '其他'],
+			tabbar: "",
+			swiperCurrent: 0,
+			current: 0,
+			navList: [
+				{
+					name: "学校资讯",
+					type: 0
+				},
+				{
+					name: "校友帮帮",
+					type: 1
+				}
+			],
+			PageIndex: 1,
+			PageSize: 10,
+			PageIndex2: 1,
+			PageSize2: 10,
+			Keyword: "",
+			DateBegin: "",
+			DateEnd: "",
+			SkipCount: "",
+			helpList: [],
+			shoolList: [],
+			Alumn: [],
+			total1: 0,
+			total2: 0,
+			currentIdx: 0,
+			Keyword: '全部',
+			Title: "",
+			isonShow: true,
+			isLoad: false,
+			bottomState: false,
+			bottomState2: false,
+			isShool: '',
+		};
+	},
+	watch: {
+		isShool() {
+			this.bottomState = false,
+				this.bottomState2 = false,
+				this.helpList = []
+			this.shoolList = []
+			this.getList();
+		},
+		current() {
+			//改成切换就刷新
+			//if ((this.helpList.length == 0 && this.current == 1) || (this.shoolList.length == 0 && this.current == 0)) {
+			//}
+			this.getList();
+		},
+		currentIdx() {
+			this.getList();
+		}
+	},
+	onLoad(e) {
+		console.log('%c%s', 'color:red', 'onLoad--校友圈')
+		this.getList();
+		// this.getAlumnSearch();
+
+
+	},
+	onShow(e) {
+		//从我的界面点击回来
+		uni.$off('circle')
+		uni.$on('circle', () => {
+			console.log('circle')
+			// 获取当前页面的路径
+			let pages = getCurrentPages();
+			let currentPage = pages[pages.length - 1];
+			let url = '/' + currentPage.route;
+			uni.reLaunch({ url: url, });
+		})
+		// console.log('%c%s', 'color:red', 'onShow--校友圈')
+		// console.log(this.isonShow, 'this.isonShow--')
+		if (this.isonShow) {
+			if (uni.getStorageSync('Tag')) {
+				const value = uni.getStorageSync('Tag');
+				// this.current = 0
+				// this.swiperCurrent = 0
+				this.current = 1
+				this.swiperCurrent = 1
+				let arr = value.split(',')
+				let i = this.sysList.indexOf(arr[0])
+				this.oncurrent(i, arr[0])
+				uni.removeStorageSync('Tag');
+			} else {
+				// this.getList()
+			}
+			this.$u.api.getUser()
+			this.getList();
+			this.getAlumnSearch()
+			// this.getShoolList()
+			//	this.state = this.vuex_user.isAttestationXY || this.vuex_user.isAttestationJZG;
+			this.state = true;
+		}
+
+		//this.isShool = this.vuex_user.schoolId
+		this.getSchool()
+		uni.$on('helpAdd', () => {
+			console.log('helpAdd回调')
+			// this.gethelpList();
+			this.reload();
+		})
+	},
+	methods: {
+
+
+		handleStr(item) {
+			if (item.name?.length && item.name?.length > 3) {
+				return item.name?.slice(0, 3) + "..."
+			}
+			return item.name
+		},
+		async getSchool() {
+			const req = {
+				userId: this.vuex_user.id,
+			};
+			const res = await this.$u.apiList.MyEducations(req);
+			// console.log(res, 'res---');
+			const findRow = res.find(x => x.isSelected === true)
+			if (findRow) {
+				this.isShool = findRow.schoolId
+			}
+			// console.log(this.isShool, 'this.isShool--')
+		},
+		// 刷新
+		reload() {
+			this.getList()
+		},
+		// 获取笑友找找
+		getAlumnSearch() {
+			this.$u.api.getAlumnSearch().then(res => {
+				this.Alumn = res
+			})
+		},
+		oncurrent(index, item) {
+			if (this.Keyword != item) {
+				this.helpList = []
+				this.Keyword = item
+				this.currentIdx = index
+				this.Title = ""
+				this.PageIndex = 1
+				this.PageSize = 10
+				// if (!uni.getStorageSync('Tag')) {
+				// 	console.log('没有缓存')
+				// 	this.gethelpList()
+				// }
+			}
+		},
+		onSearch(val) {
+			this.Title = val
+			if (this.current == 0) {
+				this.shoolList = []
+				this.getShoolList()
+			} else {
+				this.helpList = []
+				this.gethelpList()
+			}
+		},
+		scroll(e) {
+			this.scrollTop = e.detail.scrollTop;
+		},
+		onFixed() {
+			this.NavShow = !this.NavShow;
+		},
+		// 获取校友帮帮列表
+		gethelpList() {
+			this.isLoad = true
+			const data = {
+				PageIndex: this.PageIndex,
+				PageSize: this.PageSize,
+				Keyword: this.Keyword,
+				// DateBegin:'',
+				// DateEnd:'',
+				// SkipCount:1,
+				// key:,
+			};
+			if (this.Keyword != '全部') {
+				data.Keyword = this.Keyword
+			}
+			if (this.Title) {
+				// this.helpList = []
+				data.Title = this.Title
+			}
+
+			this.$u.api.GetHelpList(data).then((res) => {
+				console.log(res, 'res--帮帮列表')
+				this.isLoad = false
+				this.total2 = res.total
+				if (this.helpList.length >= this.total2) {
+					this.bottomState = true;
+					return
+				}
+				if (this.total2 == res.items.length) {
+					this.bottomState = true;
+				}
+				this.helpList.push(...res.items)
+
+			});
+		},
+		// 获取学校资讯列表
+		getShoolList() {
+			const data = {
+				PageIndex: this.PageIndex2,
+				PageSize: this.PageSize2,
+				// Keyword:this.Keyword,
+				// DateBegin:'',
+				// DateEnd:'',
+				// SkipCount:1,
+				// key:,
+			};
+			if (this.Title) {
+				// this.shoolList = []
+				data.Title = this.Title
+			}
+			this.$u.api.GetSchoolList(data).then((res) => {
+				this.total1 = res.total
+				if (this.shoolList.length >= this.total1) {
+					this.bottomState2 = true;
+					return
+				}
+				if (this.total1 == res.items.length) {
+					this.bottomState2 = true;
+				}
+				this.shoolList.push(...res.items)
+			});
+		},
+		getList() {
+			if (this.current == 0) {
+				this.shoolList = []
+				this.PageIndex2 = 1
+				this.PageSize2 = 10
+				this.getShoolList();
+			} else {
+				this.helpList = []
+				this.PageIndex = 1
+				this.PageSize = 10
+				if (!this.isLoad) {
+					this.gethelpList();
+				}
+			}
+		},
+		// tabs通知swiper切换
+		tabsChange(index) {
+			this.swiperCurrent = index;
+			this.current = index
+			this.Title = ""
+		},
+		// swiper-item左右移动，通知tabs的滑块跟随移动
+		transition(e) {
+			let dx = e.detail.dx;
+			// this.$refs.uTabs.setDx(dx);
+		},
+		// 由于swiper的内部机制问速切题，快换swiper不会触发dx的连续变化，需要在结束时重置状态
+		// swiper滑动结束，分别设置tabs和swiper的状态
+		animationfinish(e) {
+			let current = e.detail.current;
+			console.log(current, 'current--');
+
+			// this.$refs.uTabs.setFinishCurrent(current);
+			this.swiperCurrent = current;
+			this.current = current;
+		},
+		// scroll-view到底部加载更多
+		onreachBottom() {
+			let num = this.PageIndex * this.PageSize
+			let num1 = this.PageIndex2 * this.PageSize2
+			if (this.current == 0) {
+				if (num1 >= this.total1) {
+					this.bottomState2 = true;
+					return
+				}
+				this.PageIndex2++;
+				this.getShoolList();
+			} else {
+				if (num >= this.total2) {
+					this.bottomState = true;
+					return
+				}
+				this.PageIndex++;
+				this.gethelpList();
+			}
+		},
+		onAuto() {
+			this.$u.route({
+				url: "/pages/my/ShoolList/ShoolList"
+			})
+		},
+		toAlumni(data) {
+			this.$u.route({
+				url: "/pages/AlumniCircle/Alumni/Alumni",
+			})
+		},
+		toDetil(id) {
+			this.$u.route({
+				url: '/pages/AlumniCircle/userDetail/userDetail?id=' + id
+			})
+		},
+		//收藏
+		async onStar(val) {
+			console.log('收藏--');
+			// 判断当前学校是否认证，未认证不可收藏
+			const req = {
+				userId: this.vuex_user.id,
+			}
+			const res = await this.$u.apiList.MyPage(req)
+			console.log(JSON.parse(JSON.stringify(res)), 'res')
+			const edcationList = res.edcationList
+			if (!edcationList.length) {
+				return this.$refs.uToast.show({
+					title: '认证后可进行收藏操作',
+					type: 'none',
+				})
+			}
+			const findRow = edcationList.find(x => x.isSelected === true);
+			if ([0, 2].includes(findRow.certifyStatus)) {
+				return this.$refs.uToast.show({
+					title: '认证后可进行收藏操作',
+					type: 'none',
+				})
+			}
+			const data = {
+				id: val.id,
+				type: val.type
+			}
+			this.$u.apiList.LikeCollect(data)
+				.then((res) => {
+					if (val.isCllect) {
+						if (val.collectCount > 0) {
+							val.isCllect = false
+							val.collectCount--
+							this.$refs.uToast.show({
+								title: '取消收藏成功',
+								type: 'success',
+							})
+						}
+					} else {
+						val.isCllect = true
+						val.collectCount++
+						this.$refs.uToast.show({
+							title: '收藏成功',
+							type: 'success',
+						})
+					}
+				})
+				.catch((err) => {
+					this.$refs.uToast.show({
+						title: '收藏失败',
+						type: 'error',
+					})
+				})
+		},
+		//标签跳转
+		onSign(v) {
+			let i = this.sysList.indexOf(v)
+			this.oncurrent(i, v)
+		},
+		// 搜索校友圈
+		searchClick() {
+			this.$u.route({
+				url: "pages/AlumniCircle/searchAlumnus/searchAlumnus",
+				params: {
+					type: this.current, //0-学校咨询 1-校友帮帮
+					class: this.Keyword, //分类：全部 企业招聘 租房等
+				},
+			})
+		},
+		//发布资讯文章
+		async btnClick() {
+			// 判断当前学校是否认证，未认证不可发布
+			const req = {
+				userId: this.vuex_user.id,
+			}
+			const res = await this.$u.apiList.MyPage(req)
+			console.log(JSON.parse(JSON.stringify(res)), 'res')
+			const edcationList = res.edcationList
+			if (!edcationList.length) {
+				return this.$refs.uToast.show({
+					title: '认证后可进行发布操作',
+					type: 'none',
+				})
+			}
+			const findRow = edcationList.find(x => x.isSelected === true);
+			if ([0, 2].includes(findRow.certifyStatus)) {
+				return this.$refs.uToast.show({
+					title: '认证后可进行发布操作',
+					type: 'none',
+				})
+			}
+			this.$u.route({
+				url: "pages/AlumniCircle/release/release",
+				params: {
+					Id: this.isShool,
+					type: this.current,
+					url: true
+				},
+			})
+		},
+		//预览图片
+		clickImg(item) {
+			this.isonShow = false
+			item = this.$u.http.config.imgUrl + item
+			var images = [];
+			images.push(item);
+			uni.previewImage({ // 图片路径必须是一个数组 => ['']
+				current: 0,
+				urls: images,
+			});
+		}
+	},
+	components: {
+		information: information,
+		dragButton: dragButton
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .u-tabs-scorll-flex {
+	width: 56%;
+}
+
+::v-deep .slot-wrap {
+	margin: 0 0.2rem;
+}
+
+::v-deep .u-slot-content {
+	display: block;
+}
+
+.group {
+	flex: 1 1 auto;
+	overflow-y: auto;
+
+	.group_1 {
+		padding-bottom: 0.015rem;
+		position: relative;
+
+		.section_1 {
+			background-color: rgb(255, 255, 255);
+
+			.section_2 {
+				padding: 0.13rem 0.23rem 0.085rem;
+				background-color: rgb(255, 255, 255);
+				box-shadow: 0.0002rem 0.005rem rgba(0, 0, 0, 0.03);
+
+				.text_1 {
+					color: rgb(2, 2, 2);
+					font-size: 0.15rem;
+					line-height: 0.14rem;
+					white-space: nowrap;
+				}
+
+				.text_2 {
+					margin-left: 0.47rem;
+					color: rgb(160, 162, 172);
+					font-size: 0.15rem;
+					line-height: 0.14rem;
+					white-space: nowrap;
+				}
+			}
+		}
+
+		.section_3 {
+			background-color: rgb(46, 155, 255);
+			border-radius: 0.015rem;
+			height: 0.035rem;
+			position: absolute;
+			left: 0.35rem;
+			right: 3.15rem;
+			bottom: 0;
+		}
+	}
+
+	.group_2 {
+		padding-bottom: 1.03rem;
+
+		.section_4 {
+			padding: 0.33rem 0 0.34rem;
+			background-color: rgb(255, 255, 255);
+
+			.section_5 {
+				margin-left: 0.18rem;
+				margin-right: 0.24rem;
+				padding: 0.2rem 0.18rem 0.18rem 0.24rem;
+				background-color: rgb(246, 247, 250);
+
+				.text_3 {
+					color: rgb(160, 162, 172);
+					font-size: 0.15rem;
+					line-height: 0.15rem;
+					letter-spacing: 0.015rem;
+					white-space: nowrap;
+				}
+
+				.text_4 {
+					margin-left: 0.05rem;
+					color: rgb(46, 155, 255);
+					font-size: 0.15rem;
+					line-height: 0.15rem;
+					white-space: nowrap;
+					text-transform: uppercase;
+				}
+			}
+		}
+
+		.group_3 {
+			margin-top: 0.76rem;
+			padding-left: 0.8rem;
+			padding-right: 0.69rem;
+			color: rgb(163, 182, 202);
+			font-size: 0.15rem;
+			line-height: 0.15rem;
+			white-space: nowrap;
+
+			.text_5 {
+				margin-left: 0.02rem;
+				margin-top: 0.13rem;
+			}
+
+			.image_1 {
+				margin-right: 0.14rem;
+				width: 2.12rem;
+				height: 1.89rem;
+			}
+		}
+	}
+
+
+	.info-item {
+		padding: 24rpx;
+	}
+}
+
+.xyzz {
+	margin-bottom: 0.05rem;
+
+	.group_3 {
+		padding: 0.1rem 0 0.1rem;
+		overflow-x: hidden;
+		background: #fff;
+		// border-top: 1px solid #ccc;
+
+		.group_4 {
+			justify-content: space-between;
+			width: 85%;
+			margin: 0 auto;
+
+			>text {
+				color: #2e9bff;
+				font-size: 0.15rem;
+				line-height: 0.16rem;
+				white-space: nowrap;
+			}
+
+			.image_2 {
+				flex-shrink: 0;
+				width: 0.17rem;
+				height: 0.17rem;
+				vertical-align: middle;
+			}
+
+			.text_3 {
+				margin-left: 0.05rem;
+				color: rgb(2, 2, 2);
+				font-size: 0.15rem;
+				line-height: 0.15rem;
+				letter-spacing: 0.015rem;
+				vertical-align: middle;
+			}
+		}
+
+		.group_23 {
+			width: 100vw;
+			overflow-x: scroll;
+			margin-top: 0.13rem;
+
+			.horiz-list {
+				overflow-x: auto;
+				padding: 0 0.15rem;
+
+				.list-item_2 {
+					padding: 0.05rem 0 0.065rem;
+					flex-shrink: 0;
+					width: 20%;
+
+					.image_3 {
+						border-radius: 50%;
+						width: 0.4rem;
+						height: 0.4rem;
+						box-shadow: 0 0 1px #6f6f6f;
+					}
+
+					.text_4 {
+						margin-top: 0.15rem;
+						color: rgb(2, 2, 2);
+						font-size: 0.12rem;
+						line-height: 0.12rem;
+						letter-spacing: 0.012rem;
+					}
+				}
+			}
+		}
+	}
+}
+
+.xyList {
+	.list {
+		margin-top: 0.055rem;
+		padding-bottom: 0.06rem;
+
+		.list-item_1 {
+			padding: 0.19rem 0 0.07rem;
+			background-color: rgb(255, 255, 255);
+			margin-bottom: 0.1rem;
+
+			.group_11 {
+				padding: 0 0.16rem;
+
+				.image_9 {
+					margin-bottom: 0.015rem;
+					width: 0.3rem;
+					height: 0.3rem;
+				}
+
+				.group_23 {
+					margin-left: 0.065rem;
+					margin-top: 0.02rem;
+					flex: 1 1 auto;
+
+					.text_10 {
+						color: rgb(2, 2, 2);
+						font-size: 0.14rem;
+						line-height: 0.13rem;
+					}
+
+					.text_11 {
+						margin-top: 0.055rem;
+						color: rgb(184, 184, 184);
+						font-size: 0.12rem;
+						line-height: 0.12rem;
+					}
+				}
+			}
+
+			.text_12 {
+				margin-top: 0.17rem;
+				align-self: center;
+				color: rgb(55, 59, 72);
+				font-size: 0.18rem;
+				line-height: 0.17rem;
+			}
+
+			.text_13 {
+				margin: 0.12rem 0.15rem 0 0.17rem;
+				color: rgb(73, 76, 87);
+				font-size: 0.15rem;
+				line-height: 0.24rem;
+			}
+
+			.equal-division {
+				margin-top: 0.035rem;
+				padding: 0.05rem 0.15rem;
+
+				.tool {
+					margin-top: 0.3rem;
+
+					.group_8 {
+						padding-left: 0.26rem;
+						padding-right: 0.24rem;
+						flex: 1 1 1.11rem;
+
+						.image_12 {
+							width: 0.22rem;
+							height: 0.21rem;
+						}
+
+						.text_17 {
+							margin-left: 0.08rem;
+							align-self: center;
+							color: rgb(180, 182, 189);
+							font-size: 0.14rem;
+							line-height: 0.11rem;
+						}
+					}
+
+					.group_9 {
+						margin-left: 0.055rem;
+						padding: 0 0.24rem;
+						flex: 1 1 1.11rem;
+
+						.image_14 {
+							width: 0.18rem;
+							height: 0.2rem;
+						}
+
+						.text_18 {
+							margin-left: 0.08rem;
+							align-self: center;
+							color: rgb(180, 182, 189);
+							font-size: 0.14rem;
+							line-height: 0.11rem;
+						}
+					}
+
+					.group_10 {
+						margin-left: 0.05rem;
+						padding: 0 0.23rem;
+						flex: 1 1 1.11rem;
+						width: 1.12rem;
+
+						.image_16 {
+							margin-left: 0.07rem;
+							width: 0.2rem;
+							height: 0.2rem;
+						}
+
+						.text_19 {
+							align-self: center;
+							color: rgb(180, 182, 189);
+							font-size: 0.14rem;
+							line-height: 0.11rem;
+						}
+					}
+				}
+
+				.image_10 {
+					flex: 1 1 1.11rem;
+					width: 1.11rem;
+					height: 1.11rem;
+				}
+
+				.image_13 {
+					margin-left: 0.055rem;
+				}
+
+				.image_15 {
+					margin-left: 0.05rem;
+				}
+			}
+		}
+	}
+}
+
+.group_18 {
+	.image_2 {
+		margin: 0 auto;
+		border-radius: 0.1rem;
+		width: 3.45rem;
+		height: 1.3rem;
+	}
+
+	.group_17 {
+		margin-top: 0rem;
+
+		
+
+		.NavShow {
+			position: fixed;
+			top: 0;
+			width: 100%;
+			background: #fff;
+			z-index: 999;
+			border-top: 0.01rem solid #eee;
+		}
+
+		.section_6 {
+			background-color: rgb(246, 247, 250);
+
+			.list-item {
+				padding: 0.18rem 0.1rem 0.21rem 0.16rem;
+				background-color: rgb(255, 255, 255);
+
+				.view {
+					margin-right: 0.051rem;
+				}
+
+				.group_9 {
+					margin-right: 0.13rem;
+					margin-top: 0.17rem;
+
+					.text_14 {
+						align-self: flex-start;
+						color: rgb(2, 2, 2);
+						font-size: 0.18rem;
+						font-family: Adobe Heiti Std;
+						line-height: 0.17rem;
+					}
+
+					.text_15 {
+						margin-top: 0.11rem;
+						color: rgb(73, 76, 87);
+						font-size: 0.15rem;
+						font-family: Adobe Heiti Std;
+						line-height: 0.24rem;
+					}
+
+					.text_16 {
+						margin-left: 0.04rem;
+						margin-top: 0.12rem;
+						align-self: flex-start;
+						color: rgb(44, 109, 255);
+						font-size: 0.14rem;
+						font-family: PingFang;
+						line-height: 0.13rem;
+					}
+				}
+
+				.group_21 {
+					margin-left: 0.24rem;
+					margin-top: 0.1rem;
+
+					.group_20 {
+						margin: 0.025rem 0;
+
+						.image_6 {
+							flex-shrink: 0;
+							width: 0.22rem;
+							height: 0.21rem;
+						}
+
+						.text_17 {
+							margin-left: 0.08rem;
+							margin-top: 0.065rem;
+							color: rgb(180, 182, 189);
+							font-size: 0.14rem;
+							font-family: PingFang;
+							line-height: 0.11rem;
+						}
+					}
+
+					.group_10 {
+						margin-left: 0.63rem;
+						align-self: center;
+
+						.image_7 {
+							flex-shrink: 0;
+							width: 0.18rem;
+							height: 0.2rem;
+						}
+
+						.text_18 {
+							margin-left: 0.08rem;
+							margin-top: 0.06rem;
+							color: rgb(180, 182, 189);
+							font-size: 0.14rem;
+							font-family: PingFang;
+							line-height: 0.11rem;
+						}
+					}
+
+					.equal-division-item_1 {
+						margin-left: 0.33rem;
+						padding: 0.03rem 0;
+						width: 1.18rem;
+
+						.image_8 {
+							margin-left: 0.3rem;
+							width: 0.2rem;
+							height: 0.2rem;
+						}
+
+						.text_19 {
+							margin-left: 0.095rem;
+							margin-top: 0.06rem;
+							color: rgb(180, 182, 189);
+							font-size: 0.14rem;
+							font-family: PingFang;
+							line-height: 0.11rem;
+						}
+					}
+				}
+			}
+
+			.list-item_1 {
+				margin-top: 0.04rem;
+				padding: 0.18rem 0.099rem 0.17rem;
+				background-color: rgb(255, 255, 255);
+
+				.group_13 {
+					margin-left: 0.061rem;
+					margin-right: 0.056rem;
+				}
+
+				.group_14 {
+					margin: 0.17rem 0.12rem 0 0.071rem;
+
+					.text_23 {
+						align-self: flex-start;
+						color: rgb(2, 2, 2);
+						font-size: 0.18rem;
+						font-family: Adobe Heiti Std;
+						line-height: 0.17rem;
+					}
+
+					.text_24 {
+						margin-top: 0.085rem;
+						color: rgb(73, 76, 87);
+						font-size: 0.15rem;
+						font-family: Adobe Heiti Std;
+						line-height: 0.24rem;
+					}
+
+					.text_25 {
+						margin-left: 0.04rem;
+						margin-top: 0.03rem;
+						align-self: flex-start;
+						color: rgb(44, 109, 255);
+						font-size: 0.14rem;
+						font-family: PingFang;
+						line-height: 0.16rem;
+					}
+				}
+
+				.equal-division {
+					margin-top: 0.04rem;
+
+					.equal-division-item_2 {
+						flex: 1 1 1.18rem;
+						padding: 0.029rem 0;
+
+						.image_10 {
+							width: 0.2rem;
+							height: 0.2rem;
+						}
+
+						.text_26 {
+							margin: 0.062rem 0 0 0.085rem;
+							color: rgb(180, 182, 189);
+							font-size: 0.14rem;
+							font-family: PingFang;
+							line-height: 0.11rem;
+						}
+					}
+				}
+			}
+
+			.group_8 {
+				height: 0.32rem;
+				position: relative;
+
+				.image_3 {
+					width: 0.3rem;
+					height: 0.3rem;
+					position: absolute;
+					left: 0;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+
+				.text_8 {
+					color: rgb(2, 2, 2);
+					font-size: 0.14rem;
+					font-family: PingFang;
+					line-height: 0.13rem;
+				}
+
+				.text_43 {
+					position: absolute;
+					left: 0.37rem;
+					top: 0.02rem;
+				}
+
+				.text_9 {
+					color: rgb(184, 184, 184);
+					font-size: 0.12rem;
+					font-family: PingFang;
+					line-height: 0.12rem;
+					position: absolute;
+					right: 0;
+					top: 0.035rem;
+				}
+
+				.text_11 {
+					color: rgb(184, 184, 184);
+					font-size: 0.12rem;
+					font-family: PingFang;
+					line-height: 0.12rem;
+					position: absolute;
+					left: 0.37rem;
+					bottom: 0;
+				}
+
+				.text_20 {
+					position: absolute;
+					left: 0.36rem;
+					top: 0.02rem;
+				}
+			}
+		}
+	}
+}
+
+.content-top {
+	background: #fff;
+	padding-bottom: 30rpx;
+}
+
+.tabs-wrap {
+	display: flex;
+	align-items: center;
+}
+
+.search-box {
+	width: 88rpx;
+	height: 88rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: #F6F8F9;
+	border-radius: 50%;
+	margin-left: 20rpx;
+}
+
+.tabs-box {
+	display: flex;
+	width: 482rpx;
+	justify-content: space-between;
+	align-items: center;
+	padding: 10rpx;
+	background: #F6F8F9;
+	border-radius: 200rpx;
+	margin-left: 40rpx;
+
+	.tabs-item {
+		width: 218rpx;
+		height: 72rpx;
+		text-align: center;
+		line-height: 72rpx;
+	}
+
+	.tabs-item-active {
+		background: #FFFFFF;
+		box-shadow: 0rpx 16rpx 8rpx -8rpx rgba(18, 18, 18, 0.08), inset 0rpx 8rpx 8rpx 0rpx rgba(255, 255, 255, 0.05);
+		border-radius: 200rpx;
+		border: 3rpx solid;
+		border-image: linear-gradient(180deg, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0), rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1)) 3 3;
+	}
+}
+
+.page-title {
+	padding: 40rpx 40rpx 40rpx;
+	color: #000;
+	font-size: 36rpx;
+	font-weight: 800;
+	background: #fff;
+
+}
+.section_5 {
+			justify-content: space-between;
+			padding: 0.11rem 0.17rem 0rem;
+			background-color: rgb(255, 255, 255);
+			box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+			position: relative;
+			font-size: 32rpx;
+
+			.tab-text {
+				// margin: 0 0.1rem;
+			}
+
+			.text_3 {
+				margin-bottom: 0.02rem;
+				// color: rgb(46, 155, 255);
+				// font-size: 0.18rem;
+				font-weight: 800;
+				font-size: 36rpx;
+				color: #000000;
+				font-family: PingFang;
+				line-height: 0.21rem;
+				position: relative;
+				z-index: 1;
+
+				&::after {
+					position: absolute;
+					content: '';
+					bottom: 2rpx;
+					right: 0;
+					width: 100%;
+					height: 12rpx;
+					background: linear-gradient(116deg, rgba(60, 181, 251, 0) 0%, #28C6FB 45%, #06E1FA 100%);
+					border-radius: 2rpx;
+					z-index: -1;
+				}
+			}
+
+			.text_4 {
+				margin: 0.025rem 0 0.015rem 0.34rem;
+				color: rgb(160, 162, 172);
+				font-size: 0.15rem;
+				font-family: PingFang;
+				line-height: 0.14rem;
+			}
+
+			.text_5 {
+				margin-left: 0.26rem;
+				margin-top: 0.015rem;
+				color: rgb(160, 162, 172);
+				font-size: 0.15rem;
+				font-family: PingFang;
+				line-height: 0.16rem;
+			}
+
+			.text_6 {
+				margin-left: 0.29rem;
+				margin-top: 0.02rem;
+				color: rgb(160, 162, 172);
+				font-size: 0.15rem;
+				font-family: PingFang;
+				line-height: 0.16rem;
+			}
+
+			.text_7 {
+				margin-left: 0.35rem;
+				margin-top: 0.015rem;
+				color: rgb(160, 162, 172);
+				font-size: 0.15rem;
+				font-family: PingFang;
+				line-height: 0.16rem;
+			}
+		}
+</style>
diff --git a/pages/AlumniCircle/forward/forward.vue b/pages/AlumniCircle/forward/forward.vue
new file mode 100644
index 0000000..ecad3cb
--- /dev/null
+++ b/pages/AlumniCircle/forward/forward.vue
@@ -0,0 +1,276 @@
+<template>
+	<view class="flex-col forward">
+		<u-navbar  title="转发" ></u-navbar>
+		<view class="flex-col group1">
+			<view>
+				<u-input v-model="value" :type="type" :border="border" :height="height" :auto-height="autoHeight" placeholder="转发分享内容"/>
+			</view>
+			<view class="flex-col list-item">
+			  <view class="flex-row group_8 view">
+			    <image :src="$u.http.config.imgUrl+forwardData.userHead" class="image_3" />
+			    <text class="text_8 text_43">{{forwardData.userName}}</text>
+			    <text class="text_9">{{forwardData.creationTime}}</text>
+			    <text class="text_11">{{forwardData.schoolName}}</text>
+			  </view>
+			  <view class="flex-col group_9">
+			    <text class="text_14">{{forwardData.title}}</text>
+			    <text class="text_15">
+						{{forwardData.content}}
+			    </text>
+			    <view class="imgList flex-col" v-if="true">
+			      <view class="flex-row group_10">
+			       <!-- <image :src="$u.http.config.imgUrl + forwardData.imageUrl"
+			          class="image_10" /> -->
+					  <image v-for="(v, i) in forwardData.imageUrl.split(',')" @click="clickImg(v)" :key="i" :src="v?$u.http.config.imgUrl + v:''"
+					    class="image_10" />
+			      </view>
+			    </view>
+			  </view>
+			</view>
+		</view>
+		<view class="flex-col items-center button" @click="onSend">
+			<text>发送</text>
+		</view>
+		<view>
+			<u-toast ref="uToast" />
+			<u-top-tips :z-index='999999' ref="uTips" :navbar-height="0"></u-top-tips>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				value:'',
+				type:'textarea',
+				border: true,
+				height: 150,
+				autoHeight: true,
+				forwardData:{},
+			}
+		},
+		onLoad(e){
+			this.forwardData = JSON.parse(e.data)
+		},
+		methods:{
+			onSend(){
+				if(this.value == ""){
+					// return this.$tips("请输入标题", "error");
+					return this.$refs.uToast.show({
+					title: '请输入标题',
+					type: 'warning',
+				})
+				}
+				const data = {
+					title:this.value,
+					content:this.forwardData.content,
+					sysSignStr:this.forwardData.sysSignStr,
+					userId:this.vuex_user.id,
+					path:this.forwardData.imageUrl,
+					forwardId:this.forwardData.id
+				}
+				if(this.forwardData.schoolId){
+					data.schoolId = this.forwardData.schoolId
+				}
+				 this.$u.apiList.ForwardHelpArticle(data).then((res)=>{
+					 /* uni.showToast({
+					 	title: "转发成功",
+					 	duration: 2000,
+					 }); */
+					 this.$refs.uToast.show({
+						title: '转发成功',
+						type: 'success',
+					})
+           uni.$emit('echoList',{
+              type:'forward',
+              data:{}
+            })
+					 setTimeout(()=>{
+						uni.switchTab({
+							url: '../../AlumniCircle/alumnus/alumnus'
+						});
+					 },1000)
+				 })
+			},
+			//图片预览
+			clickImg(item){
+				item = this.$u.http.config.imgUrl + item
+				var images = [];
+				images.push(item);
+				uni.previewImage({  // 图片路径必须是一个数组 => ['']
+					current: 0,
+					 urls: images,
+				});
+			},
+			//返回上一级
+			router(){
+				if(this.forwardData.route==2){
+					this.$u.route({
+						url:'pages/AlumniCircle/userDetail/userDetail?id='+this.forwardData.userId
+					})
+				}else{
+					uni.switchTab({
+						url: '../../AlumniCircle/alumnus/alumnus'
+					});
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.forward{
+		background-color: #ffffff;
+		height: 100vh;
+		.group1{
+			padding: 0.2rem 0.15rem;
+		}
+		.list-item {
+		  padding: 0.18rem 0 0.21rem 0.16rem;
+		  background-color: #F2F2F2;
+		  margin-bottom: 0.1rem;
+		  .view {
+		    margin-right: 0.051rem;
+		  }
+		  .group_9 {
+		    margin-right: 0.13rem;
+		    margin-top: 0.17rem;
+		    .text_14 {
+		      align-self: flex-start;
+		      color: rgb(2, 2, 2);
+		      font-size: 32rpx;
+		      font-family: Adobe Heiti Std;
+		      line-height: 0.17rem;
+		    }
+		    .text_15 {
+		      margin-top: 0.11rem;
+		      color: rgb(73, 76, 87);
+		      font-size: 28rpx;
+		      font-family: Adobe Heiti Std;
+		      line-height: 0.24rem;
+		      text-indent: 0.2rem;
+		    }
+		    .text_16 {
+		      margin-left: 0.04rem;
+		      margin-top: 0.12rem;
+		      align-self: flex-start;
+		      color: rgb(44, 109, 255);
+		      font-size: 0.14rem;
+		      font-family: PingFang;
+		      line-height: 0.13rem;
+		    }
+		  }
+		  .group_21 {
+		    margin-top: 0.1rem;
+		    justify-content: space-between;
+		    width: 90%;
+		    margin: 0.1rem auto 0;
+		    .group_20 {
+		      margin: 0.025rem 0;
+		      .image_6 {
+		        flex-shrink: 0;
+		        width: 0.22rem;
+		        height: 0.21rem;
+		      }
+		      .text_17 {
+		        margin-left: 0.08rem;
+		        margin-top: 0.065rem;
+		        color: rgb(180, 182, 189);
+		        font-size: 0.14rem;
+		        font-family: PingFang;
+		        line-height: 0.11rem;
+		      }
+		    }
+		    .equal-division-item_1 {
+		      padding: 0.03rem 0;
+		      .image_8 {
+		        width: 0.2rem;
+		        height: 0.2rem;
+		      }
+		      .text_19 {
+		        margin-left: 0.095rem;
+		        margin-top: 0.06rem;
+		        color: rgb(180, 182, 189);
+		        font-size: 0.14rem;
+		        font-family: PingFang;
+		        line-height: 0.11rem;
+		      }
+		    }
+		  }
+		}
+		.group_8 {
+		  height: 0.32rem;
+		  position: relative;
+		  .image_3 {
+		    width: 0.3rem;
+		    height: 0.3rem;
+		    position: absolute;
+		    left: 0;
+		    top: 50%;
+		    transform: translateY(-50%);
+		    border-radius: 50%;
+		  }
+		  .text_8 {
+		    color: rgb(2, 2, 2);
+		    font-size: 0.14rem;
+		    font-family: PingFang;
+		    line-height: 0.13rem;
+		  }
+		  .text_43 {
+		    position: absolute;
+		    left: 0.37rem;
+		    top: 0.02rem;
+		  }
+		  .text_9 {
+		    color: rgb(184, 184, 184);
+		    font-size: 0.12rem;
+		    font-family: PingFang;
+		    line-height: 0.12rem;
+		    position: absolute;
+		    right: 15rpx;
+		    top: 0.035rem;
+		  }
+		  .text_11 {
+		    color: rgb(184, 184, 184);
+		    font-size: 0.12rem;
+		    font-family: PingFang;
+		    line-height: 0.12rem;
+		    position: absolute;
+		    left: 0.37rem;
+		    bottom: 0;
+		  }
+		  .text_20 {
+		    position: absolute;
+		    left: 0.36rem;
+		    top: 0.02rem;
+		  }
+		}
+		.button {
+			margin-top: 0.18rem;
+			padding: 0.13rem 0 0.12rem;
+			align-self: center;
+			color: rgb(255, 255, 255);
+			font-size: 0.15rem;
+			line-height: 0.16rem;
+			letter-spacing: 0.03rem;
+			white-space: nowrap;
+			background-color: #3cb4fb;
+			border-radius: 100rpx;
+			width: 3.1rem;
+			cursor: pointer;
+		}
+		.imgList {
+		  image {
+			// flex: 31%;
+			width: 0.94rem;
+		    height: 0.91rem;
+		    margin: 0.01rem;
+		  }
+		  .group_10 {
+			flex-wrap: wrap;			
+		  }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/AlumniCircle/release/release.vue b/pages/AlumniCircle/release/release.vue
new file mode 100644
index 0000000..e738e56
--- /dev/null
+++ b/pages/AlumniCircle/release/release.vue
@@ -0,0 +1,565 @@
+<template>
+	<view>
+		<u-navbar title="发布"></u-navbar>
+		<view class="flex-col page">
+			<view class="flex-col group">
+				<view class="flex-col items-center text-wrapper">
+					<u-input :maxlength='vuex_user.isAttestationGLY ? 35 : 20' type="text" v-model='title'
+					:custom-style="{fontSize:'32rpx'}"
+						@focus="inputFocus" placeholder="添加标题" class="text_1" />
+				</view>
+				<view class="flex-col items-start section_3">
+					<view class="group_1">
+						<u-input type="textarea" v-model='content' @click="shuru" @blur="inputBlur" @focus="inputFocus"
+							maxlength="300" :custom-style="textareaStyle" placeholder="添加正文" />
+					</view>
+					<view class="flex-col section_5" v-if="type == 1">
+						<scroll-view scroll-x="true">
+							<view class="flex-row group_5">
+								<view v-for="(item, index) in tabs" :key="index"
+									class="flex-col items-center text-wrapper_1"
+									:class="{ 'text-wrapper_2': arr1.includes(item.name) }"
+									@click="current(index, item)">
+									<image
+										src="/static/common/img/icon-lineRounded.png"
+										class="image_3"
+									/>
+									<text class="text_13" :class="{ 'text_16': arr1.includes(item.name) }">{{ item.name
+									}}</text>
+								</view>
+								<!-- 							<view class="flex-col items-center text-wrapper_2"><text class="text_16">找工作</text></view> -->
+							</view>
+						</scroll-view>
+					</view>
+
+					<view class="justify-between section_4">
+						<view class="flex-row expression-box" @click='emoji = !emoji'>
+							<image src="/static/common/img/icon-happy-face.png" 
+								class="image_3" />
+							<text class="text_10">表情</text>
+						</view>
+
+						<view class="flex-row group_2">
+							<!-- <view class="flex-row">
+									<text class="text_9">@</text>
+									<text class="text_10">用户</text>
+								</view> -->
+							<!-- <view class="flex-row group_4">
+								<image src="/static/common/img/16535374509810688026.png" class="image_4" />
+								<text class="text_11">位置</text>
+							</view> -->
+						</view>
+					</view>
+
+					<view class="uping">
+						<u-upload :max-size="5 * 1024 * 1024" max-count="9" :header='header'
+							:action="$u.http.config.baseUrl + action" @on-success="onSuccess" @on-remove="onRemove"
+							ref="uUpload" width="140" height="140"></u-upload>
+					</view>
+				</view>
+
+
+			</view>
+		</view>
+		<view class="flex-col items-center text-wrapper_4" @click="onRelease"><text class="text_18">发 布</text></view>
+		<!-- emoji 表情 -->
+		<div @click='emoji = !emoji' class='back' v-show="emoji"></div>
+		<swiper class="slider" :current="emojicurrent" :class="emoji ? 'emojishow' : ''">
+			<swiper-item v-for="(item, key) in emojiData" :key="key" class="slider-emoji"
+				:class="[key == emojiData.length - 1 ? 'lastbox' : '']">
+				<text v-for="(value, index) in item" :key="index" @click="selemoji(value)" class="slider-emoji-icon">{{
+					value }}</text>
+			</swiper-item>
+		</swiper>
+		<u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+		<u-toast ref="uToast"/>
+	</view>
+</template>
+
+<script>
+import { Debounce } from '../../../common/utils.js'
+import emoji from "../../../static/common/js/emoji";
+export default {
+	data() {
+		return {
+			textareaStyle: {
+				width: "80%",
+				minHeight: "300rpx"
+			},
+			fileList: [],
+			title: '',
+			content: '',
+			emojiData: [],
+			emoji: false,
+			emojicurrent: 0,
+			header: {
+				Authorization: ""
+			},
+			action: '/app/User/File',
+			imgData: [],
+			schoolId: "",
+			sysSignStr: [],
+			num: "",
+			tabs: [],
+			arr1: [],
+			type: "",
+			url: false,
+			time: null,
+		};
+	},
+	onLoad(e) {
+		this.header.Authorization = "Bearer " + this.vuex_token;
+		this.schoolId = e.Id
+		this.type = e.type
+		this.url = e.url
+		this.emojiInit();
+		this.getSign()
+	},
+	methods: {
+		// 提示
+		tips(title, type, time) {
+			this.$refs.uToast.show({
+				title: title ? title : "",
+				type: type ? type : "success",
+				duration: time ? time + "" : "1000",
+			});
+		},
+		getSign() {
+			this.$u.apiList.GetSign().then((res) => {
+				if (!this.vuex_user.isAttestationQY) {
+					this.tabs = res.filter(item => {
+						return item.name != '企业招聘'
+					})
+				} else {
+					this.tabs = res
+				}
+
+			})
+		},
+		inputFocus() {
+			this.emoji = false;
+		},
+		current(i, item) {
+			if (this.arr1.includes(item.name)) {
+				this.arr1.splice(this.arr1.indexOf(item.name), 1)
+
+			} else {
+				this.arr1.push(item.name)
+
+			}
+		},
+		onRelease() {
+			// uni.$emit('helpAdd')
+			// uni.switchTab({
+			//   url: '/pages/AlumniCircle/alumnus/alumnus?add=true',
+			// });
+			// return 
+			if (!this.time) {
+
+			}
+			if (this.title === "") {
+				this.tips('请输入标题', 'error')
+				return
+			}
+			if (this.content === "") {
+				this.tips('请输入内容', 'error')
+				return
+			}
+			// let files = this.$refs.uUpload.lists[0];
+
+			if (this.type == 1) {
+				if (this.arr1 == "") {
+					this.tips("请选择标签", "error")
+					return
+				}
+			}
+			let file = this.imgData.join(',')
+			// if(!file){
+			// 	this.tips("请上传图片","error");
+			// 	return false
+			// }
+			let sysSignStr = this.arr1.join(',')
+			const data = {
+				title: this.title,
+				content: this.content,
+				path: file,
+				forwardId: "",
+				sysSignStr: sysSignStr,
+				userId: this.vuex_user.id,
+				schoolId: this.schoolId,
+			}
+
+			if (this.type == 0) {
+				data.sysSignStr = ""
+				this.onJourna(data)
+			} else if (this.type == 1) {
+				this.onHelp(data)
+			}
+		},
+		//发布学校资讯
+		onJourna: Debounce(function (data) {
+			this.$u.apiList.InsertJournaArticle(data).then((res) => {
+				/* uni.showToast({
+					title: "发布成功",
+					duration: 2000,
+				}); */
+				this.$refs.uToast.show({
+					title: '发布成功',
+					type: 'success',
+				})
+				setTimeout(() => {
+					uni.switchTab({
+						url: "../../../pages/my/my/my"
+					});
+				}, 1000)
+			})
+		}, 1000),
+		//发布帮帮资讯
+		onHelp: Debounce(function (data) {
+			this.$u.apiList.InsertHelpArticle(data).then((res) => {
+				/* uni.showToast({
+					title: "发布成功",
+					duration: 2000,
+				}); */
+				this.$refs.uToast.show({
+					title: '发布成功',
+					type: 'success',
+				})
+				uni.$emit('helpAdd')
+				setTimeout(() => {
+					if (this.url) {
+						uni.switchTab({
+							url: '../../AlumniCircle/alumnus/alumnus?add=true'
+						});
+					} else {
+						uni.switchTab({
+							url: "../../../pages/my/my/my"
+						});
+					}
+				}, 1000)
+			})
+		}, 1000),
+		onSuccess(res) {
+
+			this.imgData.push(res.data)
+		},
+		onRemove(index, lists) {
+			let imgs = []
+			lists.forEach(item => {
+				imgs.push(item.response.data)
+			})
+			this.imgData = imgs
+		},
+		inputBlur() {
+			;
+		},
+		shuru() {
+			;
+		},
+		selemoji(m) {
+
+			this.content += m;
+		},
+		// 表情初始化
+		emojiInit() {
+			var number = emoji.length;
+			// var page = Math.ceil(emoji.length / number);
+			var page = 1;
+			for (let i = 0; i < page; i++) {
+				this.emojiData[i] = [];
+				for (let k = 0; k < number; k++) {
+					emoji[i * number + k] ?
+						this.emojiData[i].push(emoji[i * number + k]) :
+						"";
+				}
+			}
+		},
+		//返回上一级
+		router() {
+			if (this.url) {
+				uni.switchTab({
+					url: '../../AlumniCircle/alumnus/alumnus'
+				});
+			} else {
+				uni.switchTab({
+					url: '../../my/my/my'
+				});
+			}
+
+		}
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.emojishow {
+	height: 3rem !important;
+}
+
+.back {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	background: #fff;
+	opacity: 0.2;
+}
+
+.slider {
+	background: #fff;
+	width: 7.75rem;
+	height: 0rem;
+	transition: all 0.3s;
+	box-shadow: 0 0 4px #999;
+	position: fixed;
+	bottom: 0;
+
+	.slider-emoji {
+		overflow-y: scroll;
+		width: 100vw !important;
+	}
+
+	&-emoji {
+		width: 6.75rem;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: center;
+
+		&-icon {
+			font-size: 0.265rem;
+			display: inline-block;
+			width: 11%;
+			text-align: center;
+			padding: 0.02rem 0;
+			border-radius: 0.1rem;
+			//   border-bottom: 1px solid #ccc;
+		}
+
+		&-icon:active {
+			background: #ccc;
+		}
+	}
+}
+
+.page {
+	// padding-bottom: 0.5rem;
+	overflow-y: auto;
+	width: calc(100% - 48rpx);
+	overflow-x: hidden;
+	height: 100%;
+	background: #FFFFFF;
+	border-radius: 24rpx;
+	margin: 28rpx auto 0;
+
+	.group {
+		padding-top: 0.015rem;
+
+		.text-wrapper {
+			padding: 20rpx 40rpx;
+			background-color: rgb(255, 255, 255);
+			box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.1);
+
+			.text_1 {
+				color: rgb(2, 2, 2);
+				font-size: 32rpx;
+				font-family: Adobe Heiti Std;
+				line-height: 0.24rem;
+				width: 100%;
+			}
+		}
+
+		.section_3 {
+			margin-top: 0.015rem;
+			padding: 0.13rem 0 0.24rem;
+			background-color: rgb(255, 255, 255);
+			box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+
+			.group_1 {
+				width: 100%;
+				padding: 0 40rpx;
+				margin: 0 auto;
+			}
+
+			.uping {
+				width: 100%;
+				padding: 0 40rpx;
+				margin: 0 auto;
+			}
+		}
+
+		.section_4 {
+			margin-top: 0.01rem;
+			// padding: 0.12rem 0.28rem 0.14rem 0.2rem;
+			padding: 30rpx 40rpx;
+			background-color: rgb(255, 255, 255);
+			box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+			// width: calc(100% - 0.44rem);
+			width: 100%;
+			margin: 0 auto;
+			border-top: 1px solid #E7E7E7;
+
+			.image_2 {
+				margin-top: 0.02rem;
+				width: 0.23rem;
+				height: 0.18rem;
+			}
+
+			.expression-box {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 128rpx;
+				height: 60rpx;
+				background: #F6F8F9;
+				border-radius: 200rpx 200rpx 200rpx 200rpx;
+			}
+
+			.image_3 {
+				margin-right: 8rpx;
+				width: 30rpx;
+				height: 30rpx;
+			}
+
+			.group_2 {
+				margin-top: 0.01rem;
+
+				.group_4 {
+					margin-left: 0.3rem;
+					margin-bottom: 0.02rem;
+
+					.image_4 {
+						flex-shrink: 0;
+						width: 0.14rem;
+						height: 0.21rem;
+					}
+
+					.text_11 {
+						margin-left: 0.06rem;
+						align-self: center;
+						color: rgb(160, 162, 172);
+						font-size: 0.15rem;
+						font-family: PingFang;
+						line-height: 0.14rem;
+					}
+				}
+
+				.text_9 {
+					color: rgb(80, 80, 81);
+					font-size: 0.24rem;
+					font-family: PingFang;
+					line-height: 0.24rem;
+				}
+
+				.text_10 {
+					margin-top: 0.03rem;
+					// color: rgb(160, 162, 172);
+					color: red;
+					font-size: 0.15rem;
+					font-family: PingFang;
+					line-height: 0.14rem;
+				}
+			}
+		}
+
+		.section_5 {
+			margin-top: 0.06rem;
+			padding: 30rpx 40rpx;
+			background-color: rgb(255, 255, 255);
+			box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+			// border:1px solid red;
+			width: 100%;
+			// width: 700rpx;
+
+			// overflow: hidden;
+			.group_5 {
+
+				margin-top: 0.3rem;
+				margin-bottom: 0.1rem;
+
+				.text-wrapper_1 {
+					padding: 16rpx 20rpx;
+					// background-color: rgb(255, 255, 255);
+					background: #F6F8F9;
+					border-radius: 200rpx;
+					height: 0.3rem;
+					margin-right: 20rpx;
+					// border: solid 0.005rem rgb(193, 196, 204);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-direction: row;
+
+					.image_3 {
+						margin-right: 8rpx;
+						width: 30rpx;
+						height: 30rpx;
+					}
+
+					.text_13 {
+						// color: #191919;
+						color: rgba(0, 0, 0, 0.90);
+						font-size: 28rpx;
+						font-family: PingFang;
+						line-height: 0.16rem;
+						white-space: nowrap;
+					}
+				}
+
+				.view_1 {
+					margin-left: 0.055rem;
+				}
+
+				.text-wrapper_2 {
+					background-color: #3cb4fb;
+					border-radius: 200rpx;
+					height: 0.3rem;
+					margin-right: 20rpx;
+					padding: 16rpx 20rpx;
+
+					.text_16 {
+						color: rgb(255, 255, 255);
+						font-size: 0.13rem;
+						font-family: PingFang;
+						line-height: 0.16rem;
+						white-space: nowrap;
+					}
+				}
+
+				.text-wrapper_3 {
+					margin-left: 0.055rem;
+					padding: 0.07rem 0 0.06rem;
+					flex: 1 1 0.79rem;
+					background-color: rgb(255, 255, 255);
+					border-radius: 0.05rem;
+					height: 0.3rem;
+					border: solid 0.005rem rgb(193, 196, 204);
+
+					.text_17 {
+						color: rgb(160, 162, 172);
+						font-size: 0.13rem;
+						font-family: PingFang;
+						line-height: 0.16rem;
+					}
+				}
+			}
+		}
+	}
+
+
+}
+
+.text-wrapper_4 {
+	margin: 0.31rem 0.24rem 0 0.23rem;
+	padding: 30rpx 0;
+	background-color: #3cb4fb;
+	border-radius: 50rpx;
+
+	.text_18 {
+		color: rgb(255, 255, 255);
+		font-size: 0.15rem;
+		font-family: PingFang;
+		line-height: 0.16rem;
+	}
+}
+</style>
diff --git a/pages/AlumniCircle/searchAlumnus/searchAlumnus.vue b/pages/AlumniCircle/searchAlumnus/searchAlumnus.vue
new file mode 100644
index 0000000..e998424
--- /dev/null
+++ b/pages/AlumniCircle/searchAlumnus/searchAlumnus.vue
@@ -0,0 +1,854 @@
+<template>
+	<view>
+		<u-navbar :is-back="true" title="" :custom-back="router">
+			<view class="slot-wrap flex-row search">
+				<u-search v-model='searchText' :input-style="searchStyle" search-icon="search" @custom="search" :search='search' :show-action="false" >
+				</u-search>
+				<u-button style="width: 120rpx;height: 60rpx;border-radius: 50rpx;margin-left: 20rpx;" type="primary" @click="toSearch">搜索</u-button>
+			</view>
+		</u-navbar>
+		<view class="flex-col group_1">
+			<view class="flex-col section_1" v-if="!shoolList.length && !helpList.length && historyWord.length">
+				<view class="section-title">
+					<text class="text_1 text_2">历史记录</text>
+					<image src="/static/common/img/delete.png" style="width: 50rpx;height: 50rpx;"
+						@click="deleteHistory"></image>
+				</view>
+				<view class="justify-left group_2" style="margin-top:0.2rem;">
+					<view class="flex-row" style='flex-wrap:wrap;' >
+						<text class="text_1 text_5" @click='search(item)' v-for="(item, index) in historyWord"
+							:key='index'>{{ item }}</text>
+					</view>
+				</view>
+			</view>
+			<information @clickImg="clickImg" @onStar="onStar" :list="shoolList" type="0" :bottom="bottomState2"
+				v-if="current == 0">
+			</information>
+			<information @onStar="onStar" @clickImg="clickImg" :list="helpList" type="1" :bottom="bottomState" v-else
+				@onSign="onSign">
+			</information>
+			<!-- <view class="flex-col section_2">
+				<text class="text_1 text_6">可能认识的人</text>
+				<view class="flex-col group_4">
+					<scroll-view scroll-x="true" class="flex-row equal-division">
+						<view class="flex-col items-center equal-division-item" @click="toDetil(item.userId)" v-for="(item, index) in mayKnowList"
+							:key="index">
+							<u-avatar :src="$u.http.config.imgUrl+item.imageUrl" class="image_2" ></u-avatar>
+							<text class="text_1 text_7">{{item.name.length > 3? item.name.slice(0, 3) + "...": item.name}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+import noData from '@/components/NoData.vue'
+import information from "../../../components/Information.vue";
+export default {
+	components: {
+		noData,
+		information
+	},
+	data() {
+		return {
+			searchText: '',//搜索内容
+			searchStyle: {
+				width: "100%",
+			},
+			historyWord: [],
+
+
+			searchList: [],
+			isonShow: true,
+			bottomState: false,
+			bottomState2: false,
+			helpList: [],
+			shoolList: [],
+			isLoad: false,
+			PageIndex: 1,
+			PageSize: 10,
+			PageIndex2: 1,
+			PageSize2: 10,
+			Keyword: '全部',
+			Title: "",
+			current: 0,
+		};
+	},
+	onLoad(e) {
+		this.getSearchInfo()
+		this.Keyword = e.class
+		this.current = e.type
+		console.log(this.Keyword, 'this.Keyword', this.current);
+	},
+	methods: {
+		// 获取校友帮帮列表
+		gethelpList() {
+			this.isLoad = true
+			const data = {
+				PageIndex: this.PageIndex,
+				PageSize: this.PageSize,
+				Keyword: this.Keyword,
+				// DateBegin:'',
+				// DateEnd:'',
+				// SkipCount:1,
+				// key:,
+			};
+			if (this.Keyword != '全部') {
+				data.Keyword = this.Keyword
+			}
+			if (this.Title) {
+				// this.helpList = []
+				data.Title = this.Title
+			}
+
+			this.$u.api.GetHelpList(data).then((res) => {
+				console.log(res, 'res--帮帮列表')
+				this.isLoad = false
+				this.total2 = res.total
+				if (this.helpList.length >= this.total2) {
+					this.bottomState = true;
+					return
+				}
+				if (this.total2 == res.items.length) {
+					this.bottomState = true;
+				}
+				this.helpList.push(...res.items)
+
+			});
+		},
+		// 获取学校资讯列表
+		getShoolList() {
+			const data = {
+				PageIndex: this.PageIndex2,
+				PageSize: this.PageSize2,
+				// Keyword:this.Keyword,
+				// DateBegin:'',
+				// DateEnd:'',
+				// SkipCount:1,
+				// key:,
+			};
+			if (this.Title) {
+				// this.shoolList = []
+				data.Title = this.Title
+			}
+			this.$u.api.GetSchoolList(data).then((res) => {
+				this.total1 = res.total
+				if (this.shoolList.length >= this.total1) {
+					this.bottomState2 = true;
+					return
+				}
+				if (this.total1 == res.items.length) {
+					this.bottomState2 = true;
+				}
+				this.shoolList.push(...res.items)
+			});
+		},
+		getList() {
+			if (this.current == 0) {
+				this.shoolList = []
+				this.PageIndex2 = 1
+				this.PageSize2 = 10
+				this.getShoolList();
+			} else {
+				this.helpList = []
+				this.PageIndex = 1
+				this.PageSize = 10
+				if (!this.isLoad) {
+					this.gethelpList();
+				}
+			}
+		},
+		//预览图片
+		clickImg(item) {
+			this.isonShow = false
+			item = this.$u.http.config.imgUrl + item
+			var images = [];
+			images.push(item);
+			uni.previewImage({ // 图片路径必须是一个数组 => ['']
+				current: 0,
+				urls: images,
+			});
+		},
+		//收藏
+		async onStar(val) {
+			console.log('收藏--');
+			// 判断当前学校是否认证，未认证不可收藏
+			const req = {
+				userId: this.vuex_user.id,
+			}
+			const res = await this.$u.apiList.MyPage(req)
+			console.log(JSON.parse(JSON.stringify(res)), 'res')
+			const edcationList = res.edcationList
+			if (!edcationList.length) {
+				return this.$refs.uToast.show({
+					title: '认证后可进行收藏操作',
+					type: 'none',
+				})
+			}
+			const findRow = edcationList.find(x => x.isSelected === true);
+			if ([0, 2].includes(findRow.certifyStatus)) {
+				return this.$refs.uToast.show({
+					title: '认证后可进行收藏操作',
+					type: 'none',
+				})
+			}
+			const data = {
+				id: val.id,
+				type: val.type
+			}
+			this.$u.apiList.LikeCollect(data)
+				.then((res) => {
+					if (val.isCllect) {
+						if (val.collectCount > 0) {
+							val.isCllect = false
+							val.collectCount--
+							this.$refs.uToast.show({
+								title: '取消收藏成功',
+								type: 'success',
+							})
+						}
+					} else {
+						val.isCllect = true
+						val.collectCount++
+						this.$refs.uToast.show({
+							title: '收藏成功',
+							type: 'success',
+						})
+					}
+				})
+				.catch((err) => {
+					this.$refs.uToast.show({
+						title: '收藏失败',
+						type: 'error',
+					})
+				})
+		},
+		// 删除历史记录
+		deleteHistory() {
+			if (!this.historyWord.length) {
+				this.$u.toast('暂无历史记录')
+				return;
+			}
+			uni.showModal({
+				// title: '提示',
+				content: '是否清空历史记录？',
+				success: (res) => {
+					this.historyWord = []
+					window.localStorage.setItem('searchHistory', JSON.stringify([]))
+				}
+			})
+		},
+		toSearch(){
+			this.search(this.searchText)
+		},
+
+		// 搜索
+		search(value) {
+			this.searchText = value
+			if (!value) {
+				this.$u.toast('请输入搜索词')
+				return;
+			}
+
+			this.Title = value
+			if (this.current == 0) {
+				this.shoolList = []
+				this.getShoolList()
+			} else {
+				this.helpList = []
+				this.gethelpList()
+			}
+			if (!this.historyWord.includes(value)) {
+				this.historyWord.push(value)
+				window.localStorage.setItem('searchHistory', JSON.stringify(this.historyWord))
+			}
+
+		},
+		router() {
+			uni.switchTab({
+				url: '../alumnus/alumnus'
+			})
+		},
+		// 获取搜索界面数据
+		getSearchInfo() {
+			this.historyWord = JSON.parse(window.localStorage.getItem('searchHistory')) || []
+		}
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .u-avatar__sex {
+	width: 0.1rem !important;
+	height: 0.1rem !important;
+	border: none;
+}
+
+::v-deep .u-slot-content {
+	display: block;
+}
+
+.search ::v-deep {
+	padding: 0 20rpx;
+	
+	// .u-content {
+	// 	border-bottom-left-radius: 0 !important;
+	// 	border-top-left-radius: 0 !important;
+	// 	padding:0,
+	// }
+
+	.u-input__input {
+		width: 0.25rem;
+		min-height: 0.32rem !important;
+		padding-left: 0.1rem;
+		font-size: 0.12rem;
+	}
+
+	.u-input {
+		background-color: rgb(242, 242, 242);
+		border-radius: 50px;
+		border-bottom-right-radius: 0 !important;
+		border-top-right-radius: 0 !important;
+		padding-left: 0.05rem
+	}
+}
+
+.group_1 {
+	padding: 0.14rem 0rem 0.2rem;
+	flex: 1 1 auto;
+	overflow-y: auto;
+
+	.section_1 {
+		padding: 0.2rem 0.17rem;
+		background-color: rgb(255, 255, 255);
+		border-radius: 0.1rem;
+
+		.section-title {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.text_2 {
+			color: rgb(56, 58, 63);
+			font-size: 0.16rem;
+			white-space: nowrap;
+			font-weight: 700;
+		}
+
+		.group_2 {
+			margin-top: 0.23rem;
+			padding: 0 0.015rem;
+			color: rgb(63, 63, 63);
+			font-size: 0.14rem;
+			line-height: 0.13rem;
+			white-space: nowrap;
+			position: relative;
+
+			.text_3 {
+				text-transform: uppercase;
+				position: absolute;
+				left: 0.015rem;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+
+			.text_5 {
+				border: 2rpx solid rgba(0, 0, 0, 0.1);
+				;
+				border-radius: 40rpx;
+				padding: 20rpx;
+				margin-right: 20rpx;
+				margin-bottom: 20rpx;
+			}
+		}
+	}
+
+	.section_2 {
+		margin-top: 0.18rem;
+		padding: 0.2rem 0.17rem;
+		background-color: rgb(255, 255, 255);
+		border-radius: 0.1rem;
+
+		.text_6 {
+			// margin-left: 0.17rem;
+			color: rgb(56, 58, 63);
+			font-size: 0.16rem;
+			line-height: 0.17rem;
+			white-space: nowrap;
+		}
+
+		.group_4 {
+			margin-top: 0.15rem;
+
+			// padding: 0.8rem 0 0.01rem;
+			// position: relative;
+			// .section_3 {
+			//   margin-left: 0.17rem;
+			//   margin-right: 0.2rem;
+			//   background-image: url("https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/621c59e162a7d90011002985/16460344151483836600.png");
+			//   background-size: 100% 100%;
+			//   background-repeat: no-repeat;
+			//   height: 0.2rem;
+			// }
+			.equal-division {
+				top: 0;
+				right: 0;
+				bottom: 0;
+				left: 0;
+				width: auto;
+
+				::v-deep .uni-scroll-view-content {
+					display: flex;
+					white-space: nowrap;
+				}
+
+				// position: absolute;
+				.equal-division-item {
+					padding: 0.065rem 0 0.05rem;
+					margin-right: 6%;
+
+					.text_7 {
+						margin-top: 0.095rem;
+						color: rgb(63, 63, 63);
+						font-size: 0.14rem;
+						line-height: 0.13rem;
+						white-space: nowrap;
+					}
+
+					.text_8 {
+						margin-top: 0.06rem;
+						color: rgb(46, 155, 255);
+						font-size: 0.1rem;
+						line-height: 0.1rem;
+						white-space: nowrap;
+						background: #eaf5ff;
+						border-radius: 0.2rem;
+						padding: 0.05rem 0.1rem;
+					}
+				}
+
+				.equal-division-item_1 {
+					padding: 0.065rem 0 0.055rem;
+					flex: 1 1 0.66rem;
+
+					.text_9 {
+						margin-top: 0.095rem;
+						color: rgb(63, 63, 63);
+						font-size: 0.14rem;
+						line-height: 0.13rem;
+						white-space: nowrap;
+					}
+
+					.text_10 {
+						margin-top: 0.15rem;
+						color: rgb(46, 155, 255);
+						font-size: 0.1rem;
+						line-height: 0.1rem;
+						white-space: nowrap;
+					}
+				}
+
+				.equal-division-item_2 {
+					padding: 0.065rem 0.035rem 0.06rem 0.14rem;
+					flex: 1 1 0.66rem;
+
+					.text_11 {
+						margin-top: 0.095rem;
+						align-self: center;
+						color: rgb(63, 63, 63);
+						font-size: 0.14rem;
+						line-height: 0.13rem;
+						white-space: nowrap;
+					}
+
+					.text_12 {
+						margin-top: 0.15rem;
+						align-self: center;
+						color: rgb(46, 155, 255);
+						font-size: 0.1rem;
+						line-height: 0.095rem;
+						white-space: nowrap;
+					}
+				}
+
+				.equal-division-item_3 {
+					padding: 0.05rem 0.065rem 0.06rem 0.14rem;
+					flex: 1 1 0.66rem;
+
+					.text_13 {
+						margin-top: 0.11rem;
+						align-self: flex-end;
+						color: rgb(63, 63, 63);
+						font-size: 0.14rem;
+						line-height: 0.13rem;
+						white-space: nowrap;
+					}
+
+					.text_14 {
+						margin-right: 0.07rem;
+						margin-top: 0.15rem;
+						align-self: flex-end;
+						color: rgb(46, 155, 255);
+						font-size: 0.1rem;
+						line-height: 0.095rem;
+						white-space: nowrap;
+					}
+				}
+
+				.equal-division-item_4 {
+					padding: 0.05rem 0 0.06rem;
+					flex: 1 1 0.66rem;
+
+					.text_15 {
+						margin-top: 0.12rem;
+						color: rgb(63, 63, 63);
+						font-size: 0.14rem;
+						line-height: 0.13rem;
+						white-space: nowrap;
+					}
+
+					.text_16 {
+						margin-top: 0.15rem;
+						color: rgb(46, 155, 255);
+						font-size: 0.1rem;
+						line-height: 0.095rem;
+						white-space: nowrap;
+					}
+				}
+
+				.image_2 {
+					border-radius: 50%;
+					width: 0.4rem;
+					height: 0.4rem;
+					box-shadow: 0 0 1px #6f6f6f;
+				}
+			}
+		}
+	}
+
+	.section_4 {
+		margin-top: 0.14rem;
+		padding: 0.14rem 0.21rem 0.25rem;
+		background-color: rgb(255, 255, 255);
+		border-radius: 0.1rem;
+
+		.text_17 {
+			color: rgb(56, 58, 63);
+			font-size: 0.18rem;
+			line-height: 0.15rem;
+			white-space: nowrap;
+		}
+
+		.group_5 {
+			margin-top: 0.22rem;
+			padding: 0 0.28rem;
+
+			.section_5 {
+				margin-top: 0.04rem;
+				padding: 0.1rem 0.015rem 0.14rem 0.16rem;
+				color: rgb(255, 255, 255);
+				font-size: 0.09rem;
+				line-height: 0.075rem;
+				white-space: nowrap;
+				background-image: url("https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/621c59e162a7d90011002985/16480042463399723422.png");
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
+				width: 1.16rem;
+				height: 1.16rem;
+
+				.group_7 {
+					margin-top: 0.29rem;
+
+					.text_22 {
+						margin-top: 0.07rem;
+						align-self: center;
+					}
+				}
+
+				.text_18 {
+					align-self: center;
+				}
+
+				.text_19 {
+					margin-top: 0.1rem;
+				}
+
+				.text_20 {
+					margin-top: 0.07rem;
+					align-self: flex-end;
+				}
+			}
+
+			.group_8 {
+				margin-bottom: 0.035rem;
+				width: 0.96rem;
+
+				.text_23 {
+					color: rgb(56, 58, 63);
+					font-size: 0.15rem;
+					line-height: 0.15rem;
+					white-space: nowrap;
+				}
+
+				.group_9 {
+					color: rgb(56, 58, 63);
+					font-size: 0.13rem;
+					line-height: 0.15rem;
+					white-space: nowrap;
+					padding: 0 0.025rem;
+
+					.section_6 {
+						margin: 0.025rem 0 0.02rem;
+						background-color: rgb(255, 190, 11);
+						width: 0.1rem;
+						height: 0.1rem;
+					}
+
+					.text_24 {
+						margin-left: 0.1rem;
+					}
+
+					.section_7 {
+						margin: 0.015rem 0 0.03rem;
+						background-color: rgb(251, 86, 7);
+						width: 0.1rem;
+						height: 0.1rem;
+					}
+
+					.text_25 {
+						margin-left: 0.095rem;
+					}
+
+					.section_8 {
+						margin: 0.025rem 0 0.02rem;
+						background-color: rgb(131, 56, 236);
+						width: 0.1rem;
+						height: 0.1rem;
+					}
+
+					.text_26 {
+						margin-left: 0.095rem;
+					}
+
+					.section_9 {
+						margin: 0.015rem 0 0.03rem;
+						background-color: rgb(58, 134, 255);
+						width: 0.1rem;
+						height: 0.1rem;
+					}
+
+					.text_27 {
+						margin-left: 0.1rem;
+					}
+
+					.section_10 {
+						margin: 0.015rem 0 0.03rem;
+						background-color: rgb(83, 207, 142);
+						width: 0.1rem;
+						height: 0.1rem;
+					}
+
+					.text_28 {
+						margin-left: 0.095rem;
+					}
+				}
+
+				.view {
+					margin-top: 0.1rem;
+				}
+
+				.view_1 {
+					margin-top: 0.045rem;
+				}
+
+				.view_2 {
+					margin-top: 0.03rem;
+				}
+
+				.view_3 {
+					margin-top: 0.045rem;
+				}
+
+				.view_4 {
+					margin-top: 0.035rem;
+				}
+			}
+		}
+	}
+
+	.text_1 {
+		text-transform: uppercase;
+	}
+}
+
+.userList {
+	background: #fff;
+
+	.list-item {
+		padding-left: 0.2rem;
+	}
+
+	.image_1 {
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+		border-radius: 50%;
+		box-shadow: 0 0 1px #6f6f6f;
+	}
+
+	.right-section {
+		margin-left: 0.15rem;
+		padding: 0.14rem 0 0.18rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		height: 0.66rem;
+	}
+
+	.top-group {
+		margin-right: 0.1rem;
+	}
+
+	.text_6 {
+		margin-top: 0.09rem;
+		color: rgb(180, 182, 189);
+		font-size: 0.12rem;
+		line-height: 0.12rem;
+		letter-spacing: 0.012rem;
+		white-space: nowrap;
+	}
+
+	.text_2 {
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.text_4 {
+		margin-bottom: 0.05rem;
+		color: rgb(193, 196, 204);
+		font-size: 0.12rem;
+		line-height: 0.095rem;
+		letter-spacing: 0.012rem;
+		white-space: nowrap;
+	}
+
+	.text_11 {
+		margin-bottom: 0.03rem;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.right-text-wrapper {
+		padding: 0.035rem 0.08rem;
+		color: rgb(115, 129, 255);
+		margin-left: 0.1rem;
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		background-color: rgba(115, 129, 255, 0.1);
+		border-radius: 0.09rem;
+		height: 0.18rem;
+	}
+
+	.text_13 {
+		margin-right: 0.03rem;
+	}
+
+	//   .group_2 {
+	//     padding-bottom: 0.15rem;
+	//     flex: 1 1 auto;
+	//     overflow-y: auto;
+	//   }
+
+	.group_4 {
+		padding: 0 0.01rem;
+		padding-left: 0.2rem;
+	}
+
+	.group_5 {
+		padding-left: 0.2rem;
+		margin-top: 0.015rem;
+	}
+
+	.group_4:active,
+	.group_5:active {
+		background: #efefef;
+	}
+
+	.group_8 {
+		padding-left: initial;
+	}
+
+	.view_2 {
+		margin-left: 0.11rem;
+		padding: 0.18rem 0.035rem 0.14rem;
+		height: 0.67rem;
+		margin-right: 0.03rem;
+	}
+
+	.view_4 {
+		margin-left: 0.16rem;
+		padding: 0.15rem 0 0.14rem;
+		height: 0.67rem;
+	}
+
+	.view_3 {
+		margin-right: initial;
+	}
+
+	.view_5 {
+		margin-right: initial;
+	}
+
+	.text_16 {
+		margin-top: 0.07rem;
+		color: rgb(193, 196, 204);
+		line-height: 0.095rem;
+		margin-right: 0.095rem;
+	}
+
+	.text_28 {
+		margin-top: initial;
+		position: absolute;
+		left: 0;
+		bottom: 0.17rem;
+	}
+
+	.text_8 {
+		line-height: 0.14rem;
+	}
+
+	.text_9 {
+		margin-right: 0.025rem;
+	}
+
+	.view_6 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+	}
+
+	.text_15 {
+		margin-bottom: initial;
+		color: rgb(180, 182, 189);
+		line-height: 0.12rem;
+		margin-top: 0.08rem;
+	}
+
+	.view_19 {
+		margin-left: 0.045rem;
+	}
+}
+</style>
diff --git a/pages/AlumniCircle/userDetail/userDetail copy.vue b/pages/AlumniCircle/userDetail/userDetail copy.vue
new file mode 100644
index 0000000..ba1dc84
--- /dev/null
+++ b/pages/AlumniCircle/userDetail/userDetail copy.vue	
@@ -0,0 +1,1179 @@
+<template>
+  <view>
+    <u-navbar back-text="" title="个人主页"></u-navbar>
+    <view class="flex-col section_2">
+      <view class="justify-between section_3">
+        <view class="flex-col text-wrapper_3">
+          <!-- <text class="text_1">{{userInfo.baseData.name || userInfo.baseData.userName }} -->
+          <!-- </text> -->
+          <text class="text_1">{{ attestation.name || "-" }} </text>
+          <view class="role-box">
+            <view
+              @click="baseShow = true"
+              v-if="otherUserType === 1"
+              class="role-item"
+              :class="baseShow ? 'active' : ''"
+            >
+              <image
+                src="/static/common/img/role2.png"
+                style="
+                  width: 30rpx;
+                  height: 30rpx;
+                  transform: translateY(5rpx) scale(1.4);
+                  margin-right: 15rpx;
+                "
+              />
+              <text>教师</text>
+            </view>
+            <view
+              @click="baseShow = true"
+              v-if="otherUserType === 0"
+              class="role-item"
+              :class="baseShow ? 'active' : ''"
+            >
+              <image
+                src="/static/common/img/role3.png"
+                style="
+                  width: 30rpx;
+                  height: 30rpx;
+                  transform: translateY(5rpx) scale(1.4);
+                  margin-right: 15rpx;
+                "
+              />
+              <text>学生</text>
+            </view>
+            <view
+              @click="baseShow = false"
+              v-if="qyShow"
+              class="role-item"
+              :class="!baseShow ? 'active' : ''"
+              style="margin-left: 20rpx"
+            >
+              <image
+                src="/static/common/img/role1.png"
+                style="
+                  width: 30rpx;
+                  height: 30rpx;
+                  transform: translateY(5rpx) scale(1.4);
+                  margin-right: 15rpx;
+                "
+              />
+              <text>企业</text>
+            </view>
+          </view>
+          <!-- 学校信息 -->
+          <template v-if="baseShow === true">
+            <!-- 学生显示 -->
+            <template v-if="otherUserType === 0">
+              <!-- 学校名称 -->
+              <text class="text_2">{{ findRow.schoolName || "-" }}</text>
+              <!-- 年级 -->
+              <text class="text_2" v-if="findRow.startYear">{{
+                findRow.startYear + "级"
+              }}</text>
+              <!-- 学院 -->
+              <text class="text_2" v-if="findRow.college">{{
+                findRow.college
+              }}</text>
+              <!-- 专业 -->
+              <view class="flex-row">
+                <text
+                  class="text_2"
+                  style="margin-right: 0.05rem"
+                  v-if="findRow.major"
+                  >{{ findRow.major }}</text
+                >
+              </view>
+            </template>
+            <!-- 教师显示 -->
+            <template v-if="otherUserType === 1">
+              <!-- 学校名称 -->
+              <text class="text_2">{{ findRow.school || "-" }}</text>
+              <!-- 年级 -->
+              <text class="text_2">{{ findRow.schoolJob }}</text>
+            </template>
+          </template>
+          <!-- 企业信息 -->
+          <template v-if="baseShow === false && qyRow">
+            <text class="text_2">{{ qyRow.businessName || "-" }}</text>
+            <text class="text_2">{{ qyRow.businessAddress || "-" }}</text>
+            <text class="text_2">{{ qyRow.job || "-" }}</text>
+          </template>
+        </view>
+        <view class="flex-col img-box">
+          <u-avatar
+            class="image_2"
+            size="144"
+            :src="$u.http.config.imgUrl + userInfo.baseData.head"
+          >
+          </u-avatar>
+          <view class="flex-row group_3" v-if="vuex_user.id != userId">
+            <view class="flex-col items-center text-wrapper"
+              ><text class="text_2" @click="GoChat">私信</text>
+            </view>
+            <view
+              class="flex-col items-center text-wrapper_1"
+              @click="onFollow"
+            >
+              <text class="text_3">{{ userInfo.carewState }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view v-if="!userInfo.isCertifyStatus" class="flex-row group_4">
+        <image
+          src="/static/common/img/16535374500735010318.png"
+          class="image_3"
+        />
+        <text class="text_4">该用户尚未进行认证，请注意信息的甄别</text>
+      </view>
+    </view>
+    <!-- 无数据 -->
+    <view class="flex-col items-center group_5" v-if="false">
+      <image
+        src="/static/common/img/16535374500948048054.png"
+        class="image_4"
+      />
+      <text class="text_5">暂无数据，请尽快认证补充资料~</text>
+    </view>
+    <!--有数据  -->
+    <div class="detil">
+      <view class="slot-wrap">
+        <u-tabs-swiper
+          ref="uTabs"
+          :list="navList"
+          :current="current"
+          :is-scroll="true"
+          gutter="60"
+          :active-item-style="{ color: '#3CB5FB', transition: 'all 0.5s' }"
+          :bar-style="{ background: '#3CB5FB' }"
+          @change="tabsChange"
+        ></u-tabs-swiper>
+      </view>
+      <swiper
+        :current="swiperCurrent"
+        @transition="transition"
+        @animationfinish="animationfinish"
+        style="height: calc(100vh - 2.8rem); width: 100%"
+      >
+        <swiper-item
+          class="swiper-item"
+          v-for="(item, index) in navList"
+          :key="index"
+          style="height: calc(100vh - 2.8rem); width: 100%"
+        >
+          <!-- 个人信息 -->
+          <template v-if="index === 0">
+            <scroll-view
+              scroll-y="true"
+              style="height: calc(100vh - 2.8rem); width: 100%"
+              @scrolltolower="onreachBottom"
+              :data-index="index"
+            >
+              <view class="flex-col section_7" v-if="userInfo">
+                <view class="flex-col items-start text-wrapper_2">
+                  <text class="text_10">基本信息</text>
+                </view>
+                <view class="justify-between group_7">
+                  <text class="text_11">手机号码</text>
+                  <text class="text_12">{{ userInfo.baseData.phone }}</text>
+                </view>
+                <view class="group_8 justify-between view">
+                  <text class="text_13 text_14">年龄</text>
+                  <text class="text_15 text_16">{{
+                    userInfo.baseData.age
+                  }}</text>
+                </view>
+                <view class="group_8 justify-between">
+                  <text class="text_13">现居地（区）</text>
+                  <text class="text_15 text_18">{{
+                    userInfo.baseData.address
+                  }}</text>
+                </view>
+                <view class="group_8 justify-between">
+                  <text class="text_13 text_19">工作领域</text>
+                  <text class="text_15 text_20">{{
+                    userInfo.baseData.workField
+                  }}</text>
+                </view>
+              </view>
+              <!-- 教育经历 -->
+              <view
+                class="flex-col section_8"
+                v-if="userInfo && otherUserType === 0"
+              >
+                <view class="flex-col items-start text-wrapper_3"
+                  ><text class="text_21">教育经历</text>
+                </view>
+                <!-- <view class="flex-row group_9" v-for="(item, index) in userInfo.edcationList" v-if='item.certifyStatus==1' :key="index">
+                  <text class="text_22">{{item.schoolName}}</text>
+                  <text class="text_23" :class="item.certifyStatus==0?'color2':item.certifyStatus==1?'color1':'color3'">{{certifyArr[item.certifyStatus]}}</text>
+                  <view class="flex-col group_10">
+                    <view class="flex-row section_9">
+                      <text class="text_24">{{item.startYear}}年入学</text>
+                      <text class="text_25">{{item.major}}</text>
+                      <text class="text_26">{{item.educationStr}}</text>
+                    </view>
+                    <image
+                      :src="$u.http.config.imgUrl+item.schoolLogo"
+                      class="image_4"
+                    />
+                  </view>
+                </view> -->
+                <view
+                  class="flex-col group_16"
+                  v-for="(item, index) in userInfo.edcationList"
+                  v-if="item.certifyStatus == 1 || true"
+                  :key="index"
+                >
+                  <view class="flex-row group_17">
+                    <view class="flex-row">
+                      <image
+                        :src="$u.http.config.imgUrl + item.schoolLogo.slice(1)"
+                        class="image_17"
+                      />
+                      <view class="flex-col group_18">
+                        <view class="flex-row">
+                          <text class="text_24">{{ item.schoolName }}</text>
+                          <text
+                            class="text_25"
+                            :class="
+                              item.certifyStatus == 0
+                                ? 'color2'
+                                : item.certifyStatus == 1
+                                ? 'color1'
+                                : 'color3'
+                            "
+                            >{{ certifyArr[item.certifyStatus] }}</text
+                          >
+                        </view>
+                        <view class="flex-row group_20">
+                          <text>{{ item.startYear }}年入学</text>
+                          <text class="text_27">{{ item.major }}</text>
+                          <text class="text_28">{{ item.educationStr }}</text>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="section_6" style="padding: 0"> </view>
+                </view>
+              </view>
+              <!-- 任职院校 -->
+              <view
+                class="flex-col section_8"
+                v-if="userInfo && otherUserType === 1"
+              >
+                <view class="flex-col items-start text-wrapper_3"
+                  ><text class="text_21">任职院校</text>
+                </view>
+                <view
+                  class="flex-col group_16"
+                  v-for="(item, index) in userInfo.edcationList"
+                  v-if="item.certifyStatus == 1 || true"
+                  :key="index"
+                >
+                  <view class="flex-row group_17">
+                    <view class="flex-row">
+                      <image
+                        :src="$u.http.config.imgUrl + item.logo.slice(1)"
+                        class="image_17"
+                      />
+                      <view class="flex-col group_18">
+                        <view class="flex-row">
+                          <text class="text_24">{{ item.school }}</text>
+                          <text
+                            class="text_25"
+                            :class="
+                              item.certifyStatus == 0
+                                ? 'color2'
+                                : item.certifyStatus == 1
+                                ? 'color1'
+                                : 'color3'
+                            "
+                            >{{ certifyArr[item.certifyStatus] }}</text
+                          >
+                        </view>
+                        <view class="flex-row group_20">
+                          <text>{{ item.schoolJob }}</text>
+                          <!-- <text>{{item.startYear}}年入学</text> -->
+                          <!-- <text class="text_27">{{item.major}}</text> -->
+                          <!-- <text class="text_28">{{item.educationStr}}</text> -->
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="section_6" style="padding: 0"> </view>
+                </view>
+              </view>
+              <view style="height: 100rpx"></view>
+            </scroll-view>
+          </template>
+          <!-- 发布 -->
+          <template v-else>
+            <scroll-view
+              scroll-y="true"
+              style="height: calc(100vh - 2.8rem); width: 100%"
+              @scrolltolower="onreachBottom"
+              :data-index="index"
+            >
+              <information
+                :list="userList"
+                @onStar="onStar"
+                type="1"
+                :schoolId="schoolId"
+                route="2"
+                :flag="type"
+              ></information>
+              <!--    <view class="flex-col section_6">
+                <view class="justify-between">
+                  <view class="flex-row">
+                    <image
+                      src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16535374496764278404.png"
+                      class="image_4 image_5"
+                    />
+                    <view class="flex-col items-start group_8">
+                      <text class="text_9">l李晓</text>
+                      <text class="text_10">浙江大学</text>
+                    </view>
+                  </view>
+                  <text class="text_11">8小时前</text>
+                </view>
+                <view class="flex-col group_9">
+                  <view class="flex-col group_10">
+                    <text class="text_12">求合租，地点浙江大学附近</text>
+                    <text class="text_13"
+                      >合租需求单身女性，爱护环境干净整洁优先，有爱心喜欢小动物优先....</text
+                    >
+                  </view>
+                  <text class="text_14"># 租房</text>
+                  <view class="flex-row equal-division">
+                    <view class="flex-row">
+                      <image
+                        src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16535374496943753946.png"
+                        class="image_6"
+                      />
+                      <text class="text_15">686</text>
+                    </view>
+                    <view class="flex-row equal-division-item_1">
+                      <image
+                        src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16535374494367430312.png"
+                        class="image_6"
+                      />
+                      <text class="text_16">996</text>
+                    </view>
+                    <view class="flex-row equal-division-item_2">
+                      <image
+                        src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16535374491819437386.png"
+                        class="image_6"
+                      />
+                      <text class="text_17">100</text>
+                    </view>
+                  </view>
+                </view>
+              </view> -->
+            </scroll-view>
+          </template>
+        </swiper-item>
+      </swiper>
+    </div>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import information from "../../../components/Information.vue";
+export default {
+  components: {
+    information: information,
+  },
+  data() {
+    return {
+      userId: "",
+      swiperCurrent: 0,
+      current: 0,
+      schoolId: "",
+      type: "",
+      userList: [],
+      navList: [
+        {
+          name: "个人信息",
+        },
+        {
+          name: "Ta的发布",
+        },
+      ],
+      certifyArr: {
+        0: "未认证",
+        1: "已认证",
+        2: "审核中",
+      },
+      userInfo: {},
+      word: "",
+      otherUserType: true,
+      attestation: {},
+      // 基础信息
+      findRow: {},
+      // 企业信息
+      qyRow: {},
+      // 企业与基础信息切换
+      baseShow: true,
+      // 企业按钮是否存在
+      qyShow: false,
+    };
+  },
+  onLoad(e) {
+    if (!e.id) {
+      uni.switchTab({
+        url: "../../main/index/index",
+      });
+      return;
+    }
+    this.type = e.type;
+    this.userId = e.id;
+    this.word = e.word;
+    this.getDetail();
+    this.getUserSchool();
+  },
+  onShow() {
+    if (this.current == 1) {
+      this.getUserHelp();
+    }
+  },
+  methods: {
+    lookQY() {
+      console.log(7777777);
+    },
+    getUserHelp() {
+      const data = {
+        userId: this.userId,
+        pageIndex: 1,
+        pageSize: 10,
+      };
+      this.$u.apiList.UserHelp(data).then((res) => {
+        this.userList = res.items;
+      });
+    },
+    getDetail() {
+      this.$u.api
+        .getUserInfo({
+          userId: this.userId,
+        })
+        .then((res) => {
+          this.userInfo = res;
+          this.attestation = Object.assign(this.attestation, res.attestation);
+          this.otherUserType = res.userType;
+          // console.log(this.userInfo, 1)
+          this.findRow = res.edcationList[0];
+          if (res.qyAttestation) {
+            this.qyShow = true;
+            this.qyRow = res.qyAttestation;
+          }
+        });
+    },
+    //   去聊天
+    GoChat() {
+      uni.navigateTo({
+        url:
+          "../../message/dialogBox/dialogBox?id=" + this.userId + "&chatType=0",
+      });
+    },
+    // tabs通知swiper切换
+    tabsChange(index) {
+      if (index == 1) {
+        this.getUserHelp();
+      }
+      this.swiperCurrent = index;
+    },
+    // swiper-item左右移动，通知tabs的滑块跟随移动
+    transition(e) {
+      let dx = e.detail.dx;
+      this.$refs.uTabs.setDx(dx);
+    },
+    // 由于swiper的内部机制问速切题，快换swiper不会触发dx的连续变化，需要在结束时重置状态
+    // swiper滑动结束，分别设置tabs和swiper的状态
+    animationfinish(e) {
+      let current = e.detail.current;
+      this.$refs.uTabs.setFinishCurrent(current);
+      this.swiperCurrent = current;
+      this.current = current;
+    },
+    onFollow() {
+      const data = {
+        userId: this.vuex_user.id,
+        carewId: this.userId,
+      };
+      this.$u.apiList.InsertOrDelFollow(data).then((res) => {
+        this.getDetail();
+      });
+    },
+    getUserSchool() {
+      this.$u.apiList.GetUserSchool().then((res) => {
+        // 学生时
+        if ([0,2].includes(this.vuex_user.userType)) {
+          this.schoolId = res.items.schoolId;
+        }
+        // 教师时
+        if (this.vuex_user.userType === 1) {
+          this.schoolId = res.jzgItems.schoolId;
+        }
+      });
+    },
+    async onStar(val) {
+      console.log("收藏--");
+      // 判断当前学校是否认证，未认证不可收藏
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const result = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(result)), "result");
+      const edcationList = result.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      const findRow = edcationList.find((x) => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      // return
+      const data = {
+        id: val.id,
+        type: val.type,
+      };
+      this.$u.apiList
+        .LikeCollect(data)
+        .then((res) => {
+          if (val.type == 0) {
+            if (val.isCllect) {
+              val.isCllect = false;
+              val.collectCount -= 1;
+              this.$refs.uToast.show({
+                title: "取消收藏成功",
+                type: "success",
+              });
+            } else {
+              val.isCllect = true;
+              val.collectCount += 1;
+              this.$refs.uToast.show({
+                title: "收藏成功",
+                type: "success",
+              });
+            }
+          } else if (val.type == 1) {
+            if (val.isCllect) {
+              val.isCllect = false;
+              val.collectCount -= 1;
+              this.$refs.uToast.show({
+                title: "取消收藏成功",
+                type: "success",
+              });
+            } else {
+              val.isCllect = true;
+              val.collectCount += 1;
+              this.$refs.uToast.show({
+                title: "收藏成功",
+                type: "success",
+              });
+            }
+          }
+        })
+        .catch((err) => {
+          this.$refs.uToast.show({
+            title: "收藏失败",
+            type: "error",
+          });
+        });
+    },
+    //返回上一级
+    router() {
+      if (this.type == 0) {
+        uni.switchTab({
+          url: "../../message/msgList/msgList",
+        });
+      } else if (this.type == 1) {
+        uni.navigateTo({
+          url:
+            "../../message/dialogBox/dialogBox?id=" +
+            this.userId +
+            "&chatType=0&type=0",
+        });
+      } else if (this.type == 2) {
+        this.$u.route({
+          url: "pages/AlumniCircle/Alumni/Alumni",
+        });
+      } else if (this.type == 3) {
+        let url = "pages/main/search/search";
+        if (this.word) {
+          url = "pages/main/search/search?word=" + this.word;
+        }
+        this.$u.route({
+          url: url,
+        });
+      } else if (this.type == 4) {
+        uni.navigateBack({
+          delta: 1,
+        });
+      } else {
+        uni.switchTab({
+          url: "pages/main/index/index",
+        });
+      }
+    },
+    // scroll-view到底部加载更多
+    onreachBottom() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.group_5 {
+  margin-top: 0.63rem;
+
+  .image_4 {
+    width: 1.95rem;
+    height: 1.73rem;
+  }
+
+  .text_5 {
+    margin-top: 0.18rem;
+    color: #a3b6ca;
+    font-size: 0.15rem;
+    font-family: PingFang;
+    line-height: 0.15rem;
+  }
+}
+
+.section_2 {
+  padding: 0.075rem 0.14rem 0 0.15rem;
+  background-color: #ffffff;
+
+  .section_3 {
+    // border:1px solid red;
+    min-height: 500rpx;
+    padding: 0.39rem 0.13rem 0.46rem 0.23rem;
+    background-image: url("https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16535374499958928799.png");
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    position: relative;
+    .img-box {
+      position: absolute;
+      right: 30rpx;
+    }
+
+    .text-wrapper_3 {
+      position: absolute;
+      // min-height: 200rpx;
+      margin-top: 0.07rem;
+
+      .role-box {
+        display: flex;
+        margin-top: 20rpx;
+        .role-item {
+          font-size: 25rpx;
+          color: #ffffff;
+          padding-left: 5rpx;
+          padding-right: 10rpx;
+          border-radius: 10rpx;
+        }
+        .active {
+          color: aqua;
+          border: 1px solid #00a8ea;
+          background-color: #00a8ea;
+        }
+      }
+      .text_1 {
+        color: #ffffff;
+        font-size: 0.18rem;
+        font-family: PingFang;
+        line-height: 0.17rem;
+      }
+
+      .text_2 {
+        margin-left: 0.015rem;
+        margin-top: 0.17rem;
+        color: #ffffff;
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.16rem;
+        max-width: 40vw;
+      }
+    }
+
+    .image_2 {
+      border-radius: 50%;
+      align-self: center;
+      width: 0.8rem;
+      height: 0.8rem;
+      margin: 0 0.3rem;
+    }
+
+    .group_3 {
+      margin-top: 0.14rem;
+
+      .text-wrapper {
+        padding: 0.03rem 0 0.03rem;
+        background-color: #ffffff;
+        border-radius: 0.11rem;
+        width: 0.6rem;
+        height: 0.22rem;
+        border: solid 0.005rem #f6f7fa;
+
+        .text_2 {
+          color: #2e9bff;
+          font-size: 0.13rem;
+          font-family: PingFang;
+          line-height: 0.16rem;
+        }
+      }
+
+      .text-wrapper_1 {
+        margin-left: 0.075rem;
+        padding: 0.03rem 0 0.03rem;
+        background-color: #ffffff;
+        border-radius: 0.11rem;
+        width: 0.6rem;
+        height: 0.22rem;
+        border: solid 0.005rem #f6f7fa;
+
+        .text_3 {
+          color: #2e9bff;
+          font-size: 0.13rem;
+          font-family: PingFang;
+          line-height: 0.16rem;
+        }
+      }
+    }
+  }
+
+  .group_4 {
+    padding: 0.09rem 0.02rem 0.085rem;
+
+    .image_3 {
+      margin-bottom: 0.02rem;
+      width: 0.13rem;
+      height: 0.11rem;
+    }
+
+    .text_4 {
+      margin-left: 0.025rem;
+      color: #2e9bff;
+      font-size: 0.13rem;
+      font-family: PingFang;
+      line-height: 0.13rem;
+    }
+  }
+}
+
+.detil {
+  .section_7 {
+    margin-top: 0.01rem;
+    padding: 0.05rem 0.12rem 0.2rem 0.17rem;
+    background-color: rgb(255, 255, 255);
+
+    .text-wrapper_2 {
+      margin-right: 0.03rem;
+      padding: 0.16rem 0 0.095rem;
+      color: rgb(55, 59, 72);
+      font-size: 0.15rem;
+      font-family: PingFang;
+      line-height: 0.14rem;
+      background-color: rgb(255, 255, 255);
+      box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+
+      .text_10 {
+        margin-left: 0.015rem;
+      }
+    }
+
+    .group_7 {
+      margin-top: 0.15rem;
+      padding-left: 0.015rem;
+
+      .text_11 {
+        color: rgb(55, 59, 72);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .text_12 {
+        margin: 0.015rem 0;
+        color: rgb(160, 162, 172);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.12rem;
+      }
+    }
+
+    .group_8 {
+      margin-top: 0.16rem;
+      padding: 0 0.015rem;
+
+      .text_13 {
+        color: rgb(55, 59, 72);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .text_14 {
+        margin-top: 0.015rem;
+      }
+
+      .text_15 {
+        color: rgb(160, 162, 172);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .text_16 {
+        margin-right: 0.03rem;
+        margin-bottom: 0.02rem;
+      }
+
+      .text_18 {
+        margin-right: 0.045rem;
+        margin-bottom: 0.01rem;
+      }
+
+      .text_19 {
+        margin-bottom: 0.01rem;
+      }
+
+      .text_20 {
+        margin-right: 0.045rem;
+        margin-top: 0.015rem;
+      }
+    }
+
+    .view {
+      margin-top: 0.14rem;
+    }
+  }
+
+  .section_8 {
+    margin-top: 0.2rem;
+    padding: 0.05rem 0.14rem 0.06rem 0.17rem;
+    background-color: rgb(255, 255, 255);
+    position: relative;
+
+    .text-wrapper_3 {
+      padding: 0.16rem 0 0.1rem;
+      color: rgb(55, 59, 72);
+      font-size: 0.15rem;
+      font-family: PingFang;
+      line-height: 0.14rem;
+      background-color: rgb(255, 255, 255);
+      box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+
+      .text_21 {
+        margin-left: 0.01rem;
+      }
+    }
+
+    .group_9 {
+      margin-top: 0.15rem;
+      padding: 0.035rem 0.56rem 0.46rem;
+      position: relative;
+
+      .text_22 {
+        color: rgb(55, 59, 72);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .text_23 {
+        margin-left: 0.12rem;
+        color: rgb(46, 155, 255);
+        font-size: 0.1rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .color1 {
+        color: rgb(21, 195, 73);
+      }
+
+      .color2 {
+        color: red;
+      }
+
+      .color3 {
+        color: #ff9900;
+      }
+
+      .group_10 {
+        padding-top: 0.23rem;
+        color: rgb(55, 59, 72);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        position: absolute;
+
+        .section_9 {
+          padding: 0.03rem 0 0.23rem;
+          background-color: rgb(255, 255, 255);
+          box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+          position: relative;
+
+          .text_24 {
+            margin-left: 0.56rem;
+          }
+
+          .text_25 {
+            margin-left: 0.06rem;
+          }
+
+          .text_26 {
+            margin-left: 0.035rem;
+          }
+        }
+
+        .image_4 {
+          width: 0.45rem;
+          height: 0.45rem;
+          position: absolute;
+          left: 0.01rem;
+          top: 0;
+        }
+      }
+    }
+
+    .group_11 {
+      margin-top: 0.13rem;
+      padding: 0 0.01rem;
+
+      .image_5 {
+        width: 0.45rem;
+        height: 0.45rem;
+      }
+
+      .group_12 {
+        margin-left: 0.095rem;
+        flex: 1 1 auto;
+        align-self: center;
+
+        .group_14 {
+          margin-top: 0.085rem;
+          padding: 0 0.005rem;
+          color: rgb(55, 59, 72);
+          font-size: 0.15rem;
+          font-family: PingFang;
+          line-height: 0.14rem;
+
+          .text_30 {
+            margin-left: 0.06rem;
+          }
+
+          .text_31 {
+            margin-left: 0.035rem;
+          }
+        }
+
+        .text_27 {
+          color: rgb(55, 59, 72);
+          font-size: 0.15rem;
+          font-family: PingFang;
+          line-height: 0.14rem;
+        }
+
+        .text_28 {
+          margin-left: 0.1rem;
+          color: rgb(46, 155, 255);
+          font-size: 0.15rem;
+          font-family: PingFang;
+          line-height: 0.14rem;
+        }
+      }
+    }
+  }
+
+  .section_6 {
+    margin-top: 0.01rem;
+    padding: 0.14rem 0.1rem 0.07rem 0.21rem;
+    background-color: rgb(255, 255, 255);
+
+    .group_9 {
+      margin-top: 0.12rem;
+      padding: 0 0.01rem;
+
+      .group_10 {
+        margin-right: 0.05rem;
+
+        .text_12 {
+          align-self: flex-start;
+          color: rgb(2, 2, 2);
+          font-size: 0.18rem;
+          font-family: Adobe Heiti Std;
+          line-height: 0.17rem;
+        }
+
+        .text_13 {
+          margin-top: 0.065rem;
+          color: rgb(73, 76, 87);
+          font-size: 0.15rem;
+          font-family: Adobe Heiti Std;
+          line-height: 0.24rem;
+        }
+      }
+
+      .text_14 {
+        margin-left: 0.015rem;
+        margin-top: 0.065rem;
+        align-self: flex-start;
+        color: rgb(44, 109, 255);
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .equal-division {
+        margin: 0.095rem 0.14rem 0 0.23rem;
+        color: rgb(183, 183, 183);
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.11rem;
+
+        .equal-division-item_1 {
+          margin-left: 0.69rem;
+
+          .text_16 {
+            margin: 0.063rem 0 0 0.085rem;
+          }
+        }
+
+        .equal-division-item_2 {
+          margin-left: 0.69rem;
+
+          .text_17 {
+            margin: 0.063rem 0 0 0.085rem;
+          }
+        }
+
+        .text_15 {
+          margin: 0.063rem 0 0 0.085rem;
+        }
+
+        .image_6 {
+          flex-shrink: 0;
+          width: 0.2rem;
+          height: 0.2rem;
+        }
+      }
+    }
+
+    .text_11 {
+      margin-top: 0.035rem;
+      color: rgb(184, 184, 184);
+      font-size: 0.12rem;
+      font-family: PingFang;
+      line-height: 0.12rem;
+    }
+
+    .image_4 {
+      width: 0.3rem;
+      height: 0.3rem;
+    }
+
+    .image_5 {
+      margin-bottom: 0.02rem;
+    }
+
+    .group_8 {
+      margin-left: 0.07rem;
+      margin-top: 0.02rem;
+
+      .text_9 {
+        color: rgb(2, 2, 2);
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.13rem;
+      }
+
+      .text_10 {
+        margin-top: 0.055rem;
+        color: rgb(184, 184, 184);
+        font-size: 0.12rem;
+        font-family: PingFang;
+        line-height: 0.12rem;
+      }
+    }
+  }
+}
+
+.group_16 {
+  .section_6 {
+    margin-left: 0.015rem;
+    margin-right: 0.04rem;
+    box-shadow: 0.0002rem 0.005rem rgba(0, 0, 0, 0.11);
+    border-radius: 0.15rem 0.15rem 0px 0px;
+    height: 1px;
+  }
+  .group_17 {
+    justify-content: space-between;
+    padding: 0.1rem;
+    position: relative;
+
+    .image_17 {
+      width: 0.45rem;
+      height: 0.45rem;
+      border-radius: 50%;
+    }
+
+    .group_18 {
+      margin: 0.035rem 0 0.04rem 0.095rem;
+      width: 65vw;
+      .group_20 {
+        margin-top: 0.09rem;
+        color: #8d8e90;
+        font-size: 0.12rem;
+        line-height: 0.14rem;
+        white-space: nowrap;
+        > text {
+          margin-left: 0.06rem;
+        }
+        > text:first-child {
+          margin-left: 0;
+        }
+      }
+      .text_24 {
+        color: #373b48;
+        font-size: 0.15rem;
+        line-height: 0.14rem;
+        white-space: nowrap;
+      }
+      .text_25 {
+        margin-left: 0.04rem;
+        font-size: 0.1rem;
+        line-height: 0.14rem;
+        white-space: nowrap;
+      }
+      .color1 {
+        color: rgb(21, 195, 73);
+      }
+
+      .color2 {
+        color: red;
+      }
+
+      .color3 {
+        color: #ff9900;
+      }
+    }
+    .group_18 > view:first-child {
+      justify-content: space-between;
+    }
+  }
+}
+</style>
diff --git a/pages/AlumniCircle/userDetail/userDetail.vue b/pages/AlumniCircle/userDetail/userDetail.vue
new file mode 100644
index 0000000..cb2d627
--- /dev/null
+++ b/pages/AlumniCircle/userDetail/userDetail.vue
@@ -0,0 +1,812 @@
+<template>
+  <view>
+    <u-navbar back-text="" title="个人主页"></u-navbar>
+    <!-- 用户信息详情 -->
+    <view class="user-detail">
+      <!-- 背景图 -->
+      <view class="user-bg">
+        <image :src="mybg"></image>
+      </view>
+      <!-- 详细信息 -->
+      <view class="user-detail-info">
+        <view class="user-detail-top">
+          <!-- 头像 私信 关注 -->
+          <view class="user-avatar-box">
+            <view class="user-detail-info-avatar">
+              <u-avatar class="image_2" size="144" :src="$u.http.config.imgUrl + userInfo.baseData.head">
+              </u-avatar>
+            </view>
+            <view class="user-operate">
+              <u-button shape="circle" v-if="userInfo.carewState&&vuex_user.id !== userId" :type="userInfo.carewState.includes('未关注') ? 'primary' : 'default'" @click="onFollow">{{
+                userInfo.carewState.includes('未关注')?'关注':userInfo.carewState }}</u-button>
+              <view class="user-message" @click="GoChat" v-if="vuex_user.id !== userId">
+                <image src="/static/common/img/homepage/message.png"></image>
+              </view>
+              <view v-else style="height: 96rpx;"></view>
+            </view>
+          </view>
+          <!-- 用户姓名 -->
+          <view class="user-name">
+            <text>{{ attestation.name||userInfo.baseData.name || "-" }}</text>
+            <image v-if="userInfo.isCertifyStatus" src="/static/common/img/homepage/frame.png"></image>
+          </view>
+          <!-- 用户学校信息 -->
+          <view class="user-school" v-if="baseShow === true && otherUserType === 0">
+            <text>{{ findRow.schoolName || "-" }}</text>
+            <!-- 学院 -->
+            <text v-if="findRow.college">{{
+              findRow.college
+            }}</text>
+            <text class="text_2" style="margin-right: 0.05rem" v-if="findRow.major">{{ findRow.major }}</text>
+            <!-- 年级 -->
+            <text class="text_2" v-if="findRow.startYear">{{
+              findRow.startYear + "级"
+            }}</text>
+          </view>
+          <!-- 用户地址 先不放开 -->
+          <view class="user-identity"> </view>
+          <!-- 获赞 粉丝 关注 -->
+          <!-- <view class="user-like">
+            <view class="likes" v-for="(item, index) in userlikes" :key="index">
+              <text class="like-num">{{ item.num }}</text>
+              <text class="like-name">{{ item.name }}</text>
+            </view>
+          </view> -->
+          <view class="user-tabs">
+            <view class="user-tabs-item" :class="{ 'tabs-active': swiperCurrent == index }"
+              v-for="(item, index) in userTabs" :key="index" @click="tabsChange(index)">
+              <image :src="swiperCurrent == index ? item.selectedImage : item.image"></image>
+              <text>{{ item.name }}</text>
+            </view>
+          </view>
+        </view>
+
+        <view class="content">
+          <view class="release-content" v-if="swiperCurrent == 0">
+            <information :list="userList" @onStar="onStar" type="1" :schoolId="schoolId" route="2" :flag="type" :borderRadius="true">
+            </information>
+          </view>
+          <view class="user-info" v-if="swiperCurrent == 1">
+
+            <view class="userinfo-box" v-if="userInfo">
+              <view class="userinfo-title">
+                <text>基本信息</text>
+              </view>
+              <view class="userinfo-detail">
+                <view class="justify-between detail-row">
+                  <text class="detail-title">手机号码</text>
+                  <text class="detail-content">{{ userInfo.baseData.phone }}</text>
+                </view>
+                <view class="justify-between detail-row">
+                  <text class="detail-title">年龄</text>
+                  <text class="detail-content">{{
+                    userInfo.baseData.age
+                  }}</text>
+                </view>
+                <view class="justify-between detail-row">
+                  <text class="detail-title">现居地（区）</text>
+                  <text class="detail-content">{{
+                    userInfo.baseData.address
+                  }}</text>
+                </view>
+                <view class="justify-between detail-row">
+                  <text class="detail-title">工作领域</text>
+                  <text class="detail-content">{{
+                    userInfo.baseData.workField
+                  }}</text>
+                </view>
+              </view>
+            </view>
+            <!-- 教育经历 -->
+            <view class="" v-if="userInfo && otherUserType === 0">
+              <view class="userinfo-title"><text class="">教育经历</text>
+              </view>
+              <view class="userinfo-detail">
+                <view class="detail-row school-row" v-for="(item, index) in userInfo.edcationList"
+                  v-if="item.certifyStatus == 1 || true" :key="index">
+                  <view class="detail-row-item">
+                    <image :src="$u.http.config.imgUrl + item.schoolLogo.slice(1)" />
+                    <view class="school-info">
+                      <view class="school-name">
+                        <view class="text_24">{{ item.schoolName }}</view>
+                        <view class="text_25 status-box" :class="item.certifyStatus == 0
+                          ? 'color2'
+                          : item.certifyStatus == 1
+                            ? 'color1'
+                            : 'color3'
+                          ">{{ certifyArr[item.certifyStatus] }}</view>
+                      </view>
+                      <view class="professional-info">
+                        <view>{{ item.startYear }}届</view>
+                        <view class="text_27">{{ item.major }}</view>
+                        <view class="text_28">{{ item.educationStr }}生</view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+
+
+            </view>
+            <!-- 任职院校 -->
+            <view class="" v-if="userInfo && otherUserType === 1">
+              <view class="userinfo-title"><text class="text_21">任职院校</text>
+              </view>
+              <view class="userinfo-detail">
+                <view class="detail-row school-row" v-for="(item, index) in userInfo.edcationList"
+                  v-if="item.certifyStatus == 1 || true" :key="index">
+
+                  <view class="detail-row-item">
+                    <image :src="$u.http.config.imgUrl + item.logo.slice(1)" class="image_17" />
+                    <view class="school-info">
+                      <view class="school-name">
+                        <text class="text_24">{{ item.school }}</text>
+                        <text class="text_25 status-box" :class="item.certifyStatus == 0
+                          ? 'color2'
+                          : item.certifyStatus == 1
+                            ? 'color1'
+                            : 'color3'
+                          ">{{ certifyArr[item.certifyStatus] }}</text>
+                      </view>
+                      <view class="flex-row group_20">
+                        <text>{{ item.schoolJob }}</text>
+                        <!-- <text>{{item.startYear}}年入学</text> -->
+                        <!-- <text class="text_27">{{item.major}}</text> -->
+                        <!-- <text class="text_28">{{item.educationStr}}</text> -->
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import information from "../../../components/Information.vue";
+import release from "@/static/common/img/homepage/released.png";
+import releaseSelected from "@/static/common/img/homepage/released-selected.png";
+import person from "@/static/common/img/homepage/person.png";
+import personSelected from "@/static/common/img/homepage/person-selected.png";
+import mybg1 from '@/static/common/img/my/mybg1.png'
+import mybg2 from '@/static/common/img/my/mybg2.png'
+import mybg3 from '@/static/common/img/my/mybg3.png'
+import mybg4 from '@/static/common/img/my/mybg4.png'
+import mybg5 from '@/static/common/img/my/mybg5.png'
+import mybg6 from '@/static/common/img/my/mybg6.png'
+import mybg7 from '@/static/common/img/my/mybg7.png'
+import mybg8 from '@/static/common/img/my/mybg8.png'
+import mybg9 from '@/static/common/img/my/mybg9.png'
+import mybg10 from '@/static/common/img/my/mybg10.png'
+import mybg11 from '@/static/common/img/my/mybg11.png'
+import mybg12 from '@/static/common/img/my/mybg12.png'
+import mybg13 from '@/static/common/img/my/mybg13.png'
+import mybg14 from '@/static/common/img/my/mybg14.png'
+import mybg15 from '@/static/common/img/my/mybg15.png'
+import mybg16 from '@/static/common/img/my/mybg16.png'
+import mybg17 from '@/static/common/img/my/mybg17.png'
+import mybg18 from '@/static/common/img/my/mybg18.png'
+import mybg19 from '@/static/common/img/my/mybg19.png'
+import mybg20 from '@/static/common/img/my/mybg20.png'
+export default {
+  components: {
+    information: information,
+  },
+  data() {
+    return {
+      userId: "",
+      swiperCurrent: 0,
+      current: 0,
+      schoolId: "",
+      type: "",
+      userList: [],
+      navList: [
+        {
+          name: "个人信息",
+        },
+        {
+          name: "Ta的发布",
+        },
+      ],
+      certifyArr: {
+        0: "未认证",
+        1: "已认证",
+        2: "审核中",
+      },
+      userInfo: {},
+      word: "",
+      otherUserType: true,
+      attestation: {},
+      // 基础信息
+      findRow: {},
+      // 企业信息
+      qyRow: {},
+      // 企业与基础信息切换
+      baseShow: true,
+      // 企业按钮是否存在
+      qyShow: false,
+      userlikes: [
+        {
+          num: 200,
+          name: "获赞",
+        },
+        {
+          num: 200,
+          name: "粉丝",
+        },
+        {
+          num: 200,
+          name: "关注",
+        },
+      ],
+      userTabs: [
+        {
+          image: release,
+          selectedImage: releaseSelected,
+          name: "发布",
+        },
+        {
+          image: person,
+          selectedImage: personSelected,
+          name: "个人信息",
+        },
+      ],
+      mybg1,
+      mybg2,
+      mybg3 ,
+      mybg4 ,
+      mybg5 ,
+      mybg6 ,
+      mybg7 ,
+      mybg8 ,
+      mybg9 ,
+      mybg10,
+      mybg11,
+      mybg12,
+      mybg13,
+      mybg14,
+      mybg15,
+      mybg16,
+      mybg17,
+      mybg18,
+      mybg19,
+      mybg20,
+      mybg: '',
+    };
+  },
+  computed: {
+    randomBg() {
+      const bgArray = [
+        this.mybg1, this.mybg2, this.mybg3, this.mybg4, this.mybg5,
+        this.mybg6, this.mybg7, this.mybg8, this.mybg9, this.mybg10,
+        this.mybg11, this.mybg12, this.mybg13, this.mybg14, this.mybg15,
+        this.mybg16, this.mybg17, this.mybg18, this.mybg19, this.mybg20
+      ];
+      const randomIndex = Math.floor(Math.random() * bgArray.length);
+      return bgArray[randomIndex];
+    }
+  },
+  created() {
+    this.mybg = this.randomBg;
+  },
+  onLoad(e) {
+    if (!e.id) {
+      uni.switchTab({
+        url: "../../main/index/index",
+      });
+      return;
+    }
+    this.type = e.type;
+    this.userId = e.id;
+    this.word = e.word;
+    // this.getDetail();
+    // this.getUserSchool();
+  },
+  onShow() {
+    
+    this.getDetail();
+    this.mybg = this.randomBg;
+    // 改为在getDetail中调接口
+    /* if (this.current == 0) {
+      setTimeout(() => {
+        
+        this.getUserHelp();
+      }, 500);
+    } */
+  },
+  methods: {
+    lookQY() {
+      console.log(7777777);
+    },
+    getUserHelp() {
+      console.log('this.findRow--------------',this.findRow);
+      
+      const data = {
+        userId: this.userId,
+        schoolId:this.findRow.schoolId,
+        pageIndex: 1,
+        pageSize: 10,
+      };
+      this.$u.apiList.Publishs(data).then((res) => {
+        this.userList = res.items;
+      });
+      // 改成只能看本校的
+      /* this.$u.apiList.UserHelp(data).then((res) => {
+        this.userList = res.items;
+      }); */
+    },
+    getDetail() {
+      this.$u.api
+        .getUserInfo({
+          userId: this.userId,
+        })
+        .then((res) => {
+          console.log('res-----',res);
+          
+          this.userInfo = res;
+          this.attestation = Object.assign(this.attestation, res.attestation);
+          this.otherUserType = res.userType;
+          // console.log(this.userInfo, 1)
+          this.findRow = res.edcationList[0];
+          if (res.qyAttestation) {
+            this.qyShow = true;
+            this.qyRow = res.qyAttestation;
+          }
+          // 获取个人信息、拿到学校id之后 再查发布（需要学校id）
+          this.getUserHelp();
+        });
+    },
+    //   去聊天
+    GoChat() {
+      uni.navigateTo({
+        url:
+          "../../message/dialogBox/dialogBox?id=" + this.userId + "&chatType=0",
+      });
+    },
+    // tabs通知swiper切换
+    tabsChange(index) {
+      if (index == 0) {
+        this.getUserHelp();
+      }
+      this.swiperCurrent = index;
+    },
+    // swiper-item左右移动，通知tabs的滑块跟随移动
+    transition(e) {
+      let dx = e.detail.dx;
+      this.$refs.uTabs.setDx(dx);
+    },
+    // 由于swiper的内部机制问速切题，快换swiper不会触发dx的连续变化，需要在结束时重置状态
+    // swiper滑动结束，分别设置tabs和swiper的状态
+    animationfinish(e) {
+      let current = e.detail.current;
+      this.$refs.uTabs.setFinishCurrent(current);
+      this.swiperCurrent = current;
+      this.current = current;
+    },
+    onFollow() {
+      const data = {
+        userId: this.vuex_user.id,
+        carewId: this.userId,
+      };
+      this.$u.apiList.InsertOrDelFollow(data).then((res) => {
+        this.getDetail();
+      });
+    },
+    getUserSchool() {
+      this.$u.apiList.GetUserSchool().then((res) => {
+        // 学生时
+        if ([0,2].includes(this.vuex_user.userType)) {
+          this.schoolId = res.items.schoolId;
+        }
+        // 教师时
+        if (this.vuex_user.userType === 1) {
+          this.schoolId = res.jzgItems.schoolId;
+        }
+      });
+    },
+    async onStar(val) {
+      console.log("收藏--");
+      // 判断当前学校是否认证，未认证不可收藏
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const result = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(result)), "result");
+      const edcationList = result.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      // const findRow = edcationList.find((x) => x.isSelected === true);
+      const findRow = edcationList[0];
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      // return
+      const data = {
+        id: val.id,
+        type: val.type,
+      };
+      this.$u.apiList
+        .LikeCollect(data)
+        .then((res) => {
+          if (val.type == 0) {
+            if (val.isCllect) {
+              val.isCllect = false;
+              val.collectCount -= 1;
+              this.$refs.uToast.show({
+                title: "取消收藏成功",
+                type: "success",
+              });
+            } else {
+              val.isCllect = true;
+              val.collectCount += 1;
+              this.$refs.uToast.show({
+                title: "收藏成功",
+                type: "success",
+              });
+            }
+          } else if (val.type == 1) {
+            if (val.isCllect) {
+              val.isCllect = false;
+              val.collectCount -= 1;
+              this.$refs.uToast.show({
+                title: "取消收藏成功",
+                type: "success",
+              });
+            } else {
+              val.isCllect = true;
+              val.collectCount += 1;
+              this.$refs.uToast.show({
+                title: "收藏成功",
+                type: "success",
+              });
+            }
+          }
+        })
+        .catch((err) => {
+          this.$refs.uToast.show({
+            title: "收藏失败",
+            type: "error",
+          });
+        });
+    },
+    //返回上一级
+    router() {
+      if (this.type == 0) {
+        uni.switchTab({
+          url: "../../message/msgList/msgList",
+        });
+      } else if (this.type == 1) {
+        uni.navigateTo({
+          url:
+            "../../message/dialogBox/dialogBox?id=" +
+            this.userId +
+            "&chatType=0&type=0",
+        });
+      } else if (this.type == 2) {
+        this.$u.route({
+          url: "pages/AlumniCircle/Alumni/Alumni",
+        });
+      } else if (this.type == 3) {
+        let url = "pages/main/search/search";
+        if (this.word) {
+          url = "pages/main/search/search?word=" + this.word;
+        }
+        this.$u.route({
+          url: url,
+        });
+      } else if (this.type == 4) {
+        uni.navigateBack({
+          delta: 1,
+        });
+      } else {
+        uni.switchTab({
+          url: "pages/main/index/index",
+        });
+      }
+    },
+    // scroll-view到底部加载更多
+    onreachBottom() { },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.user-detail {
+  position: relative;
+  background: #f6f8fa;
+  width: 100%;
+  min-height: 100vh;
+}
+
+.user-bg {
+  position: absolute;
+  width: 100%;
+  height: 320rpx;
+  overflow: hidden;
+
+  image {
+    width: 100%;
+    object-fit: cover;
+  }
+}
+
+.user-detail-info {
+  width: 100%;
+  position: absolute;
+  top: 320rpx;
+
+  .user-detail-top {
+    padding: 0 48rpx;
+    background: #fff;
+  }
+
+  .user-avatar-box {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+
+    .user-operate {
+      display: flex;
+      flex-direction: row-reverse;
+      align-items: center;
+      width: 300rpx;
+      justify-content: space-between;
+      padding-top: 20rpx;
+
+      .user-message {
+        width: 96rpx;
+        height: 96rpx;
+        border-radius: 50%;
+        background: #f6f8f9;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+
+        image {
+          width: 48rpx;
+          height: 48rpx;
+        }
+      }
+    }
+  }
+
+  .user-detail-info-avatar {
+    width: 154rpx;
+    height: 154rpx;
+    border-radius: 50%;
+    background-color: #fefcff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    top: -50rpx;
+    left: 48rpx;
+  }
+}
+
+.user-name {
+  margin-top: 15rpx;
+  margin-bottom: 16rpx;
+  font-size: 32rpx;
+  font-weight: 800;
+  color: #1f2232;
+  display: flex;
+  align-items: center;
+
+  image {
+    width: 40rpx;
+    height: 40rpx;
+    margin-left: 10rpx;
+  }
+}
+
+.user-school {
+  text {
+    display: inline-block;
+    background: #f6f8f9;
+    height: 60rpx;
+    line-height: 60rpx;
+    padding: 0 10rpx;
+    margin-right: 16rpx;
+    font-size: 24rpx;
+    margin-bottom: 16rpx;
+  }
+}
+
+.user-like {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+
+  padding: 30rpx 30rpx;
+
+  .likes {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .like-num {
+      font-weight: 800;
+      font-size: 36rpx;
+      color: #1f2232;
+    }
+
+    .like-name {
+      font-weight: 500;
+      font-size: 24rpx;
+      color: #616977;
+    }
+  }
+}
+
+.user-tabs {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+
+  .user-tabs-item {
+    width: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-bottom: 4rpx solid #fff;
+    padding-bottom: 20rpx;
+    color: #8697ac;
+    font-weight: bold;
+
+    image {
+      width: 48rpx;
+      height: 48rpx;
+      margin-right: 20rpx;
+    }
+  }
+
+  .tabs-active {
+    border-bottom: 4rpx solid #48adde;
+
+    text {
+      color: #3cb5fb;
+    }
+  }
+}
+
+.user-info {
+  padding: 32rpx;
+}
+
+.userinfo-title {
+  font-weight: bold;
+  font-size: 32rpx;
+  color: rgba(0, 0, 0, 0.9);
+  height: 60rpx;
+}
+
+.userinfo-box {
+  margin-bottom: 32rpx;
+}
+
+.userinfo-detail {
+  padding:10rpx 32rpx;
+  background: #fff;
+  border-radius: 32rpx;
+  border: 3rpx solid;
+  border-image: linear-gradient(180deg, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0), rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1)) 3 3;
+
+  .detail-row {
+    height: 106rpx;
+    line-height: 106rpx;
+    border-bottom: 2rpx solid #F6F8F9;
+
+
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .detail-title {
+      font-size: 28rpx;
+      color: rgba(0, 0, 0, 0.9);
+    }
+
+    .detail-content {
+      font-size: 28rpx;
+      color: rgba(0, 0, 0, 0.6);
+    }
+
+    image {
+      width: 102rpx;
+      height: 102rpx;
+    }
+
+    .detail-row-item {
+      height: 106rpx;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      image {
+        margin-right: 30rpx;
+      }
+    }
+
+    .school-info {
+      display: flex;
+      flex-direction: column;
+      height: 102rpx;
+
+      .school-name {
+        // height: 50%;
+        height: 51rpx;
+        line-height: 51rpx;
+        font-weight: bold;
+        font-size: 28rpx;
+        color: rgba(0, 0, 0, 0.9);
+
+        view {
+          display: inline-block;
+        }
+      }
+
+      .professional-info {
+        height: 51rpx;
+        line-height: 51rpx;
+
+        view {
+          display: inline-block;
+          margin-right: 20rpx;
+          font-size: 24rpx;
+          color: #8697AC;
+        }
+      }
+    }
+  }
+
+  .school-row {
+    // line-height: 126rpx;
+    height: 126rpx;
+    display: flex;
+    align-items: center;
+  }
+  .status-box{
+    width: 100rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    text-align: center;
+    border-radius: 12rpx;
+    font-size: 24rpx;
+    margin-left: 20rpx;
+    font-weight: normal;
+    display: inline-block;
+
+    &.color1 {
+      background-color: #3cb4fb;
+      color: #fff;
+    }
+
+    &.color2 {
+      background-color: #ffeceb;
+      color: #ff453a;
+    }
+
+    &.color3 {
+      background-color: #FFB800;
+      color: #fff;
+    }
+  }
+
+}
+</style>
diff --git a/pages/home/data/index copy.js b/pages/home/data/index copy.js
new file mode 100644
index 0000000..171fac2
--- /dev/null
+++ b/pages/home/data/index copy.js	
@@ -0,0 +1,367 @@
+const SCHOOL_CONFIG = {
+  南昌理工: {
+    ai: {
+      name: "南小翼",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://sl.vrgon.com:2222/",
+      type: "http",
+      index: 0,
+    },
+    welcome: {
+      name: "迎新",
+      icon: "/static/common/img/homepage/icon_迎新.png",
+      icon2: "/static/common/img/homepage/icon_迎新_gray.png",
+      url: "https://yxxt.nut.edu.cn:8090/#/",
+      type: "http",
+      index: 4,
+    },
+    repair: {
+      name: "报修",
+      icon: "/static/common/img/homepage/icon_报修.png",
+      icon2: "/static/common/img/homepage/icon_报修_gray.png",
+      url: "https://bx.nut.edu.cn/#/",
+      type: "http",
+      index: 7,
+    },
+    score: {
+      name: "成绩查询",
+      icon: "/static/common/img/homepage/icon_就业帮助.png",
+      icon2: "/static/common/img/homepage/icon_就业帮助_gray.png",
+      url: "https://iwglxt.nut.edu.cn/",
+      type: "http",
+      index: 5,
+    },
+    oldStudent: {
+      name: "老生缴费",
+      icon: "/static/common/img/homepage/icon_缴费.png",
+      icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+      url: "https://pay.nut.edu.cn/",
+      type: "http",
+      index: 1,
+    },
+    electricityBill: {
+      name: "网上购电",
+      icon: "/static/common/img/homepage/icon_网上购电.png",
+      icon2: "/static/common/img/homepage/icon_网上购电_gray.png",
+      url: "https://if.nut.edu.cn/",
+      type: "http",
+      index: 6,
+    },
+  },
+  新能源: {
+    ai: {
+      name: "源小新",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://ai.tynxy.com:8001/",
+      type: "http",
+      index: 0,
+    },
+    welcome: {
+      name: "迎新",
+      icon: "/static/common/img/homepage/icon_迎新.png",
+      icon2: "/static/common/img/homepage/icon_迎新_gray.png",
+      url: "https://yx.tynxy.com:8090/#/login",
+      type: "http",
+      index: 4,
+    },
+    library: {
+      name: "图书馆",
+      icon: "/static/common/img/homepage/icon_图书借阅.png",
+      icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+      url: "https://a.xiumi.us/stage/v5/33A6c/151995615#/",
+      type: "http",
+      index: 10,
+    },
+    score: {
+      name: "成绩查询",
+      icon: "/static/common/img/homepage/icon_就业帮助.png",
+      icon2: "/static/common/img/homepage/icon_就业帮助_gray.png",
+      url: "http://cas.tynxy.com:7171/cas/login/",
+      type: "http",
+      index: 5,
+    },
+    electricityBill: {
+      name: "网上购电",
+      icon: "/static/common/img/homepage/icon_网上购电.png",
+      icon2: "/static/common/img/homepage/icon_网上购电_gray.png",
+      url: "http://vpn.tynxy.com:10081/",
+      type: "http",
+      index: 6,
+    },
+  },
+  亚视: {
+    repair: {
+      name: "报修",
+      icon: "/static/common/img/homepage/icon_报修.png",
+      icon2: "/static/common/img/homepage/icon_报修_gray.png",
+      url: "http://gdysyx.gdatv.edu.cn:8099/#/",
+      type: "http",
+      index: 7,
+    },
+  },
+};
+
+/**
+ * 获取特定学校的所有功能配置
+ * @param {string} schoolName - 学校名称
+ * @returns {Object} - 该学校的所有功能配置
+ */
+export const getSchoolConfig = (schoolName = "") => {
+  // 查找匹配的学校配置
+  const matchedSchool = Object.keys(SCHOOL_CONFIG).find((key) =>
+    schoolName.includes(key)
+  );
+  return matchedSchool ? SCHOOL_CONFIG[matchedSchool] : {};
+};
+
+// 保留之前的单项获取函数，以便向后兼容(首页使用)
+export const getAIAssistantConfig = (schoolName = "") => {
+  const config = getSchoolConfig(schoolName);
+  return (
+    config.ai || {
+      name: "ai智能",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "",
+    }
+  );
+};
+export const getOldStudentConfig = (schoolName = "") => {
+  const config = getSchoolConfig(schoolName);
+  return (
+    config.oldStudent || {
+      name: "缴费",
+      icon: "/static/common/img/homepage/icon_缴费.png",
+      icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+      url: "",
+      type: "page",
+    }
+  );
+};
+/**
+ * 首页功能列表数据
+ */
+export const functionListing = [
+  {
+    name: "ai智能",
+    icon: "/static/common/img/homepage/icon_南小翼.png",
+    icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+    url: "",
+  },
+  {
+    name: "缴费",
+    icon: "/static/common/img/homepage/icon_缴费.png",
+    icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "返校预约",
+    icon: "/static/common/img/homepage/icon_返校预约.png",
+    icon2: "/static/common/img/homepage/icon_返校预约_gray.png",
+    url: "/pages/my/BackSchool/BackSchool",
+    type: "page",
+  },
+  {
+    name: "心愿单",
+    icon: "/static/common/img/homepage/icon_心愿单.png",
+    icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+    url: "/pages/my/wishlist/wishlist",
+    type: "page",
+  },
+  // {
+  //   name: "查询档案",
+  //   icon: "/static/common/img/homepage/icon_查询档案.png",
+  //   url: "",
+  //   type: "page",
+  // },
+  {
+    name: "全部服务",
+    icon: "/static/common/img/homepage/icon_全部服务.png",
+    icon2: "/static/common/img/homepage/icon_全部服务.png",
+  },
+];
+
+// 教师首页配置  vuex_user.userType==1
+export const TEACHER_CONFIG = [
+  {
+    name: "南小翼",
+    icon: "/static/common/img/homepage/icon_南小翼.png",
+    icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+    url: "http://sl.vrgon.com:2222/",
+    type: "http",
+    index: 0,
+  },
+  {
+    name: "心愿单",
+    icon: "/static/common/img/homepage/icon_心愿单.png",
+    icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+    url: "/pages/my/wishlist/wishlist",
+    type: "page",
+  },
+  {
+    name: "报修",
+    icon: "/static/common/img/homepage/icon_报修.png",
+    icon2: "/static/common/img/homepage/icon_报修_gray.png",
+    url: "https://bx.nut.edu.cn/#/",
+    type: "http",
+    index: 7,
+  },
+  {
+    name: "DL",
+    icon: "/static/common/img/homepage/icon_DL.png",
+    icon2: "/static/common/img/homepage/icon_DL_gray.png",
+    url: "",
+    type: "page",
+  },
+];
+
+/**
+ * 全部服务
+ */
+export const functionListing2 = [
+  {
+    name: "ai智能",
+    icon: "/static/common/img/homepage/icon_南小翼.png",
+    icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+    url: "",
+  },
+  {
+    name: "缴费",
+    icon: "/static/common/img/homepage/icon_缴费.png",
+    icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "返校预约",
+    icon: "/static/common/img/homepage/icon_返校预约.png",
+    icon2: "/static/common/img/homepage/icon_返校预约_gray.png",
+    url: "/pages/my/BackSchool/BackSchool",
+    type: "page",
+  },
+  {
+    name: "心愿单",
+    icon: "/static/common/img/homepage/icon_心愿单.png",
+    icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+    url: "/pages/my/wishlist/wishlist",
+    type: "page",
+  },
+  {
+    name: "迎新",
+    icon: "/static/common/img/homepage/icon_迎新.png",
+    icon2: "/static/common/img/homepage/icon_迎新_gray.png",
+    url: "",
+    type: "http",
+  },
+  {
+    name: "就业帮助",
+    icon: "/static/common/img/homepage/icon_就业帮助.png",
+    icon2: "/static/common/img/homepage/icon_就业帮助_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "活动报名",
+    icon: "/static/common/img/homepage/icon_活动报名.png",
+    icon2: "/static/common/img/homepage/icon_活动报名_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "报修",
+    icon: "/static/common/img/homepage/icon_报修.png",
+    icon2: "/static/common/img/homepage/icon_报修_gray.png",
+    url: "",
+    type: "http",
+  },
+  {
+    name: "勤工俭学",
+    icon: "/static/common/img/homepage/icon_勤工俭学.png",
+    icon2: "/static/common/img/homepage/icon_勤工俭学_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "办事指南",
+    icon: "/static/common/img/homepage/icon_办事指南.png",
+    icon2: "/static/common/img/homepage/icon_办事指南_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "图书借阅",
+    icon: "/static/common/img/homepage/icon_图书借阅.png",
+    icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "查询档案",
+    icon: "/static/common/img/homepage/icon_查询档案.png",
+    icon2: "/static/common/img/homepage/icon_查询档案_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "选课",
+    icon: "/static/common/img/homepage/icon_选课.png",
+    icon2: "/static/common/img/homepage/icon_选课_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "DL",
+    icon: "/static/common/img/homepage/icon_DL.png",
+    icon2: "/static/common/img/homepage/icon_DL_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "校园跑",
+    icon: "/static/common/img/homepage/icon_校园跑.png",
+    icon2: "/static/common/img/homepage/icon_校园跑_gray.png",
+    url: "",
+    type: "page",
+  },
+];
+
+export const functionListing3 = [
+  {
+    name: "校友名片",
+    icon: "/static/common/img/homepage/icon_校友名片.png",
+    icon2: "/static/common/img/homepage/icon_校友名片_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "校友活动",
+    icon: "/static/common/img/homepage/icon_校友活动.png",
+    icon2: "/static/common/img/homepage/icon_校友活动_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "电子校友卡",
+    icon: "/static/common/img/homepage/icon_电子校友卡.png",
+    icon2: "/static/common/img/homepage/icon_电子校友卡_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "校友会组织",
+    icon: "/static/common/img/homepage/icon_校友会组织.png",
+    icon2: "/static/common/img/homepage/icon_校友会组织_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "助力母校",
+    icon: "/static/common/img/homepage/icon_助力母校.png",
+    icon2: "/static/common/img/homepage/icon_助力母校_gray.png",
+    url: "",
+    type: "page",
+  },
+];
diff --git a/pages/home/data/index.js b/pages/home/data/index.js
new file mode 100644
index 0000000..bf38296
--- /dev/null
+++ b/pages/home/data/index.js
@@ -0,0 +1,596 @@
+const SCHOOL_CONFIG = {
+  南昌理工: {
+    ai: {
+      name: "南小翼",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://sl.vrgon.com:2222/",
+      type: "http",
+      index: 0,
+    },
+    // welcome: {
+    //   name: "迎新",
+    //   icon: "/static/common/img/homepage/icon_迎新.png",
+    //   icon2: "/static/common/img/homepage/icon_迎新_gray.png",
+    //   url: "https://yxxt.nut.edu.cn:8090/#/",
+    //   type: "http",
+    //   index: 4,
+    // },
+    repair: {
+      name: "报修",
+      icon: "/static/common/img/homepage/icon_报修.png",
+      icon2: "/static/common/img/homepage/icon_报修_gray.png",
+      url: "https://bx.nut.edu.cn/#/",
+      type: "http",
+      index: 6,
+    },
+    score: {
+      name: "成绩查询",
+      icon: "/static/common/img/homepage/icon_就业帮助.png",
+      icon2: "/static/common/img/homepage/icon_就业帮助_gray.png",
+      url: "https://iwglxt.nut.edu.cn/",
+      type: "http",
+      index: 4,
+    },
+    oldStudent: {
+      name: "老生缴费",
+      icon: "/static/common/img/homepage/icon_缴费.png",
+      icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+      url: "https://pay.nut.edu.cn/",
+      type: "http",
+      index: 1,
+    },
+    electricityBill: {
+      name: "网上购电",
+      icon: "/static/common/img/homepage/icon_网上购电.png",
+      icon2: "/static/common/img/homepage/icon_网上购电_gray.png",
+      url: "https://if.nut.edu.cn/",
+      type: "http",
+      index: 5,
+    },
+  },
+  新能源: {
+    ai: {
+      name: "源小新",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://ai.tynxy.com:8001/",
+      type: "http",
+      index: 0,
+    },
+    // welcome: {
+    //   name: "迎新",
+    //   icon: "/static/common/img/homepage/icon_迎新.png",
+    //   icon2: "/static/common/img/homepage/icon_迎新_gray.png",
+    //   url: "https://yx.tynxy.com:8090/#/login",
+    //   type: "http",
+    //   index: 4,
+    // },
+    library: {
+      name: "图书馆",
+      icon: "/static/common/img/homepage/icon_图书借阅.png",
+      icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+      url: "https://a.xiumi.us/stage/v5/33A6c/151995615#/",
+      type: "http",
+      index: 9,
+    },
+    score: {
+      name: "成绩查询",
+      icon: "/static/common/img/homepage/icon_就业帮助.png",
+      icon2: "/static/common/img/homepage/icon_就业帮助_gray.png",
+      url: "http://cas.tynxy.com:7171/cas/login/",
+      type: "http",
+      index: 4,
+    },
+    electricityBill: {
+      name: "网上购电",
+      icon: "/static/common/img/homepage/icon_网上购电.png",
+      icon2: "/static/common/img/homepage/icon_网上购电_gray.png",
+      url: "http://vpn.tynxy.com:10081/",
+      type: "http",
+      index: 5,
+    },
+  },
+  亚视: {
+    ai: {
+      name: "广小演",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://gxy.gdatv.edu.cn:8103/",
+      type: "http",
+      index: 0,
+    },
+    electricityBill: {
+      name: "网上购电",
+      icon: "/static/common/img/homepage/icon_网上购电.png",
+      icon2: "/static/common/img/homepage/icon_网上购电_gray.png",
+      url: "https://payment.gdatv.edu.cn/df?code=021aLZZv3Knm753sCR0w3k1W7w3aLZZu&state=1",
+      type: "http",
+      index: 5,
+    },
+    repair: {
+      name: "报修",
+      icon: "/static/common/img/homepage/icon_报修.png",
+      icon2: "/static/common/img/homepage/icon_报修_gray.png",
+      url: "http://gdysyx.gdatv.edu.cn:8099/#/",
+      type: "http",
+      index: 6,
+    },
+    library: {
+      name: "图书馆",
+      icon: "/static/common/img/homepage/icon_图书借阅.png",
+      icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+      url: "https://v1.chaoxing.com/wechatSet/mobileIndex?fidEnc=edb7ce62838ef070&pageId=2572",
+      type: "http",
+      index: 9,
+    },
+  },
+};
+
+/**
+ * 获取特定学校的所有功能配置
+ * @param {string} schoolName - 学校名称
+ * @returns {Object} - 该学校的所有功能配置
+ */
+export const getSchoolConfig = (schoolName = "") => {
+  // 查找匹配的学校配置
+  const matchedSchool = Object.keys(SCHOOL_CONFIG).find((key) =>
+    schoolName.includes(key)
+  );
+  return matchedSchool ? SCHOOL_CONFIG[matchedSchool] : {};
+};
+
+// 保留之前的单项获取函数，以便向后兼容(首页使用)
+export const getAIAssistantConfig = (schoolName = "") => {
+  const config = getSchoolConfig(schoolName);
+  return (
+    config.ai || {
+      name: "ai智能",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "",
+    }
+  );
+};
+export const getOldStudentConfig = (schoolName = "") => {
+  const config = getSchoolConfig(schoolName);
+  return (
+    config.oldStudent || {
+      name: "缴费",
+      icon: "/static/common/img/homepage/icon_缴费.png",
+      icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+      url: "",
+      type: "page",
+    }
+  );
+};
+/**
+ * 首页功能列表数据
+ */
+export const functionListing = [
+  {
+    name: "ai智能",
+    icon: "/static/common/img/homepage/icon_南小翼.png",
+    icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+    url: "",
+  },
+  {
+    name: "缴费",
+    icon: "/static/common/img/homepage/icon_缴费.png",
+    icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "返校预约",
+    icon: "/static/common/img/homepage/icon_返校预约.png",
+    icon2: "/static/common/img/homepage/icon_返校预约_gray.png",
+    url: "/pages/my/BackSchool/BackSchool",
+    type: "page",
+  },
+  {
+    name: "心愿单",
+    icon: "/static/common/img/homepage/icon_心愿单.png",
+    icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+    url: "/pages/my/wishlist/wishlist",
+    type: "page",
+  },
+  {
+    name: "全部服务",
+    icon: "/static/common/img/homepage/icon_全部服务.png",
+    icon2: "/static/common/img/homepage/icon_全部服务.png",
+  },
+];
+
+// 教师首页配置  vuex_user.userType==1
+export const TEACHER_CONFIG = [
+  {
+    name: "南小翼",
+    icon: "/static/common/img/homepage/icon_南小翼.png",
+    icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+    url: "http://sl.vrgon.com:2222/",
+    type: "http",
+    index: 0,
+  },
+  {
+    name: "心愿单",
+    icon: "/static/common/img/homepage/icon_心愿单.png",
+    icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+    url: "/pages/my/wishlist/wishlist",
+    type: "page",
+  },
+  {
+    name: "报修",
+    icon: "/static/common/img/homepage/icon_报修.png",
+    icon2: "/static/common/img/homepage/icon_报修_gray.png",
+    url: "https://bx.nut.edu.cn/#/",
+    type: "http",
+    index: 7,
+  },
+  {
+    name: "图书馆",
+    icon: "/static/common/img/homepage/icon_图书借阅.png",
+    icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+    url: "https://book.nut.edu.cn/",
+    type: "http",
+    index: 9,
+  },
+];
+
+// 南昌理工学院配置
+export const NANCHANG_CONFIG = {
+  在校生: [
+    {
+      name: "南小翼",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://sl.vrgon.com:2222/",
+      type: "http",
+    },
+    {
+      name: "老生缴费",
+      icon: "/static/common/img/homepage/icon_缴费.png",
+      icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+      url: "https://pay.nut.edu.cn/",
+      type: "http",
+      index: 1,
+    },
+    {
+      name: "网上购电",
+      icon: "/static/common/img/homepage/icon_网上购电.png",
+      icon2: "/static/common/img/homepage/icon_网上购电_gray.png",
+      url: "https://if.nut.edu.cn/",
+      type: "http",
+      index: 5,
+    },
+    {
+      name: "成绩查询",
+      icon: "/static/common/img/homepage/icon_就业帮助.png",
+      icon2: "/static/common/img/homepage/icon_就业帮助_gray.png",
+      url: "https://iwglxt.nut.edu.cn/",
+      type: "http",
+      index: 4,
+    },
+    {
+      name: "报修",
+      icon: "/static/common/img/homepage/icon_报修.png",
+      icon2: "/static/common/img/homepage/icon_报修_gray.png",
+      url: "https://bx.nut.edu.cn/#/",
+      type: "http",
+      index: 6,
+    },
+    {
+      name: "心愿单",
+      icon: "/static/common/img/homepage/icon_心愿单.png",
+      icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+      url: "/pages/my/wishlist/wishlist",
+      type: "page",
+    },
+    {
+      name: "图书馆",
+      icon: "/static/common/img/homepage/icon_图书借阅.png",
+      icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+      url: "https://book.nut.edu.cn/",
+      type: "http",
+      index: 9,
+    },
+    {
+      name: "选课",
+      icon: "/static/common/img/homepage/icon_选课.png",
+      icon2: "/static/common/img/homepage/icon_选课_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "办事指南",
+      icon: "/static/common/img/homepage/icon_办事指南.png",
+      icon2: "/static/common/img/homepage/icon_办事指南_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "勤工俭学",
+      icon: "/static/common/img/homepage/icon_勤工俭学.png",
+      icon2: "/static/common/img/homepage/icon_勤工俭学_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "校园跑",
+      icon: "/static/common/img/homepage/icon_校园跑.png",
+      icon2: "/static/common/img/homepage/icon_校园跑_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "查询档案",
+      icon: "/static/common/img/homepage/icon_查询档案.png",
+      icon2: "/static/common/img/homepage/icon_查询档案_gray.png",
+      url: "",
+      type: "page",
+    },
+  ],
+  毕业生: [
+    {
+      name: "南小翼",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://sl.vrgon.com:2222/",
+      type: "http",
+    },
+    {
+      name: "返校预约",
+      icon: "/static/common/img/homepage/icon_返校预约.png",
+      icon2: "/static/common/img/homepage/icon_返校预约_gray.png",
+      url: "/pages/my/BackSchool/BackSchool",
+      type: "page",
+    },
+    {
+      name: "图书馆",
+      icon: "/static/common/img/homepage/icon_图书借阅.png",
+      icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+      url: "https://book.nut.edu.cn/",
+      type: "http",
+      index: 9,
+    },
+    {
+      name: "心愿单",
+      icon: "/static/common/img/homepage/icon_心愿单.png",
+      icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+      url: "/pages/my/wishlist/wishlist",
+      type: "page",
+    },
+    {
+      name: "DL",
+      icon: "/static/common/img/homepage/icon_DL.png",
+      icon2: "/static/common/img/homepage/icon_DL_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "校友名片",
+      icon: "/static/common/img/homepage/icon_校友名片.png",
+      icon2: "/static/common/img/homepage/icon_校友名片_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "校友活动",
+      icon: "/static/common/img/homepage/icon_校友活动.png",
+      icon2: "/static/common/img/homepage/icon_校友活动_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "电子校友卡",
+      icon: "/static/common/img/homepage/icon_电子校友卡.png",
+      icon2: "/static/common/img/homepage/icon_电子校友卡_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "校友会组织",
+      icon: "/static/common/img/homepage/icon_校友会组织.png",
+      icon2: "/static/common/img/homepage/icon_校友会组织_gray.png",
+      url: "",
+      type: "page",
+    },
+    {
+      name: "助力母校",
+      icon: "/static/common/img/homepage/icon_助力母校.png",
+      icon2: "/static/common/img/homepage/icon_助力母校_gray.png",
+      url: "",
+      type: "page",
+    },
+  ],
+  教师: [
+    {
+      name: "南小翼",
+      icon: "/static/common/img/homepage/icon_南小翼.png",
+      icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+      url: "http://sl.vrgon.com:2222/",
+      type: "http",
+      index: 0,
+    },
+    {
+      name: "心愿单",
+      icon: "/static/common/img/homepage/icon_心愿单.png",
+      icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+      url: "/pages/my/wishlist/wishlist",
+      type: "page",
+    },
+    {
+      name: "报修",
+      icon: "/static/common/img/homepage/icon_报修.png",
+      icon2: "/static/common/img/homepage/icon_报修_gray.png",
+      url: "https://bx.nut.edu.cn/#/",
+      type: "http",
+      index: 7,
+    },
+    {
+      name: "图书馆",
+      icon: "/static/common/img/homepage/icon_图书借阅.png",
+      icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+      url: "https://book.nut.edu.cn/",
+      type: "http",
+      index: 9,
+    },
+    // {
+    //   name: "DL",
+    //   icon: "/static/common/img/homepage/icon_DL.png",
+    //   icon2: "/static/common/img/homepage/icon_DL_gray.png",
+    //   url: "",
+    //   type: "page",
+    // },
+  ],
+};
+
+/**
+ * 全部服务
+ */
+export const functionListing2 = [
+  {
+    name: "ai智能",
+    icon: "/static/common/img/homepage/icon_南小翼.png",
+    icon2: "/static/common/img/homepage/icon_南小翼_gray.png",
+    url: "",
+  },
+  {
+    name: "缴费",
+    icon: "/static/common/img/homepage/icon_缴费.png",
+    icon2: "/static/common/img/homepage/icon_缴费_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "返校预约",
+    icon: "/static/common/img/homepage/icon_返校预约.png",
+    icon2: "/static/common/img/homepage/icon_返校预约_gray.png",
+    url: "/pages/my/BackSchool/BackSchool",
+    type: "page",
+  },
+  {
+    name: "心愿单",
+    icon: "/static/common/img/homepage/icon_心愿单.png",
+    icon2: "/static/common/img/homepage/icon_心愿单_gray.png",
+    url: "/pages/my/wishlist/wishlist",
+    type: "page",
+  },
+  // {
+  //   name: "迎新",
+  //   icon: "/static/common/img/homepage/icon_迎新.png",
+  //   icon2: "/static/common/img/homepage/icon_迎新_gray.png",
+  //   url: "",
+  //   type: "http",
+  // },
+  {
+    name: "就业帮助",
+    icon: "/static/common/img/homepage/icon_就业帮助.png",
+    icon2: "/static/common/img/homepage/icon_就业帮助_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "活动报名",
+    icon: "/static/common/img/homepage/icon_活动报名.png",
+    icon2: "/static/common/img/homepage/icon_活动报名_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "报修",
+    icon: "/static/common/img/homepage/icon_报修.png",
+    icon2: "/static/common/img/homepage/icon_报修_gray.png",
+    url: "",
+    type: "http",
+  },
+  {
+    name: "勤工俭学",
+    icon: "/static/common/img/homepage/icon_勤工俭学.png",
+    icon2: "/static/common/img/homepage/icon_勤工俭学_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "办事指南",
+    icon: "/static/common/img/homepage/icon_办事指南.png",
+    icon2: "/static/common/img/homepage/icon_办事指南_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "图书馆",
+    icon: "/static/common/img/homepage/icon_图书借阅.png",
+    icon2: "/static/common/img/homepage/icon_图书借阅_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "查询档案",
+    icon: "/static/common/img/homepage/icon_查询档案.png",
+    icon2: "/static/common/img/homepage/icon_查询档案_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "选课",
+    icon: "/static/common/img/homepage/icon_选课.png",
+    icon2: "/static/common/img/homepage/icon_选课_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "DL",
+    icon: "/static/common/img/homepage/icon_DL.png",
+    icon2: "/static/common/img/homepage/icon_DL_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "校园跑",
+    icon: "/static/common/img/homepage/icon_校园跑.png",
+    icon2: "/static/common/img/homepage/icon_校园跑_gray.png",
+    url: "",
+    type: "page",
+  },
+  // {},
+];
+
+// 毕业生敬请期待
+export const functionListing3 = [
+  {
+    name: "校友名片",
+    icon: "/static/common/img/homepage/icon_校友名片.png",
+    icon2: "/static/common/img/homepage/icon_校友名片_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "校友活动",
+    icon: "/static/common/img/homepage/icon_校友活动.png",
+    icon2: "/static/common/img/homepage/icon_校友活动_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "电子校友卡",
+    icon: "/static/common/img/homepage/icon_电子校友卡.png",
+    icon2: "/static/common/img/homepage/icon_电子校友卡_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "校友会组织",
+    icon: "/static/common/img/homepage/icon_校友会组织.png",
+    icon2: "/static/common/img/homepage/icon_校友会组织_gray.png",
+    url: "",
+    type: "page",
+  },
+  {
+    name: "助力母校",
+    icon: "/static/common/img/homepage/icon_助力母校.png",
+    icon2: "/static/common/img/homepage/icon_助力母校_gray.png",
+    url: "",
+    type: "page",
+  },
+];
diff --git a/pages/home/home/components/campusInfo/index.vue b/pages/home/home/components/campusInfo/index.vue
new file mode 100644
index 0000000..8df5474
--- /dev/null
+++ b/pages/home/home/components/campusInfo/index.vue
@@ -0,0 +1,85 @@
+<template>
+  <!-- 首页-校园资讯组件 -->
+  <view class="campus-info-page">
+    <!-- 使用内容卡片组件 -->
+    <content-card
+      v-for="(card, index) in contentCards"
+      :key="index"
+      :cardData="card"
+    ></content-card>
+  </view>
+</template>
+
+<script>
+import ContentCard from "@/components/ContentCard.vue";
+export default {
+  name: "CampusInfo",
+  components: {
+    ContentCard,
+  },
+  data() {
+    return {
+      // 内容卡片数据
+      contentCards: [
+        // 图片类型卡片示例
+        {
+          user: {
+            avatar: "/static/common/img/homepage/avatar3.png",
+            name: "calista33",
+            meta: "2小时前 北京大学",
+          },
+          content: "今日份走停停的小确幸。",
+          type: "image",
+          images: [
+            "/static/common/img/homepage/image-photo1.png",
+            "/static/common/img/homepage/image-photo2.png",
+            "/static/common/img/homepage/image-photo3.png",
+          ],
+          stats: {
+            forward: 102,
+            comment: 102,
+            like: 212,
+            favorite: 62,
+          },
+        },
+        // 视频类型卡片示例
+        {
+          user: {
+            avatar: "/static/common/img/homepage/avatar.png",
+            name: "Kohaku",
+            meta: "2小时前 北京大学",
+          },
+          content: "看看我拍的这个视频•",
+          type: "video",
+          cover: "/static/images/video-cover.png",
+          videoUrl: "https://example.com/video.mp4",
+          duration: 145, // 2分25秒
+          stats: {
+            forward: 102,
+            comment: 102,
+            like: 212,
+            favorite: 62,
+          },
+        },
+      ],
+    };
+  },
+  methods: {
+    goContentDetail(card) {
+      console.log(card);
+      this.$u.route({
+        url: "/pages/home/home/components/contentDetail/index",
+        // params: {
+        //   card,
+        // },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.campus-info-page {
+  padding: 32rpx 8rpx 0;
+}
+</style>
diff --git a/pages/home/home/components/contentDetail/commentSection.vue b/pages/home/home/components/contentDetail/commentSection.vue
new file mode 100644
index 0000000..8d6a277
--- /dev/null
+++ b/pages/home/home/components/contentDetail/commentSection.vue
@@ -0,0 +1,668 @@
+<template>
+  <view class="comment-section">
+    <!-- 评论统计 -->
+    <view class="comment-count">评论 {{ comments.length }}</view>
+
+    <!-- 评论列表 -->
+    <view class="comment-list">
+      <view
+        class="comment-item"
+        v-for="(comment, index) in comments"
+        :key="index"
+      >
+        <image
+          class="comment-avatar"
+          :src="comment.author.avatar"
+          mode="aspectFill"
+        ></image>
+        <view class="comment-content">
+          <view class="comment-user">
+            <text class="comment-username">{{ comment.author.name }}</text>
+            <text class="comment-school">{{ comment.author.school }}</text>
+            <text class="comment-time">{{ comment.time }}</text>
+          </view>
+          <view class="comment-text">{{ comment.content }}</view>
+          <view class="comment-actions">
+            <view
+              class="reply-count"
+              v-if="comment.replyCount"
+              @click="handleViewReplies(comment)"
+            >
+              {{ comment.replyCount }}回复 >
+            </view>
+            <view class="like-btn" @click="handleLikeComment(index)">
+              <u-icon
+                name="heart"
+                :size="36"
+                :color="comment.isLiked ? '#ff5555' : '#999'"
+              ></u-icon>
+
+              <text v-if="comment.likes">{{ comment.likes }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 底部操作栏 - 修改为上下两行布局 -->
+    <view class="footer-actions">
+      <!-- 上方输入框区域 -->
+      <view class="input-container">
+        <view class="comment-input" @click="handleShowCommentInput">
+          <text>高楼平地起，评论全靠你...</text>
+        </view>
+        <view class="send-btn">
+          <!-- <u-icon name="arrow-right" :size="44" color="#4ca2ff"></u-icon> -->
+          <image
+            src="/static/common/img/homepage/icon-send.png"
+            mode="aspectFill"
+            style="width: 72rpx; height: 72rpx"
+          ></image>
+        </view>
+      </view>
+
+      <!-- 下方操作按钮区域 -->
+      <view class="interaction-bar">
+        <view
+          class="action-item"
+          v-for="(item, index) in actionButtons"
+          :key="index"
+          @click="handleAction(item.action)"
+        >
+          <image
+            :src="item.icon"
+            mode="aspectFill"
+            style="width: 40rpx; height: 40rpx"
+          ></image>
+          <text>{{ item.stat }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "CommentSection",
+  props: {
+    // 评论列表
+    comments: {
+      type: Array,
+      default: () => [],
+    },
+    // 分享数
+    shareCount: {
+      type: Number,
+      default: 0,
+    },
+    // 评论数
+    commentCount: {
+      type: Number,
+      default: 0,
+    },
+    // 点赞数
+    likeCount: {
+      type: Number,
+      default: 0,
+    },
+    // 收藏数
+    favoriteCount: {
+      type: Number,
+      default: 0,
+    },
+    // 是否已点赞
+    isLiked: {
+      type: Boolean,
+      default: false,
+    },
+    // 是否已收藏
+    isFavorite: {
+      type: Boolean,
+      default: false,
+    },
+    // 帖子ID
+    postId: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      // 内部维护的状态，避免直接修改props
+      innerStats: {
+        shares: this.shareCount,
+        comments: this.commentCount,
+        likes: this.likeCount,
+        favorites: this.favoriteCount,
+        isLiked: this.isLiked,
+        isFavorite: this.isFavorite,
+      },
+      // 内部评论列表的副本
+      localComments: [],
+      // 添加操作按钮配置
+      actionButtons: [
+        {
+          icon: "/static/common/img/homepage/reply.png",
+          action: "forward",
+          stat: "102",
+        },
+        {
+          icon: "/static/common/img/homepage/comment.png",
+          action: "comment",
+          stat: "102",
+        },
+        {
+          icon: "/static/common/img/homepage/like.png",
+          action: "like",
+          stat: "212",
+        },
+        {
+          icon: "/static/common/img/homepage/star.png",
+          action: "favorite",
+          stat: "62",
+        },
+      ],
+    };
+  },
+  watch: {
+    // 监听外部传入的数据变化，更新内部状态
+    comments: {
+      immediate: true,
+      handler(newVal) {
+        this.localComments = JSON.parse(JSON.stringify(newVal));
+      },
+    },
+    shareCount(newVal) {
+      this.innerStats.shares = newVal;
+    },
+    commentCount(newVal) {
+      this.innerStats.comments = newVal;
+    },
+    likeCount(newVal) {
+      this.innerStats.likes = newVal;
+    },
+    favoriteCount(newVal) {
+      this.innerStats.favorites = newVal;
+    },
+    isLiked(newVal) {
+      this.innerStats.isLiked = newVal;
+    },
+    isFavorite(newVal) {
+      this.innerStats.isFavorite = newVal;
+    },
+  },
+  methods: {
+    // 处理查看评论回复
+    handleViewReplies(comment) {
+      // 跳转到回复详情页
+      uni.navigateTo({
+        url: `/pages/comment/replies?commentId=${comment.id}&postId=${this.postId}`,
+      });
+
+      // 通知父组件（可选）
+      this.$emit("view-replies", comment);
+    },
+
+    // 处理点赞评论
+    handleLikeComment(index) {
+      // 直接在本地处理点赞逻辑
+      const comment = this.localComments[index];
+      comment.isLiked = !comment.isLiked;
+
+      if (comment.isLiked) {
+        comment.likes++;
+      } else if (comment.likes > 0) {
+        comment.likes--;
+      }
+
+      // 调用API更新点赞状态
+      this.updateCommentLikeStatus(comment.id, comment.isLiked);
+
+      // 通知父组件（可选）
+      this.$emit("like-comment", { index, comment });
+    },
+
+    // 处理显示评论输入框
+    handleShowCommentInput() {
+      // 显示评论输入弹窗
+      this.showCommentPopup();
+
+      // 通知父组件（可选）
+      this.$emit("show-comment-input");
+    },
+
+    // 处理分享帖子
+    handleSharePost() {
+      // 显示分享选项
+      uni.showActionSheet({
+        itemList: ["分享到朋友圈", "分享给朋友", "复制链接", "收藏"],
+        success: (res) => {
+          const { tapIndex } = res;
+          let message = "";
+
+          switch (tapIndex) {
+            case 0:
+              message = "分享到朋友圈";
+              break;
+            case 1:
+              message = "分享给朋友";
+              break;
+            case 2:
+              uni.setClipboardData({
+                data: `https://yourapp.com/post/${this.postId}`,
+                success: () => {
+                  message = "链接已复制";
+                },
+              });
+              break;
+            case 3:
+              this.handleFavoritePost();
+              return;
+          }
+
+          if (message) {
+            uni.showToast({
+              title: message,
+              icon: "none",
+            });
+           
+          }
+        },
+      });
+
+      // 通知父组件（可选）
+      this.$emit("share");
+    },
+
+    // 处理评论帖子
+    handleCommentPost() {
+      // 直接调用显示评论输入框
+      this.handleShowCommentInput();
+    },
+
+    // 处理点赞帖子
+    handleLikePost() {
+      // 更新内部状态
+      this.innerStats.isLiked = !this.innerStats.isLiked;
+
+      if (this.innerStats.isLiked) {
+        this.innerStats.likes++;
+      } else if (this.innerStats.likes > 0) {
+        this.innerStats.likes--;
+      }
+
+      // 调用API更新点赞状态
+      this.updatePostLikeStatus(this.postId, this.innerStats.isLiked);
+
+      // 通知父组件
+      this.$emit("like", {
+        isLiked: this.innerStats.isLiked,
+        likeCount: this.innerStats.likes,
+      });
+    },
+
+    // 处理收藏帖子
+    handleFavoritePost() {
+      // 更新内部状态
+      this.innerStats.isFavorite = !this.innerStats.isFavorite;
+
+      if (this.innerStats.isFavorite) {
+        this.innerStats.favorites++;
+      } else if (this.innerStats.favorites > 0) {
+        this.innerStats.favorites--;
+      }
+
+      // 调用API更新收藏状态
+      this.updatePostFavoriteStatus(this.postId, this.innerStats.isFavorite);
+
+      // 通知父组件
+      this.$emit("favorite", {
+        isFavorite: this.innerStats.isFavorite,
+        favoriteCount: this.innerStats.favorites,
+      });
+    },
+
+    // ========== API调用方法 ==========
+
+    // 更新评论点赞状态
+    updateCommentLikeStatus(commentId, isLiked) {
+      // 实际项目中这里会调用API
+      console.log(`更新评论(${commentId})点赞状态: ${isLiked}`);
+
+      // 模拟API调用
+      /*
+      uni.request({
+        url: '/api/comment/like',
+        method: 'POST',
+        data: {
+          commentId,
+          action: isLiked ? 'like' : 'unlike'
+        },
+        success: (res) => {
+          console.log('评论点赞状态更新成功', res);
+        },
+        fail: (err) => {
+          console.error('评论点赞状态更新失败', err);
+          // 更新失败，恢复UI状态
+          this.rollbackCommentLike(commentId);
+        }
+      });
+      */
+    },
+
+    // 更新帖子点赞状态
+    updatePostLikeStatus(postId, isLiked) {
+      // 实际项目中这里会调用API
+      console.log(`更新帖子(${postId})点赞状态: ${isLiked}`);
+
+      // 模拟API调用
+      /*
+      uni.request({
+        url: '/api/post/like',
+        method: 'POST',
+        data: {
+          postId,
+          action: isLiked ? 'like' : 'unlike'
+        },
+        success: (res) => {
+          console.log('帖子点赞状态更新成功', res);
+        },
+        fail: (err) => {
+          console.error('帖子点赞状态更新失败', err);
+          // 更新失败，恢复UI状态
+          this.rollbackPostLike();
+        }
+      });
+      */
+    },
+
+    // 更新帖子收藏状态
+    updatePostFavoriteStatus(postId, isFavorite) {
+      // 实际项目中这里会调用API
+      console.log(`更新帖子(${postId})收藏状态: ${isFavorite}`);
+
+      // 模拟API调用
+      /*
+      uni.request({
+        url: '/api/post/favorite',
+        method: 'POST',
+        data: {
+          postId,
+          action: isFavorite ? 'favorite' : 'unfavorite'
+        },
+        success: (res) => {
+          console.log('帖子收藏状态更新成功', res);
+        },
+        fail: (err) => {
+          console.error('帖子收藏状态更新失败', err);
+          // 更新失败，恢复UI状态
+          this.rollbackPostFavorite();
+        }
+      });
+      */
+    },
+
+    // 显示评论输入弹窗
+    showCommentPopup() {
+      // 这里可以显示一个自定义的评论输入弹窗
+      uni.showModal({
+        // title: "发表评论",
+        editable: true,
+        placeholderText: "说点什么吧...",
+        success: (res) => {
+          if (res.confirm && res.content) {
+            // 提交评论
+            this.submitComment(res.content);
+          }
+        },
+      });
+    },
+
+    // 提交评论
+    submitComment(content) {
+      if (!content.trim()) return;
+
+      // 实际项目中这里会调用API
+      console.log(`提交评论到帖子(${this.postId}): ${content}`);
+
+      // 模拟评论成功
+      const newComment = {
+        id: Date.now().toString(),
+        author: {
+          id: "current-user-id",
+          name: "我",
+          avatar: "/static/common/img/homepage/avatar.png",
+          school: "我的学校",
+        },
+        time: "刚刚",
+        content: content,
+        likes: 0,
+        isLiked: false,
+        replyCount: 0,
+      };
+
+      // 添加到本地评论列表
+      this.localComments.unshift(newComment);
+
+      // 更新评论计数
+      this.innerStats.comments++;
+
+      // 通知父组件
+      this.$emit("comment-added", {
+        comment: newComment,
+        commentCount: this.innerStats.comments,
+      });
+
+      // 显示成功提示
+      uni.showToast({
+        title: "评论发表成功",
+        icon: "success",
+      });
+    },
+
+    // 回退操作（当API调用失败时恢复UI状态）
+    rollbackCommentLike(commentId) {
+      const index = this.localComments.findIndex((c) => c.id === commentId);
+      if (index > -1) {
+        const comment = this.localComments[index];
+        comment.isLiked = !comment.isLiked;
+        if (comment.isLiked) {
+          comment.likes++;
+        } else if (comment.likes > 0) {
+          comment.likes--;
+        }
+      }
+    },
+
+    rollbackPostLike() {
+      this.innerStats.isLiked = !this.innerStats.isLiked;
+      if (this.innerStats.isLiked) {
+        this.innerStats.likes++;
+      } else if (this.innerStats.likes > 0) {
+        this.innerStats.likes--;
+      }
+    },
+
+    rollbackPostFavorite() {
+      this.innerStats.isFavorite = !this.innerStats.isFavorite;
+      if (this.innerStats.isFavorite) {
+        this.innerStats.favorites++;
+      } else if (this.innerStats.favorites > 0) {
+        this.innerStats.favorites--;
+      }
+    },
+
+    // 添加统一的操作处理方法
+    handleAction(action) {
+      switch (action) {
+        case "forward":
+          this.handleForward();
+          break;
+        case "comment":
+          this.handleComment();
+          break;
+        case "like":
+          this.handleLike();
+          break;
+        case "favorite":
+          this.handleFavorite();
+          break;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.comment-section {
+  margin-top: 30rpx;
+  // 评论统计
+  .comment-count {
+    font-size: 32rpx;
+    color: rgba(0,0,0,0.9);
+    font-weight: bold;
+    padding: 30rpx 0 20rpx;
+    // border-bottom: 1px solid #f5f5f5;
+  }
+
+  // 评论列表
+  .comment-list {
+    padding: 0;
+
+    .comment-item {
+      display: flex;
+      padding: 30rpx 0;
+    //   border-bottom: 1px solid #f5f5f5;
+
+      .comment-avatar {
+        width: 80rpx;
+        height: 80rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+        background-color: #f8f8f8;
+      }
+
+      .comment-content {
+        flex: 1;
+
+        .comment-user {
+          margin-bottom: 12rpx;
+
+          .comment-username {
+            font-size: 32rpx;
+            color: #333;
+            font-weight: 500;
+            margin-right: 16rpx;
+          }
+
+          .comment-school {
+            font-size: 26rpx;
+            color: #999;
+            margin-right: 16rpx;
+          }
+
+          .comment-time {
+            font-size: 26rpx;
+            color: #999;
+          }
+        }
+
+        .comment-text {
+          font-size: 30rpx;
+          color: #333;
+          line-height: 1.6;
+          margin-bottom: 16rpx;
+        }
+
+        .comment-actions {
+          display: flex;
+          justify-content: space-between;
+          font-size: 26rpx;
+          color: #999;
+
+          .reply-count {
+            background-color: #f5f5f5;
+            // flex: 1;
+            padding: 10rpx 16rpx;
+            color: #666;
+            border-radius: 10rpx;
+          }
+
+          .like-btn {
+            display: flex;
+            align-items: center;
+
+            text {
+              margin-left: 6rpx;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // 底部操作栏 - 修改为上下两行布局
+  .footer-actions {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #fff;
+    padding: 16rpx 30rpx;
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 -1rpx 6rpx rgba(0, 0, 0, 0.05);
+    z-index: 100;
+
+    // 上方输入框区域
+    .input-container {
+      display: flex;
+      align-items: center;
+      padding: 20rpx 0 10rpx;
+
+      .comment-input {
+        flex: 1;
+        height: 72rpx;
+        background-color: #f5f5f5;
+        border-radius: 36rpx;
+        padding: 0 30rpx;
+        display: flex;
+        align-items: center;
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .send-btn {
+        margin-left: 20rpx;
+        width: 72rpx;
+        height: 72rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+
+    // 下方操作按钮区域
+    .interaction-bar {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 16rpx;
+      padding: 10rpx 20rpx;
+
+      .action-item {
+        display: flex;
+        align-items: center;
+
+        text {
+          font-size: 24rpx;
+          color: #999;
+          margin-left: 8rpx;
+        }
+      }
+    }
+  }
+
+  // 适当增加页面底部留白，避免内容被底部操作栏遮挡
+  padding-bottom: 220rpx;
+}
+</style>
diff --git a/pages/home/home/components/contentDetail/index.vue b/pages/home/home/components/contentDetail/index.vue
new file mode 100644
index 0000000..9110705
--- /dev/null
+++ b/pages/home/home/components/contentDetail/index.vue
@@ -0,0 +1,337 @@
+<template>
+  <view class="content-detail-page">
+    <u-navbar title="" :border-bottom="false" :is-back="true"></u-navbar>
+
+    <!-- 帖子内容区域 -->
+    <view class="post-container">
+      <!-- 用户信息 -->
+      <view class="user-info">
+        <image
+          class="avatar"
+          :src="post.author.avatar"
+          mode="aspectFill"
+        ></image>
+        <view class="user-meta">
+          <view class="username">{{ post.author.name }}</view>
+          <view class="post-meta"
+            >{{ post.time }} {{ post.author.school }}</view
+          >
+        </view>
+        <view class="follow-btn" @click="followUser">
+          <text>+</text>
+          <text>关注</text>
+        </view>
+      </view>
+
+      <!-- 帖子文本内容 -->
+      <view class="post-content">
+        <text>{{ post.content }}</text>
+      </view>
+
+      <!-- 帖子话题标签 -->
+      <view class="post-tags" v-if="post.tags && post.tags.length">
+        <view
+          class="tag-item"
+          v-for="(tag, index) in post.tags"
+          :key="index"
+          @click="goToTopic(tag)"
+        >
+          #{{ tag }}
+        </view>
+      </view>
+
+      <!-- 帖子图片内容 -->
+      <view class="post-images" v-if="post.images && post.images.length">
+        <view
+          class="image-grid"
+          :class="getImageLayoutClass(post.images.length)"
+        >
+          <image
+            v-for="(img, index) in post.images"
+            :key="index"
+            :src="img"
+            mode="aspectFill"
+            @click="previewImage(index)"
+            class="post-image"
+          ></image>
+        </view>
+      </view>
+      
+      <!-- 使用评论区组件 - 简化后的接口 -->
+      <comment-section
+        :comments="post.comments"
+        :share-count="post.shares"
+        :comment-count="post.commentCount"
+        :like-count="post.likes"
+        :favorite-count="post.favorites"
+        :is-liked="post.isLiked"
+        :is-favorite="post.isFavorite"
+        :post-id="post.id"
+        @like="updateLikeStatus"
+        @favorite="updateFavoriteStatus"
+        @comment-added="handleCommentAdded"
+      ></comment-section>
+    </view>
+  </view>
+</template>
+
+<script>
+import CommentSection from './commentSection.vue';
+
+export default {
+  name: "ContentDetail",
+  components: {
+    CommentSection
+  },
+  data() {
+    return {
+      post: {
+        id: "12345",
+        author: {
+          id: "1001",
+          name: "Kohaku",
+          avatar: "/static/common/img/homepage/avatar.png",
+          school: "北京大学",
+          isFollowed: false,
+        },
+        time: "2小时前",
+        content:
+          "美国对现行的全球化十分不满，从这次关税大战就可以看得出来，但是美国人就是不愿意代价自己，因为没有全球化的商品贸易体系，也就不会有美元如今的国际地位。\n美国本身加关税，看近来是想保护本国产业，但实际上牺牲了一个错位的，他们想保持美元的国际地位，又想把制造业搬回国内。\n这两件事其实完全矛盾的，美元之所以值钱，正是因为全球贸易都在用它结算，如果美国自己把贸易门门关小，美元的地位自然也会影响。\n现实情况是，美国超市里很多东西都依赖进口，华尔街的金融生意也需全球资金流动。\n现在美欢加关税，短期内可能看不出问题，但几个月后的压力会传到普通消费者。",
+        images: [
+          "/static/common/img/homepage/image-photo1.png",
+          "/static/common/img/homepage/image-photo2.png",
+          "/static/common/img/homepage/image-photo3.png",
+        ],
+        tags: ["看到最文艺的话"],
+        commentCount: 102,
+        shares: 102,
+        likes: 212,
+        favorites: 62,
+        isLiked: false,
+        isFavorite: false,
+        comments: [
+          {
+            id: "10001",
+            author: {
+              id: "2001",
+              name: "Totoro",
+              avatar: "/static/common/img/homepage/avatar.png",
+              school: "北京大学",
+            },
+            time: "6小时前",
+            content:
+              "美国在全球贸易秩序上是想保护本国产业，但实际上牺牲了一个错位的，他们想维持美元的国际地位，又想把制造业搬回国内。",
+            likes: 12,
+            isLiked: false,
+            replyCount: 12,
+          },
+          {
+            id: "10002",
+            author: {
+              id: "2002",
+              name: "calista33",
+              avatar: "/static/common/img/homepage/avatar2.png",
+              school: "北京大学",
+            },
+            time: "6小时前",
+            content:
+              "现在美欢加关税，短期内可能看不出问题，但几个月后的压力会传到普通消费者。",
+            likes: 12,
+            isLiked: false,
+            replyCount: 12,
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    // 获取图片布局类名
+    getImageLayoutClass(count) {
+      if (count === 1) return "single-image";
+      if (count === 2) return "double-image";
+      if (count === 3) return "triple-image";
+      if (count === 4) return "four-image";
+      return "multi-image";
+    },
+
+    // 预览图片
+    previewImage(index) {
+      uni.previewImage({
+        current: index,
+        urls: this.post.images,
+      });
+    },
+
+    // 关注用户
+    followUser() {
+      this.post.author.isFollowed = !this.post.author.isFollowed;
+      uni.showToast({
+        title: this.post.author.isFollowed ? "已关注" : "已取消关注",
+        icon: "none",
+      });
+    },
+
+    // 前往话题页
+    goToTopic(tag) {
+      uni.navigateTo({
+        url: `/pages/home/home/components/topic/topicDetail?tag=${encodeURIComponent(
+          tag
+        )}`,
+      });
+    },
+
+    // 只需要处理关键更新
+    updateLikeStatus(data) {
+      this.post.isLiked = data.isLiked;
+      this.post.likes = data.likeCount;
+    },
+    
+    updateFavoriteStatus(data) {
+      this.post.isFavorite = data.isFavorite;
+      this.post.favorites = data.favoriteCount;
+    },
+    
+    handleCommentAdded(data) {
+      // 可以选择性地更新全局状态
+      this.post.commentCount = data.commentCount;
+    }
+  },
+  onLoad(options) {
+    // 这里可以根据传入的帖子ID获取帖子详情
+    const postId = options.id;
+    if (postId) {
+      // 调用API获取帖子详情
+      console.log("获取帖子ID:", postId);
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.content-detail-page {
+  min-height: 100vh;
+  background-color: #f8f8f8;
+  padding-bottom: 120rpx; // 为底部操作栏留出空间
+
+  // 帖子容器
+  .post-container {
+    background-color: #fff;
+    padding: 30rpx;
+
+    // 用户信息区域
+    .user-info {
+      display: flex;
+      align-items: center;
+      margin-bottom: 30rpx;
+
+      .avatar {
+        width: 80rpx;
+        height: 80rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
+
+      .user-meta {
+        flex: 1;
+
+        .username {
+          font-size: 32rpx;
+          font-weight: 500;
+          color: #333;
+          margin-bottom: 4rpx;
+        }
+
+        .post-meta {
+          font-size: 24rpx;
+          color: #999;
+        }
+      }
+
+      .follow-btn {
+        background-color: #00aaff;
+        color: #fff;
+        font-size: 28rpx;
+        padding: 8rpx 20rpx;
+        border-radius: 30rpx;
+        display: flex;
+        align-items: center;
+
+        text:first-child {
+          margin-right: 4rpx;
+          font-size: 32rpx;
+          line-height: 1;
+        }
+      }
+    }
+
+    // 帖子内容区域
+    .post-content {
+      font-size: 30rpx;
+      color: #333;
+      line-height: 1.6;
+      margin-bottom: 30rpx;
+      white-space: pre-line; // 保留换行符
+    }
+    
+    // 帖子标签区域
+    .post-tags {
+      display: flex;
+      flex-wrap: wrap;
+      margin-bottom: 30rpx;
+
+      .tag-item {
+        color: #00aaff;
+        font-size: 28rpx;
+        margin-right: 20rpx;
+        margin-bottom: 10rpx;
+      }
+    }
+
+    // 帖子图片区域
+    .post-images {
+      margin-bottom: a30rpx;
+
+      .image-grid {
+        display: flex;
+        flex-wrap: wrap;
+
+        .post-image {
+          border-radius: 12rpx;
+          background-color: #f5f5f5;
+        }
+
+        &.single-image {
+          .post-image {
+            width: 100%;
+            max-height: 500rpx;
+          }
+        }
+
+        &.double-image {
+          .post-image {
+            width: 49%;
+            height: 300rpx;
+            margin-right: 2%;
+
+            &:nth-child(2n) {
+              margin-right: 0;
+            }
+          }
+        }
+
+        &.triple-image {
+          .post-image {
+            width: 32%;
+            height: 240rpx;
+            margin-right: 2%;
+
+            &:nth-child(3n) {
+              margin-right: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/contentDetail/replySection.vue b/pages/home/home/components/contentDetail/replySection.vue
new file mode 100644
index 0000000..673839c
--- /dev/null
+++ b/pages/home/home/components/contentDetail/replySection.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>回复</div>
+</template>
diff --git a/pages/home/home/components/ourSchool/index.vue b/pages/home/home/components/ourSchool/index.vue
new file mode 100644
index 0000000..468f490
--- /dev/null
+++ b/pages/home/home/components/ourSchool/index.vue
@@ -0,0 +1,206 @@
+<template>
+  <!-- 首页-本校组件 -->
+  <view class="our-school-page">
+    <!-- 校园活动 -->
+    <view class="school-activity-section">
+      <view class="section-header">
+        <text>校园活动</text>
+        <text class="more">查看更多</text>
+      </view>
+
+      <!-- 校园活动列表 -->
+      <scroll-view scroll-x class="school-activity-list">
+        <view
+          class="school-activity-item"
+          v-for="(user, index) in schoolActivityList"
+          :key="index"
+        >
+          <view class="avatar-wrapper">
+            <image :src="user.avatar" class="avatar"></image>
+          </view>
+          <view class="info-wrapper">
+            <text class="name">{{ user.name }}</text>
+            <text class="desc">{{ user.desc }}</text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <!-- 校园动态 -->
+    <view class="school-dynamic-section">
+      <view class="section-header"> 校园动态 </view>
+    </view>
+
+    <!-- 使用内容卡片组件 -->
+    <content-card
+      v-for="(card, index) in contentCards"
+      :key="index"
+      :cardData="card"
+    ></content-card>
+  </view>
+</template>
+
+<script>
+import ContentCard from "@/components/ContentCard.vue";
+export default {
+  name: "OurSchool",
+  components: {
+    ContentCard,
+  },
+  data() {
+    return {
+      schoolActivityList: [
+        {
+          name: "2025届校园运动会12",
+          avatar: "/static/common/img/homepage/image-photo2.png",
+          desc: "浙江大学校运动场4月28日-30日将举行盛大的运动会，请同学们积极报名参加，积极报名，积极报名",
+        },
+        {
+          name: "2025届校园运动会",
+          avatar: "/static/common/img/homepage/image-photo1.png",
+          desc: "浙江大学校运动场4月28日-30日将举行盛大的运动会，请同学们积极报名参加",
+        },
+      ],
+
+      // 内容卡片数据
+      contentCards: [
+        // 图片类型卡片示例
+        {
+          user: {
+            avatar: "/static/common/img/homepage/avatar3.png",
+            name: "calista33",
+            meta: "2小时前 北京大学",
+          },
+          content: "今日份走停停的小确幸。",
+          type: "image",
+          images: [
+            "/static/common/img/homepage/image-photo1.png",
+            "/static/common/img/homepage/image-photo2.png",
+            "/static/common/img/homepage/image-photo3.png",
+          ],
+          stats: {
+            forward: 102,
+            comment: 102,
+            like: 212,
+            favorite: 62,
+          },
+        },
+        // 视频类型卡片示例
+        {
+          user: {
+            avatar: "/static/common/img/homepage/avatar.png",
+            name: "Kohaku",
+            meta: "2小时前 北京大学",
+          },
+          content: "看看我拍的这个视频•",
+          type: "video",
+          cover: "/static/images/video-cover.png",
+          videoUrl: "https://example.com/video.mp4",
+          duration: 145, // 2分25秒
+          stats: {
+            forward: 102,
+            comment: 102,
+            like: 212,
+            favorite: 62,
+          },
+        },
+      ],
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.our-school-page {
+  padding: 8rpx 8rpx 0;
+  .school-activity-section {
+    margin-bottom: 24rpx;
+
+    .section-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 30rpx 0;
+
+      text {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+      }
+
+      .more {
+        font-size: 24rpx;
+        color: #999;
+        font-weight: normal;
+      }
+    }
+
+    .school-activity-list {
+      white-space: nowrap;
+
+      .school-activity-item {
+        display: inline-flex;
+        align-items: center;
+        width: 512rpx;
+        height: 232rpx;
+        margin-right: 20rpx;
+        background-color: #fff;
+        border-radius: 16rpx;
+        padding: 24rpx;
+
+        .avatar-wrapper {
+          width: 184rpx;
+          height: 184rpx;
+          margin-right: 24rpx;
+
+          .avatar {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .info-wrapper {
+          width: 256rpx;
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: flex-start;
+
+          .name {
+            font-size: 28rpx;
+            color: #1f2232;
+            font-weight: bold;
+            margin-bottom: 16rpx;
+            overflow: hidden; /* 隐藏溢出内容 */
+            text-overflow: ellipsis; /* 溢出显示省略号 */
+            white-space: nowrap; /* 文本不换行 */
+            max-width: 100%;
+          }
+
+          .desc {
+            font-size: 24rpx;
+            line-height: 32rpx;
+            color: rgba(0, 0, 0, 0.6);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            white-space: wrap;
+            -webkit-line-clamp: 4; /* 显示2行 */
+            -webkit-box-orient: vertical;
+            word-break: break-all; /* 允许在任意字符间断行 */
+          }
+        }
+      }
+    }
+  }
+
+  .school-dynamic-section {
+    .section-header {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+      margin: 30rpx 0;
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/recommend/allServices copy.vue b/pages/home/home/components/recommend/allServices copy.vue
new file mode 100644
index 0000000..0beb092
--- /dev/null
+++ b/pages/home/home/components/recommend/allServices copy.vue	
@@ -0,0 +1,244 @@
+<template>
+  <view class="all-services-page">
+    <u-navbar title="全部服务" :border-bottom="false"></u-navbar>
+
+    <!-- 校园服务区域 -->
+    <view class="service-section">
+      <view class="section-title">校园服务</view>
+      <view class="service-grid">
+        <view
+          class="service-item"
+          v-for="(item, index) in campusServices"
+          :key="index"
+          @click="navigateToService(item)"
+        >
+          <view class="icon-box">
+            <image :src="item.url?item.icon:item.icon2" mode="aspectFit" class="icon-image"></image>
+            <!-- <view v-if="!item.url" class="mark-box"></view> -->
+          </view>
+          <text class="service-name">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 校友服务区域 -->
+    <view class="service-section">
+      <view class="section-title">校友服务</view>
+      <view class="service-grid">
+        <view
+          class="service-item"
+          v-for="(item, index) in alumniServices"
+          :key="index"
+          @click="navigateToService(item)"
+        >
+          <view class="icon-box">
+            <image :src="item.url?item.icon:item.icon2" mode="aspectFit" class="icon-image"></image>
+            <!-- <view v-if="!item.url" class="mark-box"></view> -->
+          </view>
+          <text class="service-name">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import {
+  functionListing2,
+  functionListing3,
+  getSchoolConfig,
+} from "../../../data";
+
+export default {
+  name: "AllServices",
+  data() {
+    return {
+      // 校园服务数据
+      campusServices: JSON.parse(JSON.stringify(functionListing2)),
+
+      // 校友服务数据
+      alumniServices: functionListing3,
+    };
+  },
+
+  watch: {
+    vuex_schoolName: {
+      handler(newVal) {
+        this.updateSchoolConfigs(newVal);
+      },
+      immediate: true,
+    },
+  },
+
+  methods: {
+    // 更新学校相关配置
+    updateSchoolConfigs(schoolName) {
+      // 获取学校的所有配置
+      const schoolConfig = getSchoolConfig(schoolName);
+
+      // 如果找到了学校配置
+      if (Object.keys(schoolConfig).length > 0) {
+        // 遍历学校的所有功能配置
+        Object.values(schoolConfig).forEach((config) => {
+          // 根据index替换对应位置的功能项
+          if (
+            typeof config.index === "number" &&
+            config.index >= 0 &&
+            config.index < this.campusServices.length
+          ) {
+            this.$set(this.campusServices, config.index, config);
+          }
+        });
+      }
+    },
+
+    // 跳转到对应服务页面
+    navigateToService(service) {
+      if (service.url == "") {
+        console.log(this);
+        // return this.$tips("暂未开放","warning");
+        return this.$refs.uToast.show({
+          title: "暂未开放",
+          type: "warning",
+        });
+      }
+
+      if (service.type == "http") {
+        // 外部链接，使用web-view打开
+        const itemData = encodeURIComponent(JSON.stringify(service));
+        this.$u.route({
+          url: `/pages/webview/index?data=${itemData}`,
+        });
+      } else {
+        // 如果是学生
+        if ([0,2].includes(this.vuex_user.userType)) {
+          if (!this.vuex_education.length) {
+            return this.$refs.uToast.show({
+              title: "请先进行教育经历认证",
+              type: "warning",
+            });
+          }
+          const findRow = this.vuex_education.find(
+            (x) => x.isSelected === true
+          );
+          if (!findRow) {
+            return this.$refs.uToast.show({
+              title: "请先绑定学校",
+              type: "warning",
+            });
+          }
+          if ([0, 2].includes(findRow.certifyStatus)) {
+            return this.$refs.uToast.show({
+              title: "请先进行教育经历认证",
+              type: "warning",
+            });
+          }
+        }
+        // 如果是教师
+        if ([1].includes(this.vuex_user.userType)) {
+          // 校验当前学校是否审核通过
+          if (!this.vuex_education.length) {
+            return this.$refs.uToast.show({
+              title: "请先进行任职学校认证",
+              type: "warning",
+            });
+          }
+          const findRow = this.vuex_education.find(
+            (x) => x.isSelected === true
+          );
+          if (!findRow) {
+            return this.$refs.uToast.show({
+              title: "请先绑定学校",
+              type: "warning",
+            });
+          }
+          if ([0, 2].includes(findRow.certifyStatus)) {
+            return this.$refs.uToast.show({
+              title: "请先进行任职学校认证",
+              type: "warning",
+            });
+          }
+        }
+
+        // 内部页面，直接跳转
+        this.$u.route({
+          url: service.url,
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.all-services-page {
+  min-height: 100vh;
+  background-color: #f8f8f8;
+  padding: 30rpx;
+
+  // 服务区域样式
+  .service-section {
+    margin-bottom: 40rpx;
+
+    .section-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 30rpx;
+    }
+
+    // 服务网格
+    .service-grid {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+
+      // 服务项目
+      .service-item {
+        width: 20%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin-bottom: 40rpx;
+
+        // 图标容器
+        .icon-box {
+          width: 92rpx;
+          height: 92rpx;
+          border-radius: 50%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-bottom: 16rpx;
+          position: relative;
+
+          // 图标图片
+          .icon-image {
+            width: 92rpx;
+            height: 92rpx;
+          }
+
+          .mark-box {
+            width: 92rpx;
+            height: 92rpx;
+            background: rgba(0, 0, 0, 0.2);
+            border-radius: 36rpx;
+            position: absolute;
+            top: 0;
+            left: 0;
+          }
+        }
+
+        // 服务名称
+        .service-name {
+          font-size: 24rpx;
+          color: rgba(0, 0, 0, 0.9);
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/recommend/allServices.vue b/pages/home/home/components/recommend/allServices.vue
new file mode 100644
index 0000000..1136ea0
--- /dev/null
+++ b/pages/home/home/components/recommend/allServices.vue
@@ -0,0 +1,346 @@
+<template>
+  <view class="all-services-page">
+    <u-navbar title="全部服务" :border-bottom="false"></u-navbar>
+
+    <!-- 校园服务区域 -->
+    <view class="service-section">
+      <view class="section-title">{{
+        isStudent ? "校园服务" : "校友服务"
+      }}</view>
+      <view class="service-grid">
+        <view
+          class="service-item"
+          v-for="(item, index) in availableServices"
+          :key="index"
+          @click="navigateToService(item)"
+        >
+          <view class="icon-box">
+            <image
+              :src="item.url ? item.icon : item.icon2"
+              mode="aspectFit"
+              class="icon-image"
+            ></image>
+          </view>
+          <text class="service-name">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 校友服务区域 -->
+    <view class="service-section">
+      <view class="section-title">敬请期待</view>
+      <view class="service-grid">
+        <view
+          class="service-item"
+          v-for="(item, index) in waitingServices"
+          :key="index"
+          @click="navigateToService(item)"
+        >
+          <view class="icon-box">
+            <image
+              :src="item.url ? item.icon : item.icon2"
+              mode="aspectFit"
+              class="icon-image"
+            ></image>
+          </view>
+          <text class="service-name">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 模态框 -->
+    <u-modal
+      ref="uModal"
+      v-model="modalShow"
+      :content="modalContent"
+      :show-cancel-button="true"
+      @cancel="modalCancel"
+      @confirm="modalConfirm"
+      :async-close="true"
+    ></u-modal>
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import {
+  functionListing2,
+  functionListing3,
+  getSchoolConfig,
+  NANCHANG_CONFIG,
+} from "../../../data";
+
+export default {
+  name: "AllServices",
+  data() {
+    return {
+      modalShow: false,
+      modalContent: "即将跳转第三方页面，是否继续跳转",
+      currentUrl: null,
+
+      // 校园服务数据
+      availableServices: JSON.parse(JSON.stringify(functionListing2)),
+
+      // 待开启服务数据
+      waitingServices: [],
+    };
+  },
+
+  computed: {
+    // 0 学生  2 毕业生
+    isStudent() {
+      return this.vuex_user.userType == 0 ? true : false;
+    },
+  },
+
+  watch: {
+    vuex_schoolName: {
+      handler(newVal) {
+        if (newVal) {
+          this.updateSchoolConfigs(newVal);
+        } else {
+          // 获取教育经历
+          this.getEducation();
+        }
+      },
+      immediate: true,
+    },
+  },
+
+  methods: {
+    // 更新学校相关配置
+    updateSchoolConfigs(schoolName) {
+      // 南昌理工学院特殊处理
+      if (schoolName.includes("南昌理工")) {
+        // 根据用户类型选择配置（在校生或毕业生）
+        const configType = this.isStudent ? "在校生" : "毕业生";
+
+        // 根据URL是否存在分类服务
+        this.availableServices = NANCHANG_CONFIG[configType].filter(
+          (service) => service.url
+        );
+        this.waitingServices = NANCHANG_CONFIG[configType].filter(
+          (service) => !service.url
+        );
+        return;
+      }
+
+      // 其他学校处理
+      const schoolConfig = getSchoolConfig(schoolName);
+
+      // 创建服务列表副本
+      const servicesCopy = [...this.availableServices];
+
+      // 遍历学校的所有功能配置并替换
+      if (Object.keys(schoolConfig).length > 0) {
+        Object.values(schoolConfig).forEach((config) => {
+          if (
+            typeof config.index === "number" &&
+            config.index >= 0 &&
+            config.index < servicesCopy.length
+          ) {
+            this.$set(servicesCopy, config.index, config);
+          }
+        });
+      }
+
+      // 根据URL是否存在分类服务
+      const filteredServices = servicesCopy.filter((service) => service.url);
+      const unfilteredServices = servicesCopy.filter((service) => !service.url);
+
+      // 更新可用和等待服务
+      this.availableServices = filteredServices;
+      this.waitingServices = unfilteredServices;
+
+      // 毕业生特殊处理，添加额外的等待服务
+      if (!this.isStudent) {
+        this.waitingServices = [...unfilteredServices, ...functionListing3];
+      }
+    },
+
+    // 跳转到对应服务页面
+    navigateToService(service) {
+      if (service.url == "") {
+        console.log(this);
+        // return this.$tips("暂未开放","warning");
+        return this.$refs.uToast.show({
+          title: "暂未开放",
+          type: "warning",
+        });
+      }
+
+      if (service.type == "http") {
+        this.currentUrl = service.url;
+
+        this.modalShow = true;
+
+        return;
+        // 外部链接，使用web-view打开
+        const itemData = encodeURIComponent(JSON.stringify(service));
+        this.$u.route({
+          url: `/pages/webview/index?data=${itemData}`,
+        });
+      } else {
+        // 如果是学生
+        if ([0, 2].includes(this.vuex_user.userType)) {
+          if (!this.vuex_education.length) {
+            return this.$refs.uToast.show({
+              title: "请先进行教育经历认证",
+              type: "warning",
+            });
+          }
+          const findRow = this.vuex_education.find(
+            (x) => x.isSelected === true
+          );
+          if (!findRow) {
+            return this.$refs.uToast.show({
+              title: "请先绑定学校",
+              type: "warning",
+            });
+          }
+          if ([0, 2].includes(findRow.certifyStatus)) {
+            return this.$refs.uToast.show({
+              title: "请先进行教育经历认证",
+              type: "warning",
+            });
+          }
+        }
+        // 如果是教师
+        if ([1].includes(this.vuex_user.userType)) {
+          // 校验当前学校是否审核通过
+          if (!this.vuex_education.length) {
+            return this.$refs.uToast.show({
+              title: "请先进行任职学校认证",
+              type: "warning",
+            });
+          }
+          const findRow = this.vuex_education.find(
+            (x) => x.isSelected === true
+          );
+          if (!findRow) {
+            return this.$refs.uToast.show({
+              title: "请先绑定学校",
+              type: "warning",
+            });
+          }
+          if ([0, 2].includes(findRow.certifyStatus)) {
+            return this.$refs.uToast.show({
+              title: "请先进行任职学校认证",
+              type: "warning",
+            });
+          }
+        }
+
+        // 内部页面，直接跳转
+        this.$u.route({
+          url: service.url,
+        });
+      }
+    },
+
+    modalCancel() {
+      this.modalShow = false;
+    },
+
+    modalConfirm() {
+      this.modalShow = false;
+
+      // 显示加载中提示和遮罩层
+      uni.showLoading({
+        title: "正在跳转...",
+        mask: true, // 显示遮罩层，阻止用户操作
+      });
+
+      // 直接跳转到第三方页面
+      window.location.href = this.currentUrl;
+    },
+
+    getEducation() {
+      const data = {
+        userId: this.vuex_user.id,
+      };
+      this.$u.apiList.MyPage(data).then((res) => {
+        // 获取学校名称
+        const schoolName =
+          res.edcationList.length > 0
+            ? res.edcationList[0].schoolName || res.edcationList[0].school
+            : "";
+        this.$u.vuex("vuex_schoolName", schoolName);
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.all-services-page {
+  min-height: 100vh;
+  background-color: #f8f8f8;
+  padding: 30rpx;
+
+  // 服务区域样式
+  .service-section {
+    margin-bottom: 40rpx;
+
+    .section-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 30rpx;
+    }
+
+    // 服务网格
+    .service-grid {
+      display: flex;
+      flex-wrap: wrap;
+      // justify-content: space-between;
+      justify-content: flex-start;
+
+      // 服务项目
+      .service-item {
+        width: 20%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin-bottom: 40rpx;
+
+        // 图标容器
+        .icon-box {
+          width: 92rpx;
+          height: 92rpx;
+          border-radius: 50%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-bottom: 16rpx;
+          position: relative;
+
+          // 图标图片
+          .icon-image {
+            width: 92rpx;
+            height: 92rpx;
+          }
+
+          .mark-box {
+            width: 92rpx;
+            height: 92rpx;
+            background: rgba(0, 0, 0, 0.2);
+            border-radius: 36rpx;
+            position: absolute;
+            top: 0;
+            left: 0;
+          }
+        }
+
+        // 服务名称
+        .service-name {
+          font-size: 24rpx;
+          color: rgba(0, 0, 0, 0.9);
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/recommend/index.vue b/pages/home/home/components/recommend/index.vue
new file mode 100644
index 0000000..9ccd49a
--- /dev/null
+++ b/pages/home/home/components/recommend/index.vue
@@ -0,0 +1,885 @@
+<template>
+  <!-- 首页-推荐组件 -->
+  <view class="recommend-page">
+    <u-top-tips ref="uTips" style="top: 0"></u-top-tips>
+    <!-- Banner图 -->
+    <view class="banner">
+      <image
+        src="/static/common/img/homepage/banner.jpg"
+        mode="widthFix"
+      ></image>
+    </view>
+
+    <!-- 功能图标区 -->
+    <view class="function-icons">
+      <view class="function-list-wrapper" :class="{ teacher_class: isTeacher }">
+        <view
+          class="function-item"
+          v-for="(item, index) in isTeacher
+            ? functionListTeacher
+            : functionList"
+          :key="index"
+          @click="handleFunctionClick(item)"
+        >
+          <view class="icon-box">
+            <image
+              :src="item.url ? item.icon : item.icon2"
+              mode="widthFix"
+              style="width: 92rpx; height: 92rpx"
+            ></image>
+          </view>
+          <text>{{ item.name }}</text>
+        </view>
+      </view>
+
+      <!-- 指示点 -->
+      <!-- <view class="indicator">
+        <view class="dot active"></view>
+        <view class="dot"></view>
+        <view class="dot"></view>
+      </view> -->
+    </view>
+
+    <!-- 为你推荐 -->
+    <view class="recommend-section">
+      <view class="section-header">
+        <text>为你推荐</text>
+        <text class="more" @click="toAlumniPage">查看更多</text>
+      </view>
+
+      <!-- 推荐人列表 -->
+      <scroll-view
+        scroll-x
+        class="recommend-users"
+        v-if="recommendUsers.length !== 0"
+      >
+        <view
+          class="user-item"
+          v-for="(user, index) in recommendUsers"
+          :key="index"
+          @click="toUserDetail(user.userId)"
+        >
+          <!-- <image
+            :src="$u.http.config.imgUrl + user.imageUrl"
+            class="avatar"
+          ></image> -->
+          <u-avatar
+            :src="$u.http.config.imgUrl + user.imageUrl"
+            class="avatar"
+          ></u-avatar>
+          <text class="name">{{ user.name }}</text>
+          <!-- <text class="desc">{{ user.workFieldName }}</text> -->
+
+          <!-- <button
+            class="follow-btn"
+            :class="{ followed: user.isFollowed }"
+            @click.stop="handleFollow(user.userId)"
+          >
+            {{ user.isFollowed ? "已关注" : "关注" }}
+          </button> -->
+          <view
+            class="follow-btn"
+            :class="{ followed: user.isFollowed }"
+            @click.stop="handleFollow(user.userId)"
+          >
+            <image
+              v-if="!user.isFollowed"
+              src="/static/common/img/homepage/icon-follow.png"
+              mode="scaleToFill"
+              style="width: 28rpx; height: 28rpx; margin-right: 6rpx"
+            />
+            <span>{{ user.isFollowed ? "已关注" : "关注" }}</span>
+          </view>
+          <!-- <image
+            class="close-btn"
+            src="/static/common/img/homepage/icon-close-circle.png"
+            mode="widthFix"
+            style="width: 28rpx; height: 28rpx"
+          ></image> -->
+        </view>
+      </scroll-view>
+      <no-data v-else></no-data>
+    </view>
+
+    <!-- 校园资讯 横板，展示三条 -->
+    <view class="campus-info-section">
+      <view class="section-header">
+        <text>校园资讯</text>
+        <text class="more" @click="toAlumnusPage">查看更多</text>
+      </view>
+
+      <!-- 校园资讯 -->
+      <scroll-view
+        scroll-x
+        class="school-activity-list"
+        v-if="schoolActivityList.length !== 0"
+      >
+        <view
+          class="school-activity-item"
+          v-for="(item, index) in schoolActivityList"
+          :key="index"
+          @click="toSchoolActivityDetail(item)"
+        >
+          <view class="avatar-wrapper">
+            <!--  $u.http.config.imgUrl + item.imageUrl || -->
+            <!-- 图片无法正常展示，先用默认图片 -->
+            <image
+              :src="'/static/common/img/homepage/activity-default.png'"
+              class="avatar"
+            ></image>
+          </view>
+          <view class="info-wrapper">
+            <text class="name">{{ item.title }}</text>
+            <text class="desc">{{ item.content }}</text>
+          </view>
+        </view>
+      </scroll-view>
+      <!-- <no-data v-else></no-data> -->
+
+      <!--  -->
+      <information
+        @onStar="onStar"
+        @clickImg="clickImg"
+        :list="helpList"
+        type="1"
+        :bottom="bottomState"
+        :borderNoPadding="true"
+        :noShowEmpty="true"
+      >
+      </information>
+    </view>
+
+    <!-- 模态框 -->
+    <u-modal
+      ref="uModal"
+      v-model="modalShow"
+      :content="modalContent"
+      :show-cancel-button="true"
+      @cancel="modalCancel"
+      @confirm="modalConfirm"
+      :async-close="true"
+    ></u-modal>
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import {
+  functionListing,
+  getAIAssistantConfig,
+  getOldStudentConfig,
+  TEACHER_CONFIG,
+  NANCHANG_CONFIG,
+  getSchoolConfig,
+  functionListing2,
+} from "../../../data";
+// 引入内容卡片组件
+import ContentCard from "@/components/ContentCard.vue";
+import information from "@/components/Information.vue";
+import NoData from "@/components/NoData.vue";
+import { computed } from "vue";
+export default {
+  name: "Recommend",
+  components: {
+    ContentCard,
+    NoData,
+    information,
+  },
+  data() {
+    return {
+      modalShow: false,
+      modalContent: "即将跳转第三方页面，是否继续跳转",
+      currentUrl: null,
+      functionList: JSON.parse(JSON.stringify(functionListing)), // 深拷贝避免修改原始数据
+      functionList2: JSON.parse(JSON.stringify(functionListing2)), // 深拷贝避免修改原始数据
+      functionListTeacher: TEACHER_CONFIG, // 教师
+
+      recommendUsers: [
+        /* {
+          name: "李雪",
+          avatar: "/static/common/img/homepage/avatar.png",
+          desc: "对二次元我似乎都关注了Ta",
+          isFollowed: false,
+        }, */
+      ],
+
+      schoolActivityList: [
+        /* {
+          title: "2025届校园运动会12",
+          imageUrl: "/static/common/img/homepage/activity-default.png",
+          content:
+            "浙江大学校运动场4月28日-30日将举行盛大的运动会，请同学们积极报名参加，积极报名，积极报名",
+        }, */
+      ],
+
+      currentRow: {},
+      flag: null,
+      route: null,
+      type: "0",
+      id: null,
+      nolink: false,
+
+      bottomState: false,
+      helpList: [],
+      total2: 0,
+    };
+  },
+  computed: {
+    // 是否是教师
+    isTeacher() {
+      return this.vuex_user.userType == 1 ? true : false;
+    },
+    // 0 学生  2 毕业生
+    isStudent() {
+      return this.vuex_user.userType == 0 ? true : false;
+    },
+  },
+
+  watch: {
+    vuex_schoolName: {
+      handler(newVal) {
+        // 当schoolName有值时更新AI助手配置
+        if (newVal) {
+          this.updateAIConfig(newVal);
+        }
+      },
+      immediate: true,
+    },
+  },
+
+  methods: {
+    // 更新AI助手配置
+    updateAIConfig(schoolName) {
+      // 处理学生用户
+      if (this.vuex_user.userType !== 1) {
+        const lastItem = this.functionList[4]; // 保存第5项(全部服务)
+
+        // 南昌理工学院特殊处理
+        if (schoolName.includes("南昌理工")) {
+          // 根据用户类型选择配置（在校生或毕业生）
+          const configType = this.isStudent ? "在校生" : "毕业生";
+          // 获取有URL的服务
+          const filteredServices = NANCHANG_CONFIG[configType].filter(
+            (service) => service.url
+          );
+          // 替换前4项，保留第5项
+          this.functionList = [...filteredServices.slice(0, 4), lastItem];
+          return;
+        }
+
+        // 其他学校处理
+        const schoolConfig = getSchoolConfig(schoolName);
+        // 创建功能列表副本
+        const functionList2Copy = [...this.functionList2];
+        // 如果找到了学校配置
+        if (Object.keys(schoolConfig).length > 0) {
+          // 遍历学校的所有功能配置并替换
+          Object.values(schoolConfig).forEach((config) => {
+            if (
+              typeof config.index === "number" &&
+              config.index >= 0 &&
+              config.index < functionList2Copy.length
+            ) {
+              this.$set(functionList2Copy, config.index, config);
+            }
+          });
+        }
+        // 过滤有URL的服务
+        const filteredServices = functionList2Copy.filter(
+          (service) => service.url
+        );
+        // 替换前4项，保留第5项
+        this.functionList = [...filteredServices.slice(0, 4), lastItem];
+        return;
+      }
+
+      // 处理教师用户
+      if (schoolName.includes("南昌理工")) {
+        this.functionListTeacher = NANCHANG_CONFIG["教师"];
+        return;
+      }
+
+      // 教师用户其他学校处理
+      const schoolConfig = getSchoolConfig(schoolName);
+      // 创建功能列表副本
+      const functionList3Copy = [...this.functionList2];
+      if (Object.keys(schoolConfig).length > 0) {
+        // 遍历学校的所有功能配置并替换
+        Object.values(schoolConfig).forEach((config) => {
+          if (
+            typeof config.index === "number" &&
+            config.index >= 0 &&
+            config.index < functionList3Copy.length
+          ) {
+            this.$set(functionList3Copy, config.index, config);
+          }
+        });
+      }
+      this.functionListTeacher = functionList3Copy.slice(0, 4);
+    },
+
+    // 点击功能图标
+    handleFunctionClick(item) {
+      console.log("点击功能图标", item);
+
+      if (item.name === "全部服务") {
+        this.$u.route({
+          url: "/pages/home/home/components/recommend/allServices",
+        });
+        return;
+      }
+
+      if (item.url == "") {
+        // this.$tips("暂未开放", "warning");
+        this.$refs.uToast.show({
+          title: "暂未开放",
+          type: "warning",
+        });
+        return;
+      }
+
+      if (item.type == "http") {
+        // 外部链接，使用web-view打开
+        // this.$u.route({
+        //   url: `/pages/webview/index?url=${encodeURIComponent(item)}`,
+        // });
+
+        this.currentUrl = item.url;
+
+        this.modalShow = true;
+
+        return;
+
+        const itemData = encodeURIComponent(JSON.stringify(item));
+        this.$u.route({
+          url: `/pages/webview/index?data=${itemData}`,
+        });
+      } else {
+        // 如果是学生
+        if ([0, 2].includes(this.vuex_user.userType)) {
+          if (!this.vuex_education.length) {
+            return this.$refs.uToast.show({
+              title: "请先进行教育经历认证",
+              type: "warning",
+            });
+          }
+          const findRow = this.vuex_education.find(
+            (x) => x.isSelected === true
+          );
+          if (!findRow) {
+            return this.$refs.uToast.show({
+              title: "请先绑定学校",
+              type: "warning",
+            });
+          }
+          if ([0, 2].includes(findRow.certifyStatus)) {
+            return this.$refs.uToast.show({
+              title: "请先进行教育经历认证",
+              type: "warning",
+            });
+          }
+        }
+        // 如果是教师
+        if ([1].includes(this.vuex_user.userType)) {
+          // 校验当前学校是否审核通过
+          if (!this.vuex_education.length) {
+            return this.$refs.uToast.show({
+              title: "请先进行任职学校认证",
+              type: "warning",
+            });
+          }
+          const findRow = this.vuex_education.find(
+            (x) => x.isSelected === true
+          );
+          if (!findRow) {
+            return this.$refs.uToast.show({
+              title: "请先绑定学校",
+              type: "warning",
+            });
+          }
+          if ([0, 2].includes(findRow.certifyStatus)) {
+            return this.$refs.uToast.show({
+              title: "请先进行任职学校认证",
+              type: "warning",
+            });
+          }
+        }
+
+        // 内部页面，直接跳转
+        this.$u.route({
+          url: item.url,
+        });
+      }
+    },
+
+    modalCancel() {
+      this.modalShow = false;
+    },
+
+    modalConfirm() {
+      this.modalShow = false;
+
+      // 显示加载中提示和遮罩层
+      uni.showLoading({
+        title: "正在跳转...",
+        mask: true, // 显示遮罩层，阻止用户操作
+      });
+
+      // 直接跳转到第三方页面
+      window.location.href = this.currentUrl;
+    },
+
+    // 添加统一的刷新方法，集中调用所有需要刷新的方法
+    refreshAll() {
+      this.getAlumnSearch();
+      this.getSchoolActivity();
+      this.gethelpList();
+    },
+
+    // 获取校友推荐
+    getAlumnSearch() {
+      this.$u.api.getAlumnSearch().then((res) => {
+        this.recommendUsers = res;
+      });
+    },
+
+    // 获取校园资讯
+    getSchoolActivity() {
+      this.$u.api
+        .GetSchoolList({
+          PageIndex: 1,
+          PageSize: 3,
+        })
+        .then((res) => {
+          this.schoolActivityList = res.items;
+        });
+    },
+
+    // 点击推荐人
+    toUserDetail(id) {
+      this.$u.route({
+        url: "/pages/AlumniCircle/userDetail/userDetail?id=" + id,
+      });
+    },
+
+    // 点击关注
+    handleFollow(id) {
+      const data = {
+        userId: this.vuex_user.id,
+        carewId: id,
+      };
+      this.$u.apiList.InsertOrDelFollow(data).then((res) => {
+        if (res.succeed) {
+          this.$refs.uToast.show({
+            title: "已关注！",
+            type: "success",
+          });
+        }
+        this.getAlumnSearch();
+      });
+    },
+
+    // 更多推荐人
+    toAlumniPage() {
+      this.$u.route({
+        url: "/pages/AlumniCircle/Alumni/Alumni",
+      });
+    },
+
+    // 校园资讯查看更多
+    toAlumnusPage() {
+      uni.switchTab({
+        url: "/pages/AlumniCircle/alumnus/alumnus",
+      });
+    },
+
+    // 校园资讯详情
+    toSchoolActivityDetail(item) {
+      this.currentRow = item;
+      uni.$off("echoList");
+      uni.$on("echoList", (result) => {
+        // console.log('echoList----')
+        // 收藏
+        if (result.type === "star") {
+          console.log("%c%s", "color:red", "收藏回显");
+          console.log(result, "result");
+          this.currentRow.isCllect = result.data.isCllect;
+          console.log(result.isCllect, "result.isCllect");
+          if (result.data.isCllect === true) {
+            this.currentRow.collectCount++;
+          }
+          if (result.data.isCllect === false) {
+            this.currentRow.collectCount && this.currentRow.collectCount--;
+          }
+        }
+        // 评价
+        if (result.type === "evaluate") {
+          console.log("%c%s", "color:red", "评价回显");
+          console.log(result, "result");
+          this.currentRow.commentCount = result.data.commentCount;
+        }
+      });
+      // return
+      if (this.nolink) {
+        return;
+      }
+      if (item.isDelete) {
+        return;
+      }
+      item.flag = this.flag;
+      item.route = this.route;
+      item.mytype = this.type;
+      item.myschoolId = this.id;
+      if (this.type == 3) {
+        item.mytype = item.type;
+      }
+
+      this.$u.route({
+        url: "/pages/AlumniCircle/ArticleDetails/ArticleDetails",
+        params: {
+          data: JSON.stringify(item),
+        },
+      });
+    },
+
+    // 获取校友帮帮列表
+    gethelpList() {
+      const data = {
+        PageIndex: 1,
+        PageSize: 10,
+        IsForward: true, // 传 true 过滤转发数据
+        Keyword: "全部",
+      };
+      this.helpList = [];
+
+      this.$u.api.GetHelpList(data).then((res) => {
+        this.total2 = res.total;
+        if (this.helpList.length >= this.total2) {
+          this.bottomState = true;
+          return;
+        }
+        if (this.total2 == res.items.length) {
+          this.bottomState = true;
+        }
+        this.helpList.push(...res.items);
+      });
+    },
+
+    //收藏
+    async onStar(val) {
+      console.log("收藏--");
+      // 判断当前学校是否认证，未认证不可收藏
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyPage(req);
+      console.log(JSON.parse(JSON.stringify(res)), "res");
+      const edcationList = res.edcationList;
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      const findRow = edcationList.find((x) => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "认证后可进行收藏操作",
+          type: "none",
+        });
+      }
+      const data = {
+        id: val.id,
+        type: val.type,
+      };
+      this.$u.apiList
+        .LikeCollect(data)
+        .then((res) => {
+          if (val.isCllect) {
+            if (val.collectCount > 0) {
+              val.isCllect = false;
+              val.collectCount--;
+              this.$refs.uToast.show({
+                title: "取消收藏成功",
+                type: "success",
+              });
+            }
+          } else {
+            val.isCllect = true;
+            val.collectCount++;
+            this.$refs.uToast.show({
+              title: "收藏成功",
+              type: "success",
+            });
+          }
+        })
+        .catch((err) => {
+          this.$refs.uToast.show({
+            title: "收藏失败",
+            type: "error",
+          });
+        });
+    },
+    //预览图片
+    clickImg(item) {
+      this.isonShow = false;
+      item = this.$u.http.config.imgUrl + item;
+      var images = [];
+      images.push(item);
+      uni.previewImage({
+        // 图片路径必须是一个数组 => ['']
+        current: 0,
+        urls: images,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.recommend-page {
+  .banner {
+    width: 100%;
+    height: 300rpx; // 356rpx
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin-bottom: 24rpx;
+
+    image {
+      width: 100%;
+    }
+  }
+
+  .function-icons {
+    // height: 248rpx;
+    background: #ffffff;
+    border-radius: 24rpx;
+    padding: 32rpx;
+
+    .function-list-wrapper {
+      display: flex;
+      justify-content: space-between;
+      // margin-bottom: 32rpx;
+    }
+
+    .teacher_class {
+      padding: 0 24rpx;
+    }
+
+    .function-item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      text {
+        font-size: 24rpx;
+        color: #333;
+      }
+    }
+  }
+
+  .indicator {
+    display: flex;
+    justify-content: center;
+    // margin: 20rpx 0;
+
+    .dot {
+      width: 12rpx;
+      height: 12rpx;
+      border-radius: 50%;
+      background-color: #ddd;
+      margin: 0 8rpx;
+
+      &.active {
+        background-color: #2979ff;
+        width: 20rpx;
+        border-radius: 6rpx;
+      }
+    }
+  }
+
+  .recommend-section {
+    margin-bottom: 24rpx;
+
+    .section-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 30rpx 0;
+
+      text {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+      }
+
+      .more {
+        font-size: 24rpx;
+        color: #999;
+        font-weight: normal;
+      }
+    }
+
+    .recommend-users {
+      white-space: nowrap;
+
+      .user-item {
+        display: inline-flex;
+        flex-direction: column;
+        align-items: center;
+        width: 280rpx;
+        // height: 356rpx;
+        height: 290rpx;
+        margin-right: 20rpx;
+        background-color: #fff;
+        border-radius: 16rpx;
+        padding: 20rpx;
+        position: relative;
+
+        .close-btn {
+          position: absolute;
+          right: 16rpx;
+          top: 16rpx;
+        }
+
+        .avatar {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 50%;
+          margin-bottom: 16rpx;
+        }
+
+        .name {
+          font-size: 28rpx;
+          color: #333;
+          display: block;
+          margin: 10rpx 0 20rpx;
+        }
+
+        .desc {
+          height: 70rpx;
+          margin: 10rpx 0 16rpx;
+          font-size: 24rpx;
+          color: #999;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          white-space: wrap;
+          -webkit-line-clamp: 2;
+          /* 显示2行 */
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+          /* 允许在任意字符间断行 */
+        }
+
+        .follow-btn {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 24rpx;
+          width: 230rpx;
+          height: 56rpx;
+          background: linear-gradient(
+            to bottom right,
+            #3cb5fb 0%,
+            #06e1fa 100%
+          );
+          border-radius: 28rpx;
+          color: #fff;
+        }
+
+        .followed {
+          color: rgba(0, 0, 0, 0.6);
+          // border: none;
+          background: #f6f8f9;
+        }
+      }
+    }
+  }
+
+  .campus-info-section {
+    .section-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 30rpx 0;
+
+      text {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+      }
+
+      .more {
+        font-size: 24rpx;
+        color: #999;
+        font-weight: normal;
+      }
+    }
+
+    .school-activity-list {
+      white-space: nowrap;
+
+      .school-activity-item {
+        display: inline-flex;
+        align-items: center;
+        width: 512rpx;
+        height: 232rpx;
+        margin-right: 20rpx;
+        background-color: #fff;
+        border-radius: 16rpx;
+        padding: 24rpx;
+
+        .avatar-wrapper {
+          width: 184rpx;
+          height: 184rpx;
+          margin-right: 24rpx;
+
+          .avatar {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .info-wrapper {
+          width: 256rpx;
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: flex-start;
+
+          .name {
+            font-size: 28rpx;
+            color: #1f2232;
+            font-weight: bold;
+            margin-bottom: 16rpx;
+            overflow: hidden;
+            /* 隐藏溢出内容 */
+            text-overflow: ellipsis;
+            /* 溢出显示省略号 */
+            white-space: nowrap;
+            /* 文本不换行 */
+            max-width: 100%;
+          }
+
+          .desc {
+            font-size: 24rpx;
+            line-height: 32rpx;
+            color: rgba(0, 0, 0, 0.6);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            white-space: wrap;
+            -webkit-line-clamp: 4;
+            /* 显示2行 */
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+            /* 允许在任意字符间断行 */
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/recommend/moreFriends.vue b/pages/home/home/components/recommend/moreFriends.vue
new file mode 100644
index 0000000..fcbbf2a
--- /dev/null
+++ b/pages/home/home/components/recommend/moreFriends.vue
@@ -0,0 +1,254 @@
+<template>
+  <view class="more-friends-page">
+    <u-navbar title="更多推荐好友" :border-bottom="false"></u-navbar>
+
+    <!-- 搜索框 -->
+    <view class="search-container">
+      <view class="search-box">
+        <u-icon name="search" size="40rpx" color="#999"></u-icon>
+        <input type="text" placeholder="搜索校友" v-model="searchKeyword" />
+      </view>
+    </view>
+
+    <!-- 推荐好友列表 -->
+    <view class="friends-list">
+      <view
+        class="friend-item"
+        v-for="(friend, index) in filteredFriends"
+        :key="index"
+      >
+        <!-- 头像 -->
+        <image class="avatar" :src="friend.avatar" mode="aspectFill"></image>
+
+        <!-- 用户信息 -->
+        <view class="user-info">
+          <text class="username">{{ friend.name }}</text>
+          <text class="school">{{ friend.school }}</text>
+        </view>
+
+        <!-- 关注按钮 -->
+        <view
+          class="follow-btn"
+          :class="{ followed: friend.isFollowed }"
+          @click="toggleFollow(index)"
+        >
+          {{ friend.isFollowed ? "已关注" : "关注" }}
+        </view>
+
+        <!-- 移除按钮 -->
+        <view class="remove-btn" @click="removeUser(index)">
+          <u-icon name="close" size="32rpx" color="#666"></u-icon>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "MoreFriends",
+  data() {
+    return {
+      searchKeyword: "",
+      recommendFriends: [
+        {
+          name: "小年轻",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar.png",
+          isFollowed: true,
+        },
+        {
+          name: "小年轻",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar2.png",
+          isFollowed: true,
+        },
+        {
+          name: "Alice_琛璃",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar3.png",
+          isFollowed: true,
+        },
+        {
+          name: "Alice_琛璃",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar.png",
+          isFollowed: true,
+        },
+        {
+          name: "Alice_琛璃",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar3.png",
+          isFollowed: false,
+        },
+        {
+          name: "别墨暝",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar2.png",
+          isFollowed: false,
+        },
+        {
+          name: "小六",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar.png",
+          isFollowed: false,
+        },
+        {
+          name: "小年轻",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar3.png",
+          isFollowed: false,
+        },
+        {
+          name: "别墨暝",
+          school: "浙江大学",
+          avatar: "/static/common/img/homepage/avatar2.png",
+          isFollowed: false,
+        },
+      ],
+    };
+  },
+  computed: {
+    // 过滤后的好友列表，根据搜索关键词过滤
+    filteredFriends() {
+      if (!this.searchKeyword) {
+        return this.recommendFriends;
+      }
+
+      return this.recommendFriends.filter(
+        (friend) =>
+          friend.name
+            .toLowerCase()
+            .includes(this.searchKeyword.toLowerCase()) ||
+          friend.school.toLowerCase().includes(this.searchKeyword.toLowerCase())
+      );
+    },
+  },
+  methods: {
+    // 切换关注状态
+    toggleFollow(index) {
+      this.recommendFriends[index].isFollowed =
+        !this.recommendFriends[index].isFollowed;
+
+      // 这里可以添加调用关注/取消关注API的逻辑
+      const friend = this.recommendFriends[index];
+      const action = friend.isFollowed ? "关注" : "取消关注";
+
+      uni.showToast({
+        title: `${action}成功`,
+        icon: "none",
+      });
+    },
+
+    // 移除用户
+    removeUser(index) {
+      uni.showModal({
+        // title: "提示",
+        content: "确定不再推荐此用户吗？",
+        success: (res) => {
+          if (res.confirm) {
+            this.recommendFriends.splice(index, 1);
+            uni.showToast({
+              title: "已移除此推荐",
+              icon: "none",
+            });
+          }
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.more-friends-page {
+  min-height: 100vh;
+  background-color: #fff;
+  padding-bottom: 30rpx;
+
+  // 搜索框样式
+  .search-container {
+    padding: 20rpx 30rpx;
+
+    .search-box {
+      background-color: #f5f5f5;
+      border-radius: 36rpx;
+      padding: 16rpx 30rpx;
+      display: flex;
+      align-items: center;
+
+      input {
+        flex: 1;
+        margin-left: 16rpx;
+        font-size: 28rpx;
+        color: #333;
+      }
+    }
+  }
+
+  // 好友列表样式
+  .friends-list {
+    .friend-item {
+      display: flex;
+      align-items: center;
+      padding: 24rpx 30rpx;
+      // border-bottom: 1px solid #f5f5f5;
+
+      // 头像样式
+      .avatar {
+        width: 88rpx;
+        height: 88rpx;
+        border-radius: 50%;
+        margin-right: 24rpx;
+      }
+
+      // 用户信息样式
+      .user-info {
+        display: flex;
+        align-items: center;
+        flex: 1;
+
+        .username {
+          font-size: 28rpx;
+          font-weight: bold;
+          color: rgba(0, 0, 0, 0.9);
+          display: block;
+          margin-bottom: 8rpx;
+          margin-right: 24rpx;
+        }
+
+        .school {
+          font-size: 24rpx;
+          color: #3cb5fb;
+          background-color: rgba(41, 151, 255, 0.1);
+          padding: 4rpx 12rpx;
+          border-radius: 200rpx;
+        }
+      }
+
+      // 关注按钮样式
+      .follow-btn {
+        width: 120rpx;
+        height: 64rpx;
+        line-height: 64rpx;
+        text-align: center;
+        font-size: 28rpx;
+        border-radius: 36rpx;
+        margin-right: 24rpx;
+        color: #3cb5fb;
+        border: 1rpx solid #3cb5fb;
+
+        &.followed {
+          color: rgba(0, 0, 0, 0.2);
+          border: 1rpx solid rgba(0, 0, 0, 0.2);
+        }
+      }
+
+      // 移除按钮样式
+      .remove-btn {
+        padding: 10rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/searchPage/index.vue b/pages/home/home/components/searchPage/index.vue
new file mode 100644
index 0000000..5a0144c
--- /dev/null
+++ b/pages/home/home/components/searchPage/index.vue
@@ -0,0 +1,346 @@
+<template>
+  <view class="search-page">
+    <!-- 头部搜索区域 -->
+    <view class="search-header">
+      <!-- 返回按钮 -->
+      <view class="back-btn" @click="goBack">
+        <image
+          src="/static/common/img/homepage/icon-back.png"
+          mode="widthFix"
+          style="width: 48rpx; height: 48rpx"
+        ></image>
+      </view>
+
+      <!-- 搜索输入框 -->
+      <view class="search-input">
+        <u-icon name="search" size="36rpx" color="#999"></u-icon>
+        <input
+          type="text"
+          v-model="searchValue"
+          placeholder="搜索"
+          confirm-type="search"
+          @confirm="handleSearch"
+          focus
+          clearable
+        />
+        <u-icon
+          v-if="searchValue"
+          name="close"
+          size="36rpx"
+          color="#999"
+          @click="clearSearch"
+        ></u-icon>
+      </view>
+
+      <!-- 右侧功能图标 -->
+      <!-- <view class="action-btns">
+        <u-icon name="more-dot-fill" size="44rpx" color="#333"></u-icon>
+        <u-icon name="plus-circle" size="44rpx" color="#333" class="ml-20"></u-icon>
+      </view> -->
+    </view>
+
+    <!-- 历史记录区域 -->
+    <view class="search-history">
+      <view class="history-header">
+        <text class="section-title">历史记录</text>
+        <!-- <u-icon
+          name="trash"
+          size="40rpx"
+          color="#999"
+        ></u-icon> -->
+        <image
+          src="/static/common/img/homepage/icon-delete.png"
+          mode="widthFix"
+          style="width: 48rpx; height: 48rpx"
+          @click="clearHistory"
+        ></image>
+      </view>
+
+      <!-- 历史标签列表 -->
+      <view class="history-tags">
+        <view
+          class="tag-item"
+          v-for="(tag, index) in historyTags"
+          :key="index"
+          @click="searchByTag(tag)"
+        >
+          {{ tag }}
+        </view>
+
+        <view class="tag-item more" @click="toggleMoreTags">
+          <u-icon name="arrow-down" size="28rpx" color="#333"></u-icon>
+        </view>
+      </view>
+    </view>
+
+    <!-- 猜你想搜区域 -->
+    <view class="search-suggestion">
+      <view class="suggestion-header">
+        <text class="section-title">猜你想搜</text>
+        <!-- <u-icon name="reload" size="36rpx" color="#999"></u-icon> -->
+        <image
+          src="/static/common/img/homepage/icon-refresh.png"
+          mode="widthFix"
+          style="width: 48rpx; height: 48rpx"
+          @click="refreshSuggestions"
+        ></image>
+      </view>
+
+      <!-- 推荐搜索列表 -->
+      <view class="suggestion-list">
+        <view
+          class="suggestion-item"
+          v-for="(item, index) in suggestions"
+          :key="index"
+          @click="searchByTag(item)"
+        >
+          {{ item }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "SearchPage",
+
+  data() {
+    return {
+      searchValue: "",
+      historyTags: [
+        "时尚",
+        "游戏",
+        "南小翼",
+        "返校预约",
+        "查询档案",
+        "查询档案",
+        "校友卡",
+      ],
+      suggestions: [
+        "友问答租属小京跳舞",
+        "哪吒cos自创",
+        "真人机甲对战",
+        "马克摩音乐完整版",
+        "跑步心率最高多少",
+        "友问答租属小京跳舞",
+      ],
+    };
+  },
+
+  methods: {
+    // 返回上一页
+    goBack() {
+      uni.navigateBack();
+    },
+
+    // 处理搜索
+    handleSearch() {
+      if (!this.searchValue.trim()) return;
+
+      // 添加到历史记录
+      if (!this.historyTags.includes(this.searchValue)) {
+        this.historyTags.unshift(this.searchValue);
+        // 保留最近的10条记录
+        if (this.historyTags.length > 10) {
+          this.historyTags = this.historyTags.slice(0, 10);
+        }
+        // 保存到本地存储
+        uni.setStorageSync("searchHistory", JSON.stringify(this.historyTags));
+      }
+
+      // 执行搜索
+      this.doSearch(this.searchValue);
+    },
+
+    // 清空搜索框
+    clearSearch() {
+      this.searchValue = "";
+    },
+
+    // 清空历史记录
+    clearHistory() {
+      uni.showModal({
+        // title: "提示",
+        content: "确定清空搜索历史？",
+        success: (res) => {
+          if (res.confirm) {
+            this.historyTags = [];
+            uni.removeStorageSync("searchHistory");
+            uni.showToast({
+              title: "已清空历史记录",
+              icon: "none",
+            });
+          }
+        },
+      });
+    },
+
+    // 使用标签搜索
+    searchByTag(tag) {
+      this.searchValue = tag;
+      this.handleSearch();
+    },
+
+    // 切换更多标签
+    toggleMoreTags() {
+      // 这里可以实现展开更多历史标签的逻辑
+      uni.showToast({
+        title: "展开更多标签",
+        icon: "none",
+      });
+    },
+
+    // 刷新推荐
+    refreshSuggestions() {
+      // 这里可以实现刷新推荐搜索的逻辑
+      uni.showToast({
+        title: "已刷新推荐",
+        icon: "none",
+      });
+
+      // 模拟刷新效果
+      this.suggestions = this.suggestions.sort(() => Math.random() - 0.5);
+    },
+
+    // 执行搜索
+    doSearch(keyword) {
+      console.log("搜索:", keyword);
+      // 这里可以跳转到搜索结果页或者显示搜索结果
+      uni.showToast({
+        title: `搜索: ${keyword}`,
+        icon: "none",
+      });
+    },
+  },
+
+  onLoad() {
+    // 从本地存储加载历史记录
+    const history = uni.getStorageSync("searchHistory");
+    if (history) {
+      try {
+        this.historyTags = JSON.parse(history);
+      } catch (e) {
+        console.error("解析历史记录失败:", e);
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.search-page {
+  min-height: 100vh;
+  background-color: #ffffff;
+  padding: 0 24rpx;
+
+  // 头部搜索区域
+  .search-header {
+    display: flex;
+    align-items: center;
+    padding: 20rpx 0;
+
+    .back-btn {
+      margin-right: 24rpx;
+    }
+
+    .search-input {
+      width: 380rpx;
+      height: 72rpx;
+      background-color: #f0f0f0;
+      border-radius: 36rpx;
+      display: flex;
+      align-items: center;
+      padding: 0 20rpx;
+
+      input {
+        flex: 1;
+        height: 100%;
+        font-size: 28rpx;
+        margin: 0 16rpx;
+      }
+    }
+
+    .action-btns {
+      display: flex;
+      margin-left: 20rpx;
+
+      .ml-20 {
+        margin-left: 20rpx;
+      }
+    }
+  }
+
+  // 历史记录区域
+  .search-history {
+    margin-top: 30rpx;
+
+    .history-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 24rpx;
+
+      .section-title {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+      }
+    }
+
+    .history-tags {
+      display: flex;
+      flex-wrap: wrap;
+
+      .tag-item {
+        height: 64rpx;
+        padding: 0 30rpx;
+        background-color: #fff;
+        border-radius: 32rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 26rpx;
+        color: #333;
+        margin-right: 20rpx;
+        margin-bottom: 20rpx;
+        border: 2rpx solid rgba(0, 0, 0, 0.1);
+
+        &.more {
+          padding: 0;
+          width: 64rpx;
+        }
+      }
+    }
+  }
+
+  // 猜你想搜区域
+  .search-suggestion {
+    margin-top: 40rpx;
+
+    .suggestion-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 24rpx;
+
+      .section-title {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+      }
+    }
+
+    .suggestion-list {
+      display: flex;
+      flex-wrap: wrap;
+      .suggestion-item {
+        width: 50%;
+        padding: 10rpx 0;
+        font-size: 28rpx;
+        color: #333;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/topic/index.vue b/pages/home/home/components/topic/index.vue
new file mode 100644
index 0000000..828fef0
--- /dev/null
+++ b/pages/home/home/components/topic/index.vue
@@ -0,0 +1,310 @@
+<template>
+  <!-- 首页-话题组件 -->
+  <view class="topic-page">
+    <!-- 顶部分类标签 -->
+    <scroll-view scroll-x class="category-tabs" show-scrollbar="false">
+      <view 
+        v-for="(item, index) in categories" 
+        :key="index"
+        class="tab-item"
+        :class="{ active: activeTab === index }"
+        @click="switchTab(item,index)"
+        :style="{ backgroundImage: `url(${item.image})` }"
+      >
+        <view class="tab-overlay"></view>
+        <text>{{ item.name }}</text>
+        <text class="sub-text">{{ item.subtitle }}</text>
+      </view>
+    </scroll-view>
+
+    <!-- 热门话题区域 -->
+    <view class="hot-topics-container">
+      <view class="section-title">热门话题</view>
+      <view class="hot-topics">
+        <!-- 使用循环渲染热门话题项目 -->
+        <view
+          class="topic-item"
+          v-for="(item, index) in hotTopics"
+          :key="index"
+        >
+          <view class="tag-text">#</view>
+
+          <view>
+            <view class="topic-tag">
+              <text class="tag-title">{{ item.title }}</text>
+              <text
+                v-if="item.tag"
+                class="tag-hot"
+                :class="{ orange: item.tag === '新' }"
+                >{{ item.tag }}</text
+              >
+            </view>
+            <view class="topic-desc">{{ item.description }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 关注的话题区域 -->
+    <view class="followed-topics-container">
+      <view class="section-title">关注的话题</view>
+      <view class="followed-topics">
+        <!-- 使用循环渲染关注话题项目 -->
+        <view
+          class="followed-topic-item"
+          v-for="(item, index) in followedTopics"
+          :key="index"
+        >
+          <image
+            class="topic-image"
+            :src="item.image"
+            mode="aspectFill"
+          ></image>
+          <view class="topic-content">
+            <view class="topic-title">{{ item.title }}</view>
+            <view class="topic-subtitle">{{ item.subtitle }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "Topic",
+  data() {
+    return {
+      activeTab: 0,
+      categories: [
+        {
+          name: "广场",
+          subtitle: "全部话题",
+          image: "/static/common/img/homepage/image-photo1.png",
+        },
+        {
+          name: "游戏",
+          subtitle: "一起开黑",
+          image: "/static/common/img/homepage/image-photo2.png",
+        },
+        {
+          name: "学习",
+          subtitle: "天天向上",
+          image: "/static/common/img/homepage/image-photo1.png",
+        },
+        {
+          name: "社交",
+          subtitle: "校园交友",
+          image: "/static/common/img/homepage/image-photo2.png",
+        },
+      ],
+      hotTopics: [
+        { title: "准大学生你好", description: "开学季来了", tag: "热" },
+        { title: "准大学生你好", description: "开学季来了", tag: "热" },
+        { title: "军训晒黑了吗", description: "各大高校谁最黑", tag: "热" },
+        { title: "军训晒黑了吗", description: "各大高校谁最黑", tag: "新" },
+        { title: "防晒霜推荐", description: "我是最靓的仔" },
+        { title: "防晒霜推荐", description: "我是最靓的仔" },
+      ],
+      followedTopics: [
+        {
+          image: "/static/common/img/homepage/image-photo1.png",
+          title: "看到最文艺的话",
+          subtitle: "生活中常见的文艺文字...",
+        },
+        {
+          image: "/static/common/img/homepage/image-photo2.png",
+          title: "用来装通的冷知识",
+          subtitle: "不知道的冷知识，还怎么装...",
+        },
+      ],
+    };
+  },
+  methods: {
+    switchTab(item,index) {
+      this.activeTab = index;
+
+
+      console.log(item, index);
+      if(index == 0){
+        this.$u.route({
+          url: "/pages/home/home/components/topic/topicSquare",
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.topic-page {
+  padding: 24rpx 8rpx 0;
+
+  // 顶部分类标签
+  .category-tabs {
+    display: flex;
+    white-space: nowrap;
+    margin: 20rpx 0;
+
+    .tab-item {
+      display: inline-flex;
+      flex-direction: column;
+      align-items: flex-start;
+      justify-content: center;
+      border-radius: 18rpx;
+      padding-left: 32rpx;
+      margin-right: 20rpx;
+      width: 200rpx;
+      height: 160rpx;
+      position: relative;
+      background-size: cover;
+      background-position: center;
+      overflow: hidden;
+      
+      // 添加覆盖层，用于控制背景图片亮度和颜色
+      .tab-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(230, 247, 252, 0.55); // 基础背景色带透明度
+        z-index: 1;
+      }
+      
+      &.active .tab-overlay {
+        background-color: rgba(0, 194, 255, 0.85); // 激活状态的背景色带透明度
+      }
+
+      text {
+        font-size: 32rpx;
+        color: #333;
+        // font-weight: 600;
+        position: relative; // 确保文字在覆盖层之上
+        z-index: 2;
+      }
+
+      .sub-text {
+        font-size: 24rpx;
+        color: #666;
+        margin-top: 10rpx;
+        position: relative; // 确保文字在覆盖层之上
+        z-index: 2;
+      }
+
+      &.active {
+        text,
+        .sub-text {
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  // 公共部分标题样式
+  .section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+    height: 100rpx;
+    line-height: 100rpx;
+  }
+
+  .hot-topics-container {
+    background-color: #fff;
+    padding: 0 24rpx 24rpx 32rpx;
+    border-radius: 24rpx;
+
+    // 热门话题区域
+    .hot-topics {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+
+      .topic-item {
+        width: 49%;
+        margin-bottom: 24rpx;
+        display: flex;
+
+        .tag-text {
+          color: #00c2ff;
+          font-weight: bold;
+          margin-right: 12rpx;
+        }
+
+        .topic-tag {
+          display: flex;
+          align-items: center;
+
+          .tag-title {
+            font-size: 32rpx;
+            color: #1f2232;
+            font-weight: 500;
+          }
+
+          .tag-hot {
+            font-size: 22rpx;
+            color: #fff;
+            background-color: #ff4d4f;
+            border-radius: 8rpx;
+            padding: 2rpx 8rpx;
+            margin-left: 12rpx;
+
+            &.orange {
+              background-color: #ff9500;
+            }
+          }
+        }
+
+        .topic-desc {
+          font-size: 24rpx;
+          color: rgba(0, 0, 0, 0.6);
+          margin-top: 12rpx;
+        }
+      }
+    }
+  }
+
+  // 关注的话题区域
+  .followed-topics-container {
+    background-color: #fff;
+    padding: 0 24rpx 24rpx 32rpx;
+    border-radius: 24rpx;
+    margin-top: 24rpx;
+    .followed-topics {
+      .followed-topic-item {
+        display: flex;
+        align-items: center;
+        padding: 20rpx 0;
+        border-bottom: 1px solid #f6f8f9;
+
+        .topic-image {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 12rpx;
+          margin-right: 20rpx;
+        }
+
+        .topic-content {
+          flex: 1;
+
+          .topic-title {
+            font-size: 28rpx;
+            color: #333;
+            font-weight: 500;
+            margin-bottom: 10rpx;
+          }
+
+          .topic-subtitle {
+            font-size: 24rpx;
+            color: #999;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/components/topic/topicDetail.vue b/pages/home/home/components/topic/topicDetail.vue
new file mode 100644
index 0000000..ee9891f
--- /dev/null
+++ b/pages/home/home/components/topic/topicDetail.vue
@@ -0,0 +1,300 @@
+<template>
+  <view class="topic-detail-page">
+    <u-navbar
+      title=""
+      :border-bottom="false"
+      back-icon-color="#fff"
+      :background="{ background: 'transparent' }"
+    ></u-navbar>
+
+    <!-- 话题头部信息 -->
+    <view class="topic-header">
+      <!-- 话题标题和描述 -->
+      <view class="topic-info">
+        <!-- 话题缩略图 -->
+        <image
+          class="topic-thumbnail"
+          src="/static/common/img/homepage/image-photo1.png"
+          mode="aspectFill"
+        ></image>
+
+        <view class="topic-info-content">
+          <view class="topic-title">
+            <text class="hash">#</text>看到最文艺的话
+          </view>
+          <view class="topic-description">
+            生活中经常看到的文艺的文字，记录下来，摒组品体其中的每一个字眼，生活中经常看到的文艺的文字，记录下来，
+          </view>
+        </view>
+      </view>
+
+      <view class="topic-stats-container">
+        <!-- 话题统计 -->
+        <view class="topic-stats">
+          <text class="stat-item">233267关注</text>
+          <text class="stat-item">25216动态</text>
+        </view>
+
+        <!-- 关注按钮 -->
+        <view class="follow-btn">
+          <u-icon name="plus" size="22rpx" color="#fff"></u-icon> 关注
+        </view>
+      </view>
+    </view>
+
+    <!-- 内容分类标签 -->
+    <view class="nav-container">
+      <view
+        v-for="(item, index) in tabs"
+        :key="index"
+        class="nav-item"
+        :class="{ active: activeTab === index }"
+        @click="switchTab(index)"
+      >
+        {{ item }}
+        <view v-if="activeTab === index" class="active-line"></view>
+      </view>
+    </view>
+
+    <!-- 话题内容列表 -->
+    <view class="topic-content">
+      <!-- 这里可以放置话题内容列表组件 -->
+      <content-card
+        v-for="(card, index) in contentCards"
+        :key="index"
+        :cardData="card"
+      ></content-card>
+    </view>
+  </view>
+</template>
+
+<script>
+import ContentCard from "@/components/ContentCard.vue";
+
+export default {
+  name: "TopicDetail",
+  components: {
+    ContentCard,
+  },
+  data() {
+    return {
+      topic: {
+        id: "1",
+        title: "看到最文艺的话",
+        description:
+          "生活中经常看到的文艺的文字，记录下来，摒组品体其中的每一个字眼，",
+        followers: 233267,
+        posts: 25216,
+        isFollowed: false,
+        thumbnail: "/static/common/img/homepage/image-photo1.png",
+      },
+      activeTab: 0,
+      tabs: ["推荐", "最新"],
+
+      // 内容卡片数据
+      contentCards: [
+        // 图片类型卡片示例
+        {
+          user: {
+            avatar: "/static/common/img/homepage/avatar3.png",
+            name: "calista33",
+            meta: "2小时前 北京大学",
+          },
+          content: "今日份走停停的小确幸。",
+          type: "image",
+          images: [
+            "/static/common/img/homepage/image-photo1.png",
+            "/static/common/img/homepage/image-photo2.png",
+            "/static/common/img/homepage/image-photo3.png",
+          ],
+          stats: {
+            forward: 102,
+            comment: 102,
+            like: 212,
+            favorite: 62,
+          },
+        },
+        // 视频类型卡片示例
+        {
+          user: {
+            avatar: "/static/common/img/homepage/avatar.png",
+            name: "Kohaku",
+            meta: "2小时前 北京大学",
+          },
+          content: "看看我拍的这个视频•",
+          type: "video",
+          cover: "/static/images/video-cover.png",
+          videoUrl: "https://example.com/video.mp4",
+          duration: 145, // 2分25秒
+          stats: {
+            forward: 102,
+            comment: 102,
+            like: 212,
+            favorite: 62,
+          },
+        },
+      ],
+    };
+  },
+  methods: {
+    switchTab(index) {
+      this.activeTab = index;
+    },
+
+    toggleFollow() {
+      this.topic.isFollowed = !this.topic.isFollowed;
+
+      // 这里可以调用关注/取消关注的API
+      uni.showToast({
+        title: this.topic.isFollowed ? "已关注" : "已取消关注",
+        icon: "none",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.topic-detail-page {
+  width: 100%;
+  min-height: 100vh;
+  background: url("/static/common/img/homepage/image-topic-bg.png") no-repeat
+    top center;
+  background-size: 100% 592rpx;
+
+  // 话题头部信息
+  .topic-header {
+    padding: 40rpx;
+    display: flex;
+    flex-direction: column;
+
+    // 话题信息
+    .topic-info {
+      //   flex: 1;
+      display: flex;
+      //   align-items: center;
+      color: #fff;
+      margin-bottom: 24rpx;
+
+      // 话题缩略图
+      .topic-thumbnail {
+        width: 140rpx;
+        height: 140rpx;
+        border-radius: 16rpx;
+        overflow: hidden;
+        margin-right: 24rpx;
+      }
+
+      .topic-info-content {
+        width: calc(100% - 180rpx);
+
+        .topic-title {
+          font-size: 32rpx;
+          font-weight: bold;
+          margin-bottom: 16rpx;
+
+          .hash {
+            font-weight: normal;
+            margin-right: 4rpx;
+          }
+        }
+
+        .topic-description {
+          font-size: 24rpx;
+          color: rgba(255, 255, 255, 0.8);
+          line-height: 1.5;
+          display: -webkit-box;
+          white-space: wrap;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+    }
+
+    .topic-stats-container {
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .topic-stats {
+        font-size: 24rpx;
+        color: #ffffff;
+
+        .stat-item {
+          margin-right: 30rpx;
+        }
+      }
+
+      // 关注按钮
+      .follow-btn {
+        width: 120rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        text-align: center;
+        font-size: 24rpx;
+        color: #fff;
+        background: linear-gradient(178deg, #3cb5fb 0%, #06e1fa 100%);
+        border-radius: 30rpx;
+      }
+    }
+  }
+
+  // 内容分类标签
+  .nav-container {
+    width: 100%;
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 30rpx 30rpx 0 0;
+    background-color: #fff;
+    padding: 0 20rpx;
+    display: inline-flex;
+  }
+
+  .nav-item {
+    display: inline-block;
+    width: auto;
+    min-width: 120rpx;
+    padding: 0 20rpx;
+    text-align: center;
+    font-size: 32rpx;
+    color: #666;
+    position: relative;
+    z-index: 20;
+    transition: all 0.3s ease; /* 添加过渡效果 */
+    transform-origin: center bottom; /* 设置变换原点在底部中心 */
+
+    &.active {
+      color: #333;
+      font-weight: bold;
+    }
+
+    .active-line {
+      position: absolute;
+      left: 50%; /* 将左边距设为50% */
+      transform: translateX(-50%); /* 向左偏移自身宽度的50%，实现水平居中 */
+      bottom: 25rpx;
+      width: 60rpx;
+      height: 12rpx;
+      background: linear-gradient(
+        116deg,
+        rgba(60, 181, 251, 0) 0%,
+        #28c6fb 45%,
+        #06e1fa 100%
+      );
+      border-radius: 2rpx;
+      z-index: -1;
+    }
+  }
+
+  // 话题内容区域
+  .topic-content {
+    background-color: #f6f8f9;
+    height: 830rpx;
+    overflow-y: auto;
+    padding: 24rpx;
+  }
+}
+</style>
diff --git a/pages/home/home/components/topic/topicSquare.vue b/pages/home/home/components/topic/topicSquare.vue
new file mode 100644
index 0000000..5940cb6
--- /dev/null
+++ b/pages/home/home/components/topic/topicSquare.vue
@@ -0,0 +1,345 @@
+<template>
+  <view class="topic-square-page">
+    <u-navbar title="话题广场" :border-bottom="false"></u-navbar>
+
+    <!-- 搜索框 -->
+    <view class="search-container">
+      <view class="search-box">
+        <u-icon name="search" size="40rpx" color="#999"></u-icon>
+        <input
+          type="text"
+          placeholder="搜索要查找的话题"
+          v-model="searchKeyword"
+        />
+      </view>
+      <view class="search-add-btn">
+        <u-icon name="plus" size="40rpx" color="#333"></u-icon>
+      </view>
+    </view>
+
+    <!-- 类别导航 -->
+    <scroll-view
+      scroll-x
+      class="category-nav"
+      :show-scrollbar="false"
+      :enhanced="true"
+      :paging-enabled="false"
+    >
+      <view class="nav-container">
+        <view
+          v-for="(item, index) in categories"
+          :key="index"
+          class="nav-item"
+          :class="{ active: activeCategory === index }"
+          @click="switchCategory(index)"
+        >
+          {{ item }}
+          <view v-if="activeCategory === index" class="active-line"></view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 话题列表 -->
+    <view class="topic-list">
+      <view
+        class="topic-item"
+        v-for="(item, index) in filteredTopics"
+        :key="index"
+        @click="goToTopicDetail(item)"
+      >
+        <!-- 话题图片 -->
+        <image class="topic-image" :src="item.image" mode="aspectFill"></image>
+
+        <!-- 话题内容 -->
+        <view class="topic-content">
+          <view class="topic-title">{{ item.title }}</view>
+          <view class="topic-desc">{{ item.description }}</view>
+        </view>
+
+        <!-- 关注按钮 -->
+        <view
+          class="follow-btn"
+          :class="{ followed: item.isFollowed }"
+          @click="toggleFollow(index)"
+        >
+          <view v-if="item.isFollowed">已关注</view>
+          <view v-else
+            ><u-icon name="plus" size="22rpx" color="#fff"></u-icon> 关注</view
+          >
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "TopicSquare",
+  data() {
+    return {
+      searchKeyword: "",
+      activeCategory: 0,
+      categories: [
+        "全部",
+        "学校",
+        "社团",
+        "学习",
+        "游戏",
+        "恋爱",
+        "生活",
+        "其他",
+      ],
+      topics: [
+        {
+          title: "看到最文艺的话",
+          description: "生活中常见的文艺文字...",
+          image: "/static/common/img/homepage/image-photo1.png",
+          isFollowed: true,
+          category: 0,
+        },
+        {
+          title: "看到最文艺的话",
+          description: "生活中常见的文艺文字...",
+          image: "/static/common/img/homepage/image-photo2.png",
+          isFollowed: true,
+          category: 1,
+        },
+        {
+          title: "用来装通的冷知识",
+          description: "不知道的冷知识，还怎么装...",
+          image: "/static/common/img/homepage/image-photo3.png",
+          isFollowed: true,
+          category: 2,
+        },
+        {
+          title: "看到最文艺的话",
+          description: "生活中常见的文艺文字...",
+          image: "/static/common/img/homepage/image-photo1.png",
+          isFollowed: false,
+          category: 3,
+        },
+        {
+          title: "用来装通的冷知识",
+          description: "不知道的冷知识，还怎么装...",
+          image: "/static/common/img/homepage/image-photo2.png",
+          isFollowed: false,
+          category: 4,
+        },
+        {
+          title: "看到最文艺的话",
+          description: "生活中常见的文艺文字...",
+          image: "/static/common/img/homepage/image-photo3.png",
+          isFollowed: false,
+          category: 0,
+        },
+        {
+          title: "看到最文艺的话",
+          description: "生活中常见的文艺文字...",
+          image: "/static/common/img/homepage/image-photo2.png",
+          isFollowed: false,
+          category: 1,
+        },
+      ],
+    };
+  },
+  computed: {
+    filteredTopics() {
+      // 先按分类筛选
+      let result = this.topics;
+      if (this.activeCategory !== 0) {
+        result = result.filter(
+          (topic) => topic.category === this.activeCategory
+        );
+      }
+
+      // 再按搜索关键词筛选
+      if (this.searchKeyword.trim()) {
+        const keyword = this.searchKeyword.toLowerCase();
+        result = result.filter(
+          (topic) =>
+            topic.title.toLowerCase().includes(keyword) ||
+            topic.description.toLowerCase().includes(keyword)
+        );
+      }
+
+      return result;
+    },
+  },
+  methods: {
+    // 切换分类
+    switchCategory(index) {
+      this.activeCategory = index;
+    },
+
+    // 切换关注状态
+    toggleFollow(index) {
+      const topicIndex = this.topics.findIndex(
+        (topic) => topic === this.filteredTopics[index]
+      );
+      if (topicIndex !== -1) {
+        this.topics[topicIndex].isFollowed =
+          !this.topics[topicIndex].isFollowed;
+
+        // 这里可以添加关注/取消关注的API调用
+        uni.showToast({
+          title: this.topics[topicIndex].isFollowed ? "已关注" : "已取消关注",
+          icon: "none",
+        });
+      }
+    },
+
+    // 跳转话题详情
+    goToTopicDetail(item) {
+      this.$u.route({
+        url: `/pages/home/home/components/topic/topicDetail`,
+        // url: `/pages/home/home/components/topic/topicDetail?topicId=${item.id}`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.topic-square-page {
+  min-height: 100vh;
+  background-color: #fff;
+
+  // 搜索框样式
+  .search-container {
+    padding: 20rpx 30rpx;
+    display: flex;
+    align-items: center;
+
+    .search-box {
+      flex: 1;
+      background-color: #f5f5f5;
+      border-radius: 36rpx;
+      padding: 16rpx 30rpx;
+      display: flex;
+      align-items: center;
+
+      input {
+        flex: 1;
+        margin-left: 16rpx;
+        font-size: 28rpx;
+        color: #333;
+      }
+    }
+
+    .search-add-btn {
+      background-color: #f5f5f5;
+      width: 72rpx;
+      height: 72rpx;
+      border-radius: 36rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-left: 20rpx;
+    }
+  }
+
+  // 类别导航样式
+  .category-nav {
+    white-space: nowrap;
+    margin: 20rpx 0;
+
+    .nav-container {
+      padding: 0 20rpx;
+      display: inline-flex;
+    }
+
+    .nav-item {
+      display: inline-block;
+      width: auto;
+      min-width: 120rpx;
+      padding: 0 20rpx;
+      text-align: center;
+      font-size: 32rpx;
+      color: #666;
+      position: relative;
+      z-index: 20;
+      transition: all 0.3s ease; /* 添加过渡效果 */
+      transform-origin: center bottom; /* 设置变换原点在底部中心 */
+
+      &.active {
+        color: #333;
+        font-weight: bold;
+      }
+
+      .active-line {
+        position: absolute;
+        left: 50%; /* 将左边距设为50% */
+        transform: translateX(-50%); /* 向左偏移自身宽度的50%，实现水平居中 */
+        bottom: 4rpx;
+        width: 60rpx;
+        height: 12rpx;
+        background: linear-gradient(
+          116deg,
+          rgba(60, 181, 251, 0) 0%,
+          #28c6fb 45%,
+          #06e1fa 100%
+        );
+        border-radius: 2rpx;
+        z-index: -1;
+      }
+    }
+  }
+
+  // 话题列表样式
+  .topic-list {
+    padding: 20rpx 36rpx;
+
+    .topic-item {
+      display: flex;
+      align-items: center;
+      padding: 30rpx 0;
+      background-color: #fff;
+      border-radius: 12rpx;
+      border-bottom: 1rpx solid #f6f8f9;
+
+      .topic-image {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 12rpx;
+        margin-right: 20rpx;
+      }
+
+      .topic-content {
+        flex: 1;
+
+        .topic-title {
+          font-size: 32rpx;
+          color: #1f2232;
+          //   font-weight: bold;
+          margin-bottom: 8rpx;
+        }
+
+        .topic-desc {
+          font-size: 24rpx;
+          color: #999;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+
+      .follow-btn {
+        width: 104rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        text-align: center;
+        font-size: 24rpx;
+        color: #fff;
+        background: linear-gradient(178deg, #3cb5fb 0%, #06e1fa 100%);
+        border-radius: 30rpx;
+
+        &.followed {
+          color: rgba(0, 0, 0, 0.9);
+          background: #fff;
+          border: 1rpx solid rgba(0, 0, 0, 0.15);
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/home/home/home.vue b/pages/home/home/home.vue
new file mode 100644
index 0000000..27c519e
--- /dev/null
+++ b/pages/home/home/home.vue
@@ -0,0 +1,243 @@
+<template>
+  <view class="home-page">
+    <!-- 顶部搜索栏 5/20 隐藏 -->
+    <view class="home-search" @click="goSearch">
+      <u-search
+        placeholder="搜索"
+        search-icon="search"
+        :show-action="false"
+        bg-color="#fff"
+      >
+      </u-search>
+    </view>
+
+    <!-- 顶部导航栏 5/20 隐藏 -->
+    <!-- <view class="nav-tabs">
+      <view
+        v-for="(item, index) in tabList"
+        :key="index"
+        class="tab"
+        :class="{ active: currentTab === index }"
+        @click="switchTab(index)"
+      >
+        {{ item }}
+        <view v-if="currentTab === index" class="active-line"></view>
+      </view>
+    </view> -->
+
+    <!-- 推荐组件 -->
+    <recommend v-if="currentTab === 0" ref="recommendComp"></recommend>
+
+    <!-- 本校组件 -->
+    <our-school
+      v-if="false && currentTab === 1"
+      ref="ourSchoolComp"
+    ></our-school>
+
+    <!-- 校园资讯组件 -->
+    <campus-info
+      v-if="false && currentTab === 2"
+      ref="campusInfoComp"
+    ></campus-info>
+
+    <!-- 话题组件 -->
+    <topic v-if="false && currentTab === 3" ref="topicComp"></topic>
+
+    <!-- 空盒子 -->
+    <view class="empty-box"></view>
+
+    <u-tabbar
+      :list="vuex_tabbar"
+      :class="{ phone: vuex_iPhone }"
+      :active-color="vuex_tabbar_config.activeColor"
+      :inactive-color="vuex_tabbar_config.inactiveColor"
+    ></u-tabbar>
+  </view>
+</template>
+
+<script>
+import Recommend from "./components/recommend/index.vue";
+import OurSchool from "./components/ourSchool/index.vue";
+import CampusInfo from "./components/campusInfo/index.vue";
+import Topic from "./components/topic/index.vue";
+
+export default {
+  components: {
+    Recommend,
+    OurSchool,
+    CampusInfo,
+    Topic,
+  },
+  data() {
+    return {
+      currentTab: 0,
+      tabList: ["推荐", "本校", "校园资讯", "话题"],
+
+      // 定义不同标签对应的背景色
+      tabBackgrounds: [
+        "linear-gradient(180deg, #b6e4ff 0%, #f6f8f9 45%, #f6f8f9 100%)", // 推荐
+        "linear-gradient( 180deg, #c2e8fe 0%, #F6F8F9 15%, #F6F8F9 45%, #F6F8F9 100%)", // 其他
+      ],
+
+      // 定义tab对应的组件ref和刷新方法
+      tabConfig: [
+        { ref: "recommendComp", refreshMethod: "refreshAll" },
+        { ref: "ourSchoolComp", refreshMethod: "refreshAll" },
+        { ref: "campusInfoComp", refreshMethod: "refreshAll" },
+        { ref: "topicComp", refreshMethod: "refreshAll" },
+      ],
+      EdcationList: [], // 教育经历列表
+      schoolName: "", // 学校名称
+    };
+  },
+  onLoad(e) {},
+  onShow() {
+    // 页面显示时刷新当前tab
+    this.refreshCurrentTab();
+    // 获取教育经历
+    this.getEducation();
+  },
+  computed: {
+    // 计算当前页面样式
+    pageStyle() {
+      return {
+        background:
+          this.currentTab === 0
+            ? this.tabBackgrounds[0]
+            : this.tabBackgrounds[1],
+      };
+    },
+  },
+  methods: {
+    // 5/20 隐藏
+    // switchTab(index) {
+    //   this.currentTab = index;
+
+    //   // 刷新当前选中的tab
+    //   this.refreshCurrentTab();
+    // },
+
+    // 5/20 隐藏
+    // 2/28 放开
+    goSearch() {
+      // console.log("goSearch");
+      // this.$u.route({
+      //   url: "/pages/home/home/components/searchPage/index",
+      // });
+      if (this.vuex_user.isAttestationXY || true) {
+        this.$u.route({
+          url: "/pages/main/search/search",
+          params: {
+            type: "home",
+          },
+        });
+      } else {
+        this.$refs.uToast.show({
+          title: "认证后才能进行搜索哦",
+          url: "/pages/my/ShoolList/ShoolList",
+        });
+      }
+    },
+
+    // 刷新当前选中的tab
+    refreshCurrentTab() {
+      this.$nextTick(() => {
+        const config = this.tabConfig[this.currentTab];
+        if (
+          this.$refs[config.ref] &&
+          typeof this.$refs[config.ref][config.refreshMethod] === "function"
+        ) {
+          this.$refs[config.ref][config.refreshMethod]();
+        }
+      });
+    },
+    getEducation() {
+      const data = {
+        userId: this.vuex_user.id,
+      };
+      this.$u.apiList.MyPage(data).then((res) => {
+        // 获取学校名称
+        this.schoolName =
+          res.edcationList.length > 0
+            ? res.edcationList[0].schoolName || res.edcationList[0].school
+            : "";
+        // 教育经历列表
+        this.EdcationList = res.edcationList || [];
+        this.$u.vuex("vuex_schoolName", this.schoolName);
+        this.$u.vuex("vuex_education", this.EdcationList);
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.home-page {
+  width: 100%;
+  height: 100%;
+  padding: 24rpx 24rpx;
+  background: linear-gradient(180deg, #b6e4ff 0%, #f6f8f9 45%, #f6f8f9 100%);
+  transition: background 0.3 ease; // 添加背景色过渡效果
+
+  .home-search {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    // justify-content: space-between;
+    // padding: 24rpx 0;
+    margin-bottom: 24rpx;
+
+    // .top-icons {
+    //   display: flex;
+    //   align-items: center;
+
+    //   .ml-15 {
+    //     margin-left: 15rpx;
+    //   }
+    // }
+  }
+
+  .nav-tabs {
+    display: flex;
+    justify-content: space-between;
+    margin: 20rpx 0;
+    padding: 0 20rpx;
+
+    .tab {
+      font-size: 32rpx;
+      color: #666;
+      position: relative;
+      z-index: 20;
+      transition: all 0.3s ease; /* 添加过渡效果 */
+      transform-origin: center bottom; /* 设置变换原点在底部中心 */
+
+      &.active {
+        // font-size: 36rpx;
+        transform: scale(1.125); /* 36/32 = 1.125，用scale替代font-size变化 */
+        color: #333;
+        font-weight: bold;
+      }
+
+      .active-line {
+        position: absolute;
+        left: 0;
+        bottom: 4rpx;
+        width: 100%;
+        height: 12rpx;
+        background: linear-gradient(
+          116deg,
+          rgba(60, 181, 251, 0) 0%,
+          #28c6fb 45%,
+          #06e1fa 100%
+        );
+        border-radius: 2rpx;
+        z-index: -1;
+      }
+    }
+  }
+
+  .empty-box {
+    height: 60rpx;
+  }
+}
+</style>
diff --git a/pages/login/ForgetPassword/ForgetPassword.vue b/pages/login/ForgetPassword/ForgetPassword.vue
new file mode 100644
index 0000000..9684b1a
--- /dev/null
+++ b/pages/login/ForgetPassword/ForgetPassword.vue
@@ -0,0 +1,425 @@
+<template>
+  <view class="flex-col page">
+    <!-- <image src="/static/common/img/16530269846087107196.png" class="image"/> -->
+    <u-navbar title="重置密码"></u-navbar>
+    <view class="flex-col group" v-if="state === 1">
+      <text class="text">重置密码</text>
+      <view class="flex-col group_7">
+        <view class="flex-col">
+          <!-- <text class="text_1">手机号</text> -->
+          <view class="text-wrapper flex-row view">
+            <u-input
+                v-model="phone"
+                :disabled="disabled"
+                placeholder="请输入手机号"
+                type="text"
+            />
+          </view>
+        </view>
+        <view class="flex-col group_6">
+          <!-- <text class="text_1">短信验证码</text> -->
+          <view class="text-wrapper flex-row view" style="padding: 0">
+            <u-input
+                v-model="code"
+                placeholder="请输入短信验证码"
+                type="text"
+            />
+            <u-button
+                :disabled="!(send == '发送验证码')"
+                class="custom-style"
+                style="background: transparent"
+                @click="sendCode"
+            >{{ send }}
+            </u-button>
+          </view>
+        </view>
+      </view>
+      <!-- <navigator class="text_6" url="/pages/login/login/login">登录</navigator> -->
+      <u-button
+          class="flex-col items-center text-wrapper_1"
+          shape="circle"
+          type="primary"
+          @click="login"
+      >
+        <text class="text_7">重置密码</text>
+      </u-button>
+    </view>
+    <view class="flex-col group" v-if="state === 2">
+      <text class="text">遇见身边的校友</text>
+      <view class="flex-col group_7">
+        <view class="flex-col">
+          <u-input
+              v-model="passWord"
+              class="view text-wrapper"
+              placeholder="请输入新密码"
+              type="password"
+          />
+        </view>
+        <view class="flex-col group_6">
+          <u-input
+              v-model="passWordTwo"
+              class="view text-wrapper"
+              placeholder="请确认新密码"
+              type="password"
+          />
+        </view>
+      </view>
+      <view class="tips">
+        <image src="/static/common/img/infoCircle.png"></image>
+        提示：密码长度应该大于5，必须包含字母、数字、特殊字符，且不能包含中文!
+      </view>
+      <u-button
+          class="flex-col items-center text-wrapper_1"
+          shape="circle"
+          throttle-time="1000"
+          type="primary"
+          @click="login"
+      >
+        <text class="text_7">立即重置</text>
+      </u-button>
+      <u-button
+          class="flex-col items-center text-wrapper_1"
+          shape="circle"
+          style=" margin-top: 10px"
+          type="primary"
+          @click="state = 1"
+      >
+        <text class="text_7">返回</text>
+      </u-button>
+    </view>
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast"/>
+  </view>
+</template>
+<script>
+import md5 from "js-md5";
+import {aesEncrypt} from "@/utils/encrypt.js";
+
+export default {
+  data() {
+    return {
+      show: false,
+      phone: "",
+      passWord: "",
+      code: "",
+      passWordTwo: "",
+      agreement: false,
+      disabled: false,
+      send: "发送验证码",
+      state: 1,
+    };
+  },
+  onLoad(e) {
+  },
+  methods: {
+    // 提示
+    tips(title, type, time) {
+      this.$refs.uToast.show({
+        title: title ? title : "",
+        type: type ? type : "success",
+        duration: time ? time + "" : "1500",
+      });
+    },
+    // 发送验证码
+    sendCode() {
+      var reg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$", "g"); //手机号
+      if (this.phone === "" || !reg.test(this.phone)) {
+        // this.$tips("请输入正确的手机号码", "error");
+        this.$refs.uToast.show({
+          title: '请输入正确的手机号码',
+          type: 'error',
+        })
+        return;
+      }
+
+      const timestamp = Date.now();
+      const base64Key = btoa('xiaoyout!#@12345');
+      const signStr = this.phone + timestamp + base64Key;
+      const sign = md5(signStr);
+
+      this.$u.apiList
+          .GetAppValidateCode({
+            phone: this.phone,
+            t: timestamp.toString(),
+            sign: sign,
+            type: 2,
+          })
+          .then((res) => {
+            //中间数字加密
+            // let result =this.userName.replace(this.userName.substring(3,7),"****")
+            // this.userName = result
+            this.disabled = true;
+            // this.$tips("发送成功");
+            this.$refs.uToast.show({
+              title: '发送成功',
+              type: 'success',
+            })
+            var second = 60;
+            this.send = second + "秒后重试";
+            var time = setInterval(() => {
+              this.send = second + "秒后重试";
+              second--;
+              if (second <= 0) {
+                this.disabled = false;
+                this.send = "发送验证码";
+                clearInterval(time);
+              }
+            }, 1000);
+          })
+          .catch((err) => {
+            // this.$tips(err.error, "error");
+            this.$refs.uToast.show({
+              title: err.error,
+              type: 'error',
+            })
+          });
+    },
+    login() {
+      if (this.state == 1) {
+        if (this.phone === "") {
+          return this.tips("请输入手机号", "error");
+        }
+        if (this.code === "") {
+          return this.tips("请输入验证码", "error");
+        }
+        this.$u.apiList.ForgotPasswordValidate({
+          phone: this.phone,
+          code: this.code,
+        }).then((res) => {
+          console.info("🚀 ~ file:ForgetPassword method: line:189 -----", res)
+          this.state = 2;
+        }).catch((err) => {
+          this.tips(err.error, "error");
+        });
+
+        return
+      }
+      if (this.state == 2) {
+        if (this.passWord === "") {
+          return this.tips("请输入新密码", "error");
+        }
+        let reg = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[\W_]).{5,}$/;
+        if (!reg.test(this.passWord)) {
+          /* return this.$tips(
+            "密码必须包含字母、数字、特殊字符，且不能包含中文!",
+            "error"
+          ); */
+          return this.$refs.uToast.show({
+            title: "密码必须包含字母、数字、特殊字符，且不能包含中文!",
+            type: 'error',
+          })
+        }
+        if (this.passWordTwo === "") {
+          return this.tips("请确认新密码", "error");
+        }
+        if (this.passWord != this.passWordTwo) {
+          return this.tips("请检查两次密码是否一致", "error");
+        }
+      }
+      const req = {
+        phone: this.phone,
+        code: this.code,
+        newPassWord: aesEncrypt(this.passWord),
+      };
+      console.log(req, "res-");
+      // return
+      this.$u.apiList
+          .ForgotPassword(req)
+          .then((res) => {
+            console.log(res, "res---");
+            uni.showToast({
+              title: "重置成功",
+              duration: 2000,
+            });
+            setTimeout(() => {
+              uni.navigateTo({
+                url: "/",
+              });
+            }, 2000);
+          })
+          .catch((err) => {
+            console.log(err, "err---");
+            // this.$tips(err.error, "error");
+            this.$refs.uToast.show({
+              title: err.error,
+              type: 'error',
+            })
+          });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.custom-style {
+  color: #3cb5fb !important;
+  padding: 0 !important;
+  height: 70rpx !important;
+  line-height: 60rpx !important;
+}
+
+.custom-style::after {
+  border: none;
+}
+
+.page {
+  padding-bottom: 0.015rem;
+  background-color: rgb(255, 255, 255);
+  overflow-y: auto;
+  width: 100%;
+  overflow-x: hidden;
+  height: 100%;
+
+  .image {
+    flex-shrink: 0;
+    align-self: flex-start;
+    width: 102%;
+  }
+
+  .group {
+    padding: 1.0rem 0.29rem;
+
+    .text {
+      align-self: left;
+      // color: rgb(46, 155, 255);
+      color: #000;
+      font-size: 0.22rem;
+      font-family: PingFang;
+      line-height: 0.17rem;
+      font-weight: 600;
+    }
+
+    .group_7 {
+      margin-top: 0.29rem;
+
+      .text-wrapper {
+        border: solid 2rpx #dcdfe6;
+        border-radius: 100rpx;
+        background: #f6f8fa;
+      }
+
+      .group_6 {
+        margin-top: 0.2rem;
+      }
+
+      .text_1 {
+        margin-left: 0.01rem;
+        align-self: flex-start;
+        color: rgb(51, 51, 51);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .view {
+        display: flex;
+        align-items: center;
+        margin-top: 20rpx;
+        padding: 20rpx 50rpx !important;
+      }
+    }
+
+    .text_6 {
+      width: 100%;
+      text-align: right;
+      margin-left: 0.01rem;
+      margin-top: 0.2rem;
+      align-self: flex-start;
+      color: #1F2232;
+      font-size: 0.13rem;
+      font-family: PingFang;
+      line-height: 0.13rem;
+    }
+
+    .text-wrapper_1 {
+      margin: 50rpx 0rpx 40rpx;
+      padding: 50rpx 0 50rpx;
+      // background-image: linear-gradient(90deg, rgb(135, 230, 254) 0%, rgb(91, 192, 254) 52%, rgb(46, 155, 255) 100%);
+      background: #3cb4fb;
+      box-shadow: 0px 6rpx 9rpx rgba(38, 122, 199, 0.34);
+      border-radius: 100rpx;
+
+      .text_7 {
+        color: rgb(255, 255, 255);
+        font-size: 32rpx;
+        font-family: PingFang;
+        line-height: 32rpx;
+      }
+    }
+
+    .group_1 {
+      margin-top: 0.12rem;
+
+      .text_8 {
+        color: rgb(102, 102, 102);
+        font-size: 24rpx;
+        font-family: PingFang;
+        line-height: 0.13rem;
+      }
+
+      .text_9 {
+        margin-left: 0.035rem;
+        color: rgb(25, 140, 255);
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.13rem;
+      }
+    }
+
+    .group_2 {
+      margin-top: 0.36rem;
+      justify-content: center;
+
+      .section_1 {
+        flex-shrink: 0;
+        width: 0.17rem;
+      }
+
+      .group_3 {
+        margin-left: 0.11rem;
+        height: 0.18rem;
+        line-height: 0.18rem;
+        font-size: 0;
+
+        .text_10 {
+          color: rgb(153, 153, 153);
+          font-size: 0.11rem;
+          font-family: PingFang;
+        }
+
+        .text_11 {
+          color: rgb(25, 140, 255);
+          font-size: 0.11rem;
+          font-family: PingFang;
+        }
+
+        .text_12 {
+          color: rgb(102, 102, 102);
+          font-size: 0.11rem;
+          font-family: PingFang;
+        }
+
+        .text_13 {
+          color: rgb(25, 140, 255);
+          font-size: 0.11rem;
+          font-family: PingFang;
+        }
+      }
+    }
+  }
+}
+
+.tips {
+  font-size: 24rpx;
+  color: #EF3920;
+  display: flex;
+  margin-top: 20rpx;
+
+  image {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 10rpx;
+    margin-top: 5rpx;
+  }
+}
+</style>
diff --git a/pages/login/authentication/authentication.vue b/pages/login/authentication/authentication.vue
new file mode 100644
index 0000000..aa652c0
--- /dev/null
+++ b/pages/login/authentication/authentication.vue
@@ -0,0 +1,177 @@
+<template>
+  <view class="authentication-page">
+    <u-navbar title="身份认证"> </u-navbar>
+
+    <view class="title">请填写您的真实信息</view>
+
+    <view class="form-container">
+      <view class="input-item">
+        <text>姓名</text>
+        <input
+          v-model="name"
+          maxlength="20"
+          type="text"
+          placeholder="请输入"
+          placeholder-class="placeholder"
+        />
+      </view>
+
+      <view class="input-item">
+        <text>身份证号</text>
+        <input
+          v-model="idCard"
+          maxlength="18"
+          type="text"
+          placeholder="请输入"
+          placeholder-class="placeholder"
+        />
+      </view>
+    </view>
+
+    <view class="btn-container">
+      <button class="next-btn" @click="handleNext">下一步</button>
+    </view>
+
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import test from "@/uview-ui/libs/function/test.js";
+
+export default {
+  data() {
+    return {
+      name: "",
+      idCard: "",
+    };
+  },
+  methods: {
+    handleNext() {
+      // 调用后端API获取token
+      this.getTokenFromBackend();
+
+      if (!this.name) {
+        return this.$refs.uToast.show({
+          title: "请输入姓名",
+          type: "warning",
+        });
+      }
+      if (!this.idCard) {
+        return this.$refs.uToast.show({
+          title: "请输入身份证号",
+          type: "warning",
+        });
+      }
+      // 验证身份证号码格式
+      if (!test.idCard(this.idCard)) {
+        return this.$refs.uToast.show({
+          title: "请输入正确的身份证号码",
+          type: "warning",
+        });
+      }
+      // 处理下一步逻辑
+      // console.log("提交信息", this.name, this.idCard);
+    },
+
+    // 获取token
+    getTokenFromBackend() {
+      this.$u.api.getAPIToken().then((res) => {
+        const token = res.verifyToken
+
+        // 跳转到百度人脸核验页面
+        this.redirectToBaiduVerification(token);
+      });
+    },
+
+    redirectToBaiduVerification(token) {
+      // 获取当前域名
+      const currentDomain = window.location.origin;
+
+      // 编码回调URL
+      // const callbackUrl = encodeURIComponent(`${currentDomain}/success.html`);
+      const callbackUrl = "/pages/login/recognitionResult/recognitionResult";
+
+      // 构建跳转URL
+      const verifyUrl = `https://brain.baidu.com/face/print/verify/verify?token=${token}&successUrl=${callbackUrl}&failedUrl=${callbackUrl}`;
+
+      const verifyObj = {
+        url: verifyUrl,
+        name:'身份认证'
+      };
+
+      // 在uni-app中跳转
+      this.$u.route({
+        url: `/pages/webview/index?data=${encodeURIComponent(
+          JSON.stringify(verifyObj)
+        )}`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.authentication-page {
+  padding: 0 30rpx;
+
+  .title {
+    font-family: PingFang SC, PingFang SC;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: rgba(0, 0, 0, 0.9);
+    line-height: 52rpx;
+    text-align: left;
+    margin-top: 30rpx;
+    margin-bottom: 40rpx;
+  }
+
+  .form-container {
+    background-color: #ffffff;
+    border-radius: 16rpx;
+    padding: 0 30rpx;
+    margin-bottom: 60rpx;
+
+    .input-item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      padding: 30rpx 0;
+      border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+
+      &:last-child {
+        border-bottom: none;
+      }
+
+      text {
+        font-size: 28rpx;
+        color: rgba(0, 0, 0, 0.9);
+      }
+
+      input {
+        flex: 1;
+        text-align: right;
+        font-size: 28rpx;
+      }
+
+      .placeholder {
+        color: rgba(0, 0, 0, 0.3);
+      }
+    }
+  }
+
+  .btn-container {
+    .next-btn {
+      background-color: #45b5ff;
+      color: #ffffff;
+      height: 90rpx;
+      line-height: 90rpx;
+      border-radius: 45rpx;
+      font-size: 32rpx;
+      font-weight: 500;
+      border: none;
+    }
+  }
+}
+</style>
diff --git a/pages/login/confirmPwd/confirmPwd.vue b/pages/login/confirmPwd/confirmPwd.vue
new file mode 100644
index 0000000..174801f
--- /dev/null
+++ b/pages/login/confirmPwd/confirmPwd.vue
@@ -0,0 +1,338 @@
+<template>
+	<view class="flex-col page">
+		<!-- <image src="/static/common/img/16530269846087107196.png" class="image" /> -->
+		<u-navbar title="确认密码"></u-navbar>
+		<view class="flex-col group">
+			<text class="text">确认密码后登录</text>
+			<view class="flex-col group_7">
+				<view class="flex-col">
+					<view class="flex-row" style="padding: 0">
+						<u-input type="password" v-model="user.passWord" placeholder="请输入密码"  class="view text-wrapper"/>
+					</view>
+				</view>
+				<view class="flex-col group_6">
+					<u-input type="password" v-model="isPassWord" placeholder="请确认密码" class="view text-wrapper" />
+				</view>
+        <view class="tips">
+           <image src="/static/common/img/infoCircle.png"></image> 提示：密码长度应该大于5，必须包含字母、数字、特殊字符，且不能包含中文!
+        </view>
+			</view>
+			<u-button class="flex-col items-center text-wrapper_1" throttle-time="1000" type="primary" shape="circle"
+				@click="login"><text class="text_7">确定</text></u-button>
+				<!-- 此次接入人脸验证  登录 ==> 确定 -->
+		</view>
+		<u-toast ref="uToast" />
+		<u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+	</view>
+</template>
+
+<script>
+import {aesEncrypt} from '@/utils/encrypt.js'
+import md5 from "js-md5";
+	export default {
+		data() {
+			return {
+				show: false,
+				userName: "",
+				isPassWord: "",
+				agreement: false,
+				user: {
+					phone: '',
+					passWord: '',
+					code:''
+				}
+			};
+		},
+		onLoad(e) {
+			if (e.phone) {
+				this.user.phone = e.phone
+				this.user.code = e.code
+			} else {
+				uni.navigateTo({
+					url: "../register/register",
+				});
+			}
+		},
+		methods: {
+			login() {
+				if (this.user.passWord === "") {
+					return this.$refs.uToast.show({
+						title: '请输入密码',
+						type: 'error',
+						})
+				}
+				if (this.user.passWord.length < 5) {
+					// return this.$tips("您的密码长度应该大于5", "error");
+					return this.$refs.uToast.show({
+						title: '您的密码长度应该大于5',
+						type: 'error',
+						})
+				}
+				if (this.isPassWord === "") {
+					return this.$refs.uToast.show({
+						title: '请确认密码',
+						type: 'error',
+						})
+					// return this.$tips("请确认密码", "error");
+				}
+				if (this.isPassWord !== this.user.passWord) {
+					return this.$refs.uToast.show({
+						title: '请确认两次密码是否一致',
+						type: 'error',
+						})
+					// return this.$tips("请确认两次密码是否一致", "error");
+				}
+				uni.showLoading({
+					title: "注册中",
+				});
+        const req = {...this.user}
+        req.passWord = aesEncrypt(this.user.passWord)
+		// 生成13位时间戳
+		const timestamp = Date.now();
+		// 生成签名
+		const base64Key = btoa('xiaoyout!#@12345');
+		const signStr = this.user.phone + timestamp + base64Key;
+		const sign = md5(signStr);
+		req.timeStamp = timestamp.toString();
+		req.sign = sign;
+        console.log(req,'req')
+        // return 
+				this.$u.api.RegisterUser(req).then((res) => {
+          const newReq = {...this.user}
+          newReq.passWord = aesEncrypt(this.user.passWord)
+					this.$u.api.LoginApp(newReq).then((ress) => {
+						uni.hideLoading();
+						// 保存登录后得到的用户数据
+						this.$u.vuex('vuex_user', ress.user)
+						this.$u.vuex('vuex_token', ress.token)
+						this.$refs.uToast.show({
+							title: '注册成功',
+							type: 'success',
+						})
+							// uni.navigateTo({
+							// 	url: "../perfect/perfect",
+							// });
+						setTimeout(()=>{
+							// 这里改为进行人脸识别
+							this.toBaiduApi();
+							return
+
+							uni.navigateTo({
+							url: "/pages/login/roleSelection",
+							});
+						},300)
+
+					}).catch((e) => {
+						uni.hideLoading();
+					});
+
+				}).catch((e) => {
+					uni.hideLoading();
+					// this.$tips( e.error, 'error')
+					this.$refs.uToast.show({
+						title: e.error,
+						type: 'error',
+					})
+				});
+
+			},
+
+			// 跳转至人脸验证
+			toBaiduApi(){
+				this.$u.api.getAPIToken().then((res) => {
+					const token = res.result.verify_token;
+
+					// 跳转到百度人脸核验页面
+					this.redirectToBaiduVerification(token);
+				});
+			},
+			redirectToBaiduVerification(token) {
+				// 获取当前域名
+				const currentDomain = window.location.origin;
+
+				// 编码回调URL - 使用相对路径，让uni-app处理路由
+				// 百度人脸核验会在回调URL后附加verify_result和verify_info参数
+				const successUrl = encodeURIComponent(
+					`${currentDomain}/#/pages/login/recognitionResult/recognitionResult?token=${token}`
+				);
+				const failedUrl = encodeURIComponent(
+					`${currentDomain}/#/pages/login/recognitionResult/recognitionFailed?token=${token}`
+				);
+
+				// 构建跳转URL
+				const verifyUrl = `https://brain.baidu.com/face/print/verify/verify?token=${token}&successUrl=${successUrl}&failedUrl=${failedUrl}`;
+
+				console.log("跳转到百度人脸核验页面:", verifyUrl);
+
+				// 直接跳转到百度人脸核验页面
+				window.location.href = verifyUrl;
+				return;
+			},
+		},
+	};
+</script>
+
+<style scoped lang="scss">
+	.custom-style {
+		color: #606266;
+	}
+
+	.custom-style::after {
+		border: none;
+	}
+
+	.page {
+		padding-bottom: 0.015rem;
+		background-color: rgb(255, 255, 255);
+		overflow-y: auto;
+		width: 100%;
+		overflow-x: hidden;
+		height: 100%;
+
+		.image {
+			flex-shrink: 0;
+			align-self: flex-start;
+			width: 102%;
+		}
+
+		.group {
+			padding: 0.15rem 0.29rem;
+
+			.text {
+				font-family: PingFang;
+				font-weight: bold;
+				font-size: 48rpx;
+				color: #000000;
+				margin-top: 200rpx;
+			}
+
+			.group_7 {
+				margin-top: 0.29rem;
+
+				.text-wrapper {
+					border: solid 2rpx #dcdfe6;
+					border-radius: 100rpx;
+					background: #f6f8fa;
+				}
+
+				.group_6 {
+					margin-top: 0.2rem;
+				}
+
+				.text_1 {
+					margin-left: 0.01rem;
+					align-self: flex-start;
+					color: rgb(51, 51, 51);
+					font-size: 0.15rem;
+					font-family: PingFang;
+					line-height: 0.14rem;
+				}
+
+				.view {
+					margin-top: 20rpx;
+					padding: 20rpx 50rpx !important;
+				}
+			}
+
+			.text_6 {
+				margin-left: 0.01rem;
+				margin-top: 0.13rem;
+				align-self: flex-start;
+				color: rgb(25, 140, 255);
+				font-size: 0.13rem;
+				font-family: PingFang;
+				line-height: 0.13rem;
+			}
+
+			.text-wrapper_1 {
+				margin: 0.35rem 0rem 0;
+				padding: 20rpx 50rpx;
+				height: 108rpx;
+				/* background-image: linear-gradient(90deg,
+						rgb(135, 230, 254) 0%,
+						rgb(91, 192, 254) 52%,
+						rgb(46, 155, 255) 100%);
+				box-shadow: 0px 0.03rem 0.09rem rgba(38, 122, 199, 0.34); */
+				background: #3cb5fb;
+				border-radius: 0.23rem;
+
+				.text_7 {
+					color: rgb(255, 255, 255);
+					font-size: 0.16rem;
+					font-family: PingFang;
+					line-height: 0.15rem;
+				}
+			}
+
+			.group_1 {
+				margin-top: 0.12rem;
+
+				.text_8 {
+					color: rgb(102, 102, 102);
+					font-size: 0.14rem;
+					font-family: PingFang;
+					line-height: 0.13rem;
+				}
+
+				.text_9 {
+					margin-left: 0.035rem;
+					color: rgb(25, 140, 255);
+					font-size: 0.14rem;
+					font-family: PingFang;
+					line-height: 0.13rem;
+				}
+			}
+
+			.group_2 {
+				margin-top: 0.36rem;
+				justify-content: center;
+
+				.section_1 {
+					flex-shrink: 0;
+					width: 0.17rem;
+				}
+
+				.group_3 {
+					margin-left: 0.11rem;
+					height: 0.18rem;
+					line-height: 0.18rem;
+					font-size: 0;
+
+					.text_10 {
+						color: rgb(153, 153, 153);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+
+					.text_11 {
+						color: rgb(25, 140, 255);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+
+					.text_12 {
+						color: rgb(102, 102, 102);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+
+					.text_13 {
+						color: rgb(25, 140, 255);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+				}
+			}
+		}
+		.tips{
+			font-size: 24rpx;
+			color: #EF3920;
+			display: flex;
+			margin-top: 20rpx;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/login/graduateCertification/graduateCertification.vue b/pages/login/graduateCertification/graduateCertification.vue
new file mode 100644
index 0000000..0a0477e
--- /dev/null
+++ b/pages/login/graduateCertification/graduateCertification.vue
@@ -0,0 +1,1104 @@
+<template>
+  <view class="flex-col page">
+    <u-navbar :border-bottom="false" title="个人资料"></u-navbar>
+
+    <view v-if="step == 0" class="flex-col group_2">
+      <view class="flex-col items-center group_1">
+        <u-avatar
+          mode="square"
+          :src="headerImg"
+          @click="chooseAvatar"
+          size="260"
+        />
+        <text class="text_4">请上传头像</text>
+      </view>
+      <view class="flex-col group_5 input-box">
+        <u-input
+          type="text"
+          :maxlength="8"
+          v-model="form.userName"
+          placeholder="请输入用户名称"
+          class="text-wrapper view"
+        />
+      </view>
+      <view class="flex-col input-box" style="margin-top: 16px">
+        <u-input
+          type="text"
+          :maxlength="8"
+          v-model="form.name"
+          placeholder="请输入真实的姓名"
+          class="text-wrapper view"
+        />
+      </view>
+      <view class="flex-col group_3">
+        <text class="text_7" style="margin-bottom: 26px">性别</text>
+        <u-radio-group
+          v-model="form.sex"
+          placement="row"
+          name="sexGroup"
+          width="50%"
+        >
+          <u-radio
+            v-for="(item, index) in sexOptions"
+            :key="index"
+            :name="item.value"
+            :value="item.value"
+          >
+            {{ item.label }}
+          </u-radio>
+        </u-radio-group>
+      </view>
+      <u-button
+        shape="circle"
+        class="button text-wrapper_1"
+        type="primary"
+        @click="next"
+        >下一步</u-button
+      >
+    </view>
+    <u-navbar
+      :custom-back="back"
+      v-if="step == 1"
+      :border-bottom="false"
+      :background="background"
+    >
+    </u-navbar>
+    <view v-if="step == 1" class="flex-col group_3 userList">
+      <h3 class="text_3">填写学校信息</h3>
+      <view class="flex-col group_4">
+        <view class="justify-between list-item group_5">
+          <text class="text_8">学历</text>
+          <view class="item-right">
+            <u-input
+              v-model="form.educationStr"
+              placeholder="请选择学历"
+              inputAlign="right"
+              @click="educationalShow = true"
+            />
+            <u-action-sheet
+              :list="educationalList"
+              v-model="educationalShow"
+              @click="educationalSelect"
+            >
+            </u-action-sheet>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">学校</text>
+          <view class="item-right">
+            <u-input
+              v-model="shoolName"
+              placeholder="请选择学校"
+              inputAlign="right"
+              @click="shoolShow = true"
+            />
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+            <u-select
+              v-model="shoolShow"
+              :default-value="defaultTime"
+              mode="single-column"
+              title="学校选择"
+              :list="shoolList"
+              @confirm="shoolSelect"
+            >
+            </u-select>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">学院</text>
+          <view class="item-right">
+            <u-input
+              v-model="form.college"
+              placeholder="请选择学院"
+              @click="collegeShow = true"
+              inputAlign="right"
+            />
+            <u-select
+              v-model="collegeShow"
+              mode="single-column"
+              :list="CollegeList"
+              @confirm="selectCpllege"
+            ></u-select>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">专业</text>
+          <view class="item-right">
+            <u-input
+              v-model="form.major"
+              placeholder="请选择专业"
+              @click="majorShow = true"
+              inputAlign="right"
+            />
+            <u-select
+              v-model="majorShow"
+              mode="single-column"
+              :list="MajorList"
+              @confirm="selectMajor"
+            ></u-select>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">时间</text>
+          <view class="item-right">
+            <u-input
+              v-model="showTime"
+              placeholder="请选择时间"
+              inputAlign="right"
+              @click="timeShow = true"
+            />
+            <u-select
+              v-model="timeShow"
+              :default-value="defaultTime"
+              mode="mutil-column"
+              title="在校时间"
+              :list="timeList"
+              @confirm="confirm"
+            >
+            </u-select>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+      </view>
+      <h3 class="text_3">就业信息</h3>
+      <view class="flex-col group_4">
+        <view class="justify-between list-item">
+          <text class="text_8">行业领域</text>
+          <view class="item-right">
+            <u-input
+              v-model="selectedWorkArea"
+              placeholder="请选择行业"
+              inputAlign="right"
+              @click="workAreaPopupShow = true"
+            />
+            <u-select
+              v-model="workAreaPopupShow"
+              mode="single-column"
+              title="行业领域"
+              :list="WorkAreaList"
+              @confirm="workAreaSelect"
+            >
+            </u-select>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+      </view>
+      <u-button
+        shape="circle"
+        class="button text-wrapper_1"
+        type="primary"
+        @click="complete"
+        >完成</u-button
+      >
+    </view>
+    <view v-if="step == 2" class="flex-col preference-page">
+      <u-navbar title="推荐偏好" :border-bottom="false" />
+
+      <view class="selected-count">
+        已选择（{{ selectedPreferences.length }}/10）
+        <text class="desc"
+          >您选择的标签将影响系统推荐给你的信息类型，进入系统后可以在我的-常用工具-推荐偏好中修改。</text
+        >
+      </view>
+
+      <view class="selected-tags">
+        <view
+          v-for="item in selectedPreferences"
+          :key="item"
+          class="tag selected"
+        >
+          {{ item }}
+          <image
+            class="close-btn"
+            src="/static/common/img/handDelete.png"
+            @click.stop="removePreference(item)"
+          ></image>
+        </view>
+      </view>
+      <view class="line"></view>
+      <view class="all-tags">
+        <view class="title">行业领域</view>
+        <view class="tags-list">
+          <view
+            v-for="item in industryList"
+            :key="item"
+            class="industry-tag"
+            :class="{ selected: selectedPreferences.includes(item) }"
+            @click="togglePreference(item)"
+            >{{ item }}</view
+          >
+        </view>
+        <view class="title" style="margin-top: 32rpx">行业方向</view>
+        <view class="tags-list">
+          <view
+            v-for="item in industryDirectionList"
+            :key="item"
+            class="industry-tag"
+            :class="{ selected: selectedPreferences.includes(item) }"
+            @click="togglePreference(item)"
+            >{{ item }}</view
+          >
+        </view>
+      </view>
+      <view class="line-shadow"></view>
+      <view class="btn-box">
+        <u-button shape="circle" class="button" type="primary" @click="nextStep"
+          >下一步</u-button
+        >
+      </view>
+    </view>
+    <view v-if="step == 3" class="flex-col preference-page">
+      <u-navbar title="推荐偏好" :border-bottom="false" />
+
+      <view class="selected-count">
+        已选择（{{ selectedPreferences.length }}/10）
+        <text class="desc"
+          >您选择的标签将影响系统推荐给你的信息类型，进入系统后可以在我的-常用工具-推荐偏好中修改。</text
+        >
+      </view>
+
+      <view class="selected-tags">
+        <view
+          v-for="item in selectedPreferences"
+          :key="item"
+          class="tag selected"
+        >
+          {{ item }}
+          <image
+            class="close-btn"
+            src="/static/common/img/handDelete.png"
+            @click.stop="removePreference(item)"
+          ></image>
+        </view>
+      </view>
+      <view class="line"></view>
+      <view class="all-tags">
+        <view class="title">兴趣爱好</view>
+        <view class="tags-list">
+          <view
+            v-for="item in preferenceList"
+            :key="item"
+            class="tag"
+            :class="{ selected: selectedPreferences.includes(item) }"
+            @click="togglePreference(item)"
+            >{{ item }}</view
+          >
+        </view>
+      </view>
+      <view class="line-shadow"></view>
+      <view class="btn-box">
+        <u-button
+          shape="circle"
+          class="button"
+          type="primary"
+          @click="finishPreference"
+          >完成</u-button
+        >
+      </view>
+    </view>
+    <u-top-tips :z-index="999" ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import headerImg from "@/static/common/img/headerImg.png";
+export default {
+  data() {
+    return {
+      step: 0,
+      headerImg: headerImg,
+      shoolName: "",
+      showTime: "",
+      form: {
+        userId: "", //用户id
+        name: "", //名字
+        sex: "男", //性别
+        path: "", //头像
+        educationStr: "", //学历
+        schoolId: "", //学校
+        college: "", //学院
+        major: "", //专业
+        startYear: "", //开始时间
+        endYear: "", //结束时间,
+        collegeId: "", //学院id
+        majorId: "", //专业id
+      },
+      sexOptions: [
+        { label: "男生", value: "男" },
+        { label: "女生", value: "女" },
+      ],
+      background: {
+        backgroundColor: "#f6f8fa",
+      },
+      value: "",
+      defaultTime: "",
+      show: false,
+      educationalShow: false,
+      educationalList: [
+        //学历选择列表
+        {
+          text: "大专",
+        },
+        {
+          text: "本科",
+        },
+        {
+          text: "硕士研究生",
+        },
+        {
+          text: "博士研究生",
+        },
+      ],
+      shoolShow: false,
+      shoolList: [], //学校选择
+      CollegeList: [], //学院选择
+      MajorList: [], //专业选择
+      timeShow: false,
+      timeList: [], //时间选择
+      collegeShow: false,
+      majorShow: false,
+      workAreaPopupShow: false, //就业领域选择
+      selectedWorkArea: "",
+      WorkAreaList: [],
+      preferenceList: [
+        "跑步健身",
+        "足球",
+        "电竞游戏",
+        "旅行徒步",
+        "摄影摄像",
+        "剧本杀",
+        "编程极客",
+        "看书",
+        "唱歌",
+        "绘画手作",
+        "美食探店",
+        "cosplay",
+        "篮球",
+        "写作创作",
+        "咖啡茶艺",
+        "玄学星座",
+        "实习内推",
+        "脱单",
+        "活动组队",
+        "失物招领",
+        "副业兼职",
+        "二手交易",
+        "游戏陪玩",
+        "技能学习",
+        "情感洞",
+        "宠物生活",
+        "面试分享",
+        "校园热点",
+        "校园问答",
+        "公益志愿",
+        "跑腿互助",
+        "校友人脉",
+        "租房合租",
+        "留学互助",
+        "创业孵化",
+        "拼车出行",
+        "商业合作",
+      ],
+      industryList: ["生物", "制药", "化工", "医疗"],
+      industryDirectionList: [
+        "生物学研究人员",
+        "医药研发",
+        "生物信息工程师",
+        "药品生产",
+        "药品注册",
+        "医药项目经理",
+        "细胞培养员",
+        "药理毒理研究院",
+        "药物合成",
+      ],
+      selectedPreferences: [],
+    };
+  },
+  onLoad(e) {
+    this.step = 1;
+    this.getWorkFile();
+    // 监听从裁剪页发布的事件，获得裁剪结果
+    uni.$on("uAvatarCropper", (path) => {
+      this.headerImg = path;
+      let file = this.common.base64toFile(path, new Date().getTime());
+      if (file.type.indexOf("image") < 0) {
+        // this.$tips("请选择图片", "error");
+        this.$refs.uToast.show({
+          title: "请选择图片",
+          type: "error",
+        });
+        return false;
+      }
+      uni.uploadFile({
+        url: this.$u.http.config.baseUrl + "/app/User/File",
+        file: file,
+        fileType: "image",
+        header: {
+          Authorization: "Bearer " + this.vuex_token,
+        },
+        complete: (res) => {
+          this.form.path = JSON.parse(res.data).data;
+        },
+      });
+    });
+
+    if (this.vuex_user.id) {
+      this.form.userId = this.vuex_user.id;
+    } else {
+      // this.$u.route({
+      //   url: "/pages/login/login/login",
+      // });
+    }
+    this.getShool();
+    var arr1 = [],
+      arr2 = [];
+    var isyear = new Date().getFullYear();
+    for (var i = 1990; i <= isyear + 10; i++) {
+      if (i <= isyear) {
+        arr1.push({
+          value: i,
+          label: i,
+        });
+      }
+      arr2.push({
+        value: i,
+        label: i,
+      });
+    }
+    this.timeList.push(arr1);
+    this.timeList.push(arr2);
+    this.defaultTime = [arr1.length - 1, arr2.length - 7];
+    this.echoFn();
+  },
+
+  methods: {
+    getWorkFile() {
+      this.$u.apiList.GetWorkFile().then((res) => {
+        this.WorkAreaList = res.map((item) => {
+          return {
+            label: item.workFieldName,
+            value: item.id,
+          };
+        });
+      });
+    },
+    // 回填个人信息  如果已经存在教师身份，学生身份未认证时
+    async echoFn() {
+      const res = await this.$u.apiList.SelectUserTypeApi();
+      console.log(res, "res---");
+      const jzgFlag = res.jzgFlag;
+      const studentFlag = res.studentFlag;
+      if (studentFlag === false && jzgFlag === true) {
+        this.form.name = this.vuex_user.userName;
+        this.form.sex = this.vuex_user.sex;
+        this.headerImg = this.$u.http.config.baseUrl + this.vuex_user.head;
+        this.form.path = this.vuex_user.head;
+      }
+    },
+    //完成信息填写
+    async complete() {
+        console.log("完成----")
+      var data = this.form;
+      if (data.educationStr == "") {
+        // return this.$tips("请选择学历", "error");
+        return this.$refs.uToast.show({
+          title: "请选择学历",
+          type: "error",
+        });
+      }
+      if (data.schoolId == "") {
+        // return this.$tips("请选择学校", "error");
+        return this.$refs.uToast.show({
+          title: "请选择学校",
+          type: "error",
+        });
+      }
+      if (data.college == "") {
+        // return this.$tips("请填写学院", "error");
+        return this.$refs.uToast.show({
+          title: "请填写学院",
+          type: "error",
+        });
+      }
+      if (data.major == "") {
+        // return this.$tips("请填写专业", "error");
+        return this.$refs.uToast.show({
+          title: "请填写专业",
+          type: "error",
+        });
+      }
+      if (data.startYear == "" && data.endYear == "") {
+        // return this.$tips("请选择在校时间", "error");
+        return this.$refs.uToast.show({
+          title: "请选择在校时间",
+          type: "error",
+        });
+      }
+      if (new Date(data.startYear) - new Date(data.endYear) > 0) {
+        // return this.$tips("请选择正确的在校时间", "error");
+        return this.$refs.uToast.show({
+          title: "请选择正确的在校时间",
+          type: "error",
+        });
+      }
+      if(data.list == "") {
+        return this.$refs.uToast.show({
+            title:'请选择行业领域',
+            type:'error'
+        })
+      }
+      // console.log(data,'data-')
+      // return
+      data.userType = 2;
+      data.userName = this.form.name;
+      console.log(data, "data--");
+      // return
+      const res = await this.$u.api.saveUserInfo(data);
+      console.log(res, "res--");
+      const req = {
+        userId: this.vuex_user.id,
+        educationId: res,
+      };
+      const result = await this.$u.apiList.SelectEducation(req);
+      console.log(result, "result--");
+      // return
+      this.$u.vuex("vuex_token", result.token);
+      this.$u.vuex("vuex_glyType", result.glyType);
+      this.$u.vuex("vuex_user", result.user);
+      // return
+      //   this.$u.api.getUser().then(() => {
+      //     this.vuex_user.isFill = true;
+      //     uni.switchTab({
+      //       url: "../../main/index/index",
+      //     });
+      //   });
+      this.step = 2;
+    },
+    // 获取学校
+    getShool() {
+      this.$u.api.GetAllSchool().then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.shoolList.push({
+            label: res[i].schoolName + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取学院
+    getColleg(id) {
+      const data = {
+        schoolid: id,
+      };
+      this.$u.apiList.GetCollegeList(data).then((res) => {
+        this.CollegeList = [];
+        for (let i = 0; i < res.length; i++) {
+          this.CollegeList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取学院专业
+    getMajor(id) {
+      const data = {
+        schoolid: this.form.schoolId,
+        collegeid: id,
+      };
+      this.$u.apiList.GetMajorList(data).then((res) => {
+        this.MajorList = [];
+        for (let i = 0; i < res.length; i++) {
+          this.MajorList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    // 学历选择
+    educationalSelect(index) {
+      this.form.educationStr = this.educationalList[index].text;
+    },
+    // 时间选择
+    confirm(e) {
+      this.showTime = e[0].value + " - " + e[1].value;
+      this.form.startYear = e[0].value + "";
+      this.form.endYear = e[1].value + "";
+    },
+    // 学校选择
+    shoolSelect(e) {
+      this.form.college = "";
+      this.form.collegeId = "";
+      this.form.major = "";
+      this.form.majorId = "";
+      this.shoolName = e[0].label;
+      this.form.schoolId = e[0].value;
+      this.getColleg(this.form.schoolId);
+    },
+    //学院选择
+    selectCpllege(e) {
+      this.form.major = "";
+      this.form.majorId = "";
+      this.form.college = e[0].label;
+      this.form.collegeId = e[0].value;
+      this.getMajor(this.form.collegeId);
+    },
+    //选择专业
+    selectMajor(e) {
+      this.form.major = e[0].label;
+      this.form.majorId = e[0].value;
+    },
+    workAreaSelect(e) {
+      console.log("选择行业领域", e);
+      this.form.List=e[0].value
+      this.selectedWorkArea=e[0].label
+    },
+    // 头像裁剪
+    chooseAvatar() {
+      // 此为uView的跳转方法，详见"文档-JS"部分，也可以用uni的uni.navigateTo
+      this.$u.route({
+        // 关于此路径，请见下方"注意事项"
+        url: "/uview-ui/components/u-avatar-cropper/u-avatar-cropper",
+        // 内部已设置以下默认参数值，可不传这些参数
+        params: {
+          // 输出图片宽度，高等于宽，单位px
+          destWidth: 200,
+          // 裁剪框宽度，高等于宽，单位px
+          rectWidth: 200,
+          // 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可
+          fileType: "jpg",
+        },
+      });
+    },
+    back() {
+      this.step = 0;
+    },
+    next() {
+      console.log(this.form, "this.form--");
+      var data = this.form;
+      if (!data.path) {
+        // return this.$tips("请上传头像", "error");
+        return this.$refs.uToast.show({
+          title: "请上传头像",
+          type: "error",
+        });
+      }
+      if (!data.name) {
+        // return this.$tips("请填写真实姓名", "error");
+        return this.$refs.uToast.show({
+          title: "请填写真实姓名",
+          type: "error",
+        });
+      }
+      var reg = new RegExp("^[\u4e00-\u9fa5]{0,}$", "g");
+      if (!reg.test(data.name)) {
+        //  this.$tips("请输入正确的真实姓名", "error");
+        this.$refs.uToast.show({
+          title: "请输入正确的真实姓名",
+          type: "error",
+        });
+        return;
+      }
+      if (!data.sex) {
+        // return this.$tips("请选择性别", "error");
+        return this.$refs.uToast.show({
+          title: "请选择性别",
+          type: "error",
+        });
+      }
+      this.step = 1;
+    },
+    togglePreference(item) {
+      const idx = this.selectedPreferences.indexOf(item);
+      if (idx > -1) {
+        this.selectedPreferences.splice(idx, 1);
+      } else {
+        if (this.selectedPreferences.length >= 10) {
+          this.$refs.uToast.show({
+            title: "最多选择10个",
+            type: "error",
+          });
+          return;
+        }
+        this.selectedPreferences.push(item);
+      }
+    },
+    nextStep() {
+      this.step = 3;
+    },
+    finishPreference() {
+      // 这里可以保存选择的偏好，或跳转页面
+      // 例如：this.$u.api.savePreference(this.selectedPreferences)
+      // uni.switchTab({ url: "../../main/index/index" });
+      this.$refs.uToast.show({
+        title: "已保存偏好",
+        type: "success",
+      });
+    },
+    removePreference(item) {
+      const idx = this.selectedPreferences.indexOf(item);
+      if (idx > -1) {
+        this.selectedPreferences.splice(idx, 1);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.page {
+  background-color: rgb(255, 255, 255);
+  overflow-y: auto;
+  width: 100%;
+  overflow-x: hidden;
+  height: 100%;
+
+  .group_2 {
+    padding: 0.49rem 0.29rem 1.15rem;
+    overflow-y: auto;
+    .text_3 {
+      align-self: center;
+      color: rgb(51, 51, 51);
+      font-size: 0.18rem;
+      font-family: PingFang;
+      line-height: 0.17rem;
+    }
+    .group_1 {
+      margin-top: 0.15rem;
+      .text_4 {
+        margin-top: 0.15rem;
+        color: rgb(153, 153, 153);
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.13rem;
+      }
+    }
+    .group_5 {
+      margin-top: 0.4rem;
+      .text_5 {
+        align-self: flex-start;
+        color: rgb(51, 51, 51);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+      .view {
+        // border-bottom: solid 0.005rem rgb(153, 153, 153);
+      }
+      .text-wrapper {
+        // margin-top: 0.16rem;
+      }
+    }
+    .input-box {
+      padding: 20rpx 40rpx;
+      border-radius: 100rpx;
+      background: #f6f8f9;
+    }
+    .group_3 {
+      margin-top: 32rpx;
+      // height: 1.35rem;
+      position: relative;
+      .image_4 {
+        filter: drop-shadow(0px 0.015rem 0.03rem rgba(102, 102, 102, 0.23));
+        width: 0.68rem;
+        height: 0.68rem;
+      }
+      .text_7 {
+        color: rgb(51, 51, 51);
+        font-size: 32rpx;
+        font-family: PingFang;
+        line-height: 32rpx;
+        font-weight: bold;
+        // position: absolute;
+        // left: 0;
+        // top: 0;
+      }
+      .group_4.on,
+      .group_6.on {
+        image {
+          border: 2px solid #5ac0ff;
+          border-radius: 50%;
+          overflow: hidden;
+        }
+      }
+      .group_6 {
+        position: absolute;
+        left: 0.4rem;
+        top: 0.4rem;
+        .text_8 {
+          margin-top: 0.15rem;
+          color: rgb(51, 51, 51);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.13rem;
+        }
+      }
+      .group_4 {
+        position: absolute;
+        right: 0.4rem;
+        top: 0.4rem;
+        .text_9 {
+          margin-top: 0.15rem;
+          color: rgb(51, 51, 51);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.13rem;
+        }
+      }
+    }
+    .text-wrapper_1 {
+      padding: 0.15rem 0 0.14rem;
+      /*  background-image: linear-gradient(90deg,
+          rgb(135, 230, 254) 0%,
+          rgb(91, 192, 254) 52%,
+          rgb(46, 155, 255) 100%);
+      box-shadow: 0px 0.03rem 0.09rem rgba(38, 122, 199, 0.34); */
+      background: #3cb5fb;
+      border-radius: 0.23rem;
+    }
+    .button {
+      margin: 66rpx 0 0;
+    }
+  }
+}
+
+.userList {
+  // padding-left: 0.16rem;
+  // padding-top: 0.3rem;
+  background: #f6f8fa;
+  height: 100vh;
+  .text-wrapper_1 {
+    padding: 0.15rem 0 0.14rem;
+    /* background-image: linear-gradient(90deg,
+          #87e6fe 0%,
+          #5bc0fe 52%,
+          #2e9bff 100%);
+      box-shadow: 0px 0.03rem 0.09rem rgba(38, 122, 199, 0.34); */
+    background: #3cb5fb;
+    border-radius: 0.23rem;
+  }
+
+  .button {
+    margin: 0.6rem 0.15rem 0;
+  }
+
+  .text_3 {
+    // align-self: center;
+    margin-top: 40rpx;
+    margin-left: 50rpx;
+    color: rgb(51, 51, 51);
+    font-size: 0.18rem;
+    font-family: PingFang;
+    line-height: 0.17rem;
+  }
+
+  .group_4 {
+    margin: 40rpx auto;
+    background: #fff;
+    width: calc(100% - 80rpx);
+    padding: 20rpx;
+    border-radius: 32rpx;
+
+    .list-item {
+      padding: 0.05rem 0.1rem 0.05rem;
+      border-bottom: 2rpx solid #f6f8f9;
+      &:last-child {
+        border-bottom: none;
+      }
+
+      .text_8 {
+        color: #000;
+        font-size: 32rpx;
+        font-family: PingFang;
+        line-height: 0.35rem;
+        // margin-right: 0.15rem;
+      }
+      .item-right {
+        display: flex;
+        align-items: center;
+        width: calc(100% - 150rpx);
+      }
+      .right-img {
+        width: 12rpx;
+        height: 24rpx;
+        margin-left: 10rpx;
+        margin-top: 5rpx;
+      }
+
+      .text_26 {
+        color: #000;
+        font-size: 0.17rem;
+        font-family: PingFang;
+        line-height: 32rpx;
+      }
+    }
+
+    .group_5 {
+      margin-top: 0;
+    }
+
+    ::v-deep .u-input__input {
+      font-size: 32rpx;
+    }
+  }
+}
+::v-deep .u-navbar-placeholder {
+  background: #f6f8fa;
+  // display: none;
+  height: 40rpx !important;
+}
+.preference-page {
+  background: #fff;
+  min-height: 100vh;
+  //   padding: 0 24rpx;
+
+  .selected-count {
+    padding: 0 24rpx;
+    margin: 24rpx 0 30rpx 0;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: rgba(0, 0, 0, 0.9);
+    .desc {
+      display: block;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: rgba(0, 0, 0, 0.6);
+      margin-top: 8rpx;
+    }
+  }
+  .selected-tags {
+    padding: 0 24rpx;
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 24rpx;
+    gap: 24rpx 24rpx;
+
+    .tag {
+      display: flex;
+      align-items: center;
+      background: #3cb5fb;
+      color: #fff;
+      border-radius: 64rpx;
+      padding: 20rpx;
+      font-size: 28rpx;
+      position: relative;
+      max-width: 200rpx;
+      margin-right: 0;
+      margin-bottom: 0;
+      box-sizing: border-box;
+      justify-content: flex-start;
+      gap: 6rpx;
+    }
+
+    .close-btn {
+      font-size: 28rpx;
+      margin-right: 8rpx;
+      cursor: pointer;
+      color: #fff;
+      font-weight: bold;
+      line-height: 1;
+      display: inline-block;
+      width: 32rpx;
+      height: 32rpx;
+      text-align: center;
+      border-radius: 50%;
+      background: rgba(255, 255, 255, 0.18);
+    }
+  }
+  .line {
+    width: 100%;
+    height: 2rpx;
+    background: #f6f8f9;
+  }
+  .line-shadow {
+    width: 100%;
+    height: 2rpx;
+    background: #ffffff;
+    box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(0, 0, 0, 0.05);
+    margin-top: 56rpx;
+  }
+  .all-tags {
+    padding: 0 24rpx;
+    margin-top: 48rpx;
+    .title {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.9);
+      margin-bottom: 16rpx;
+    }
+    .tags-list {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 24rpx 24rpx;
+
+      .tag {
+        background: #f0f4f8;
+        color: #333;
+        border-radius: 200rpx;
+        padding: 20rpx;
+        font-size: 28rpx;
+        text-align: center;
+        max-width: 152rpx;
+        // margin-right: 24rpx;
+        // margin-bottom: 24rpx;
+        box-sizing: border-box;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        &.selected {
+          background: #3cb5fb;
+          color: #fff;
+        }
+      }
+
+      .industry-tag {
+        background: #f0f4f8;
+        color: #333;
+        border-radius: 200rpx;
+        padding: 32rpx;
+        font-size: 28rpx;
+        text-align: center;
+        max-width: 152rpx;
+        box-sizing: border-box;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        &.selected {
+          background: #3cb5fb;
+          color: #fff;
+        }
+      }
+    }
+  }
+  .btn-box {
+    padding: 0 24rpx;
+  }
+  .button {
+    margin: 48rpx 0 0 0;
+    width: 100%;
+  }
+}
+</style>
diff --git a/pages/login/login/login.vue b/pages/login/login/login.vue
new file mode 100644
index 0000000..068d4da
--- /dev/null
+++ b/pages/login/login/login.vue
@@ -0,0 +1,532 @@
+<template>
+	<view class="flex-col page">
+		<!-- <image src="/static/common/img/loginBg.png" class="image" /> -->
+		<view class="img-box">
+
+		</view>
+		<view class="login-box">
+			<view class="tab-list">
+				<view v-for="tab in tabList" :key="tab.id" class="tab-item"
+					:class="activeTab === tab.id ? 'tab-selected' : 'not-selected'" @click="onTab(tab.id)">
+				  <text class="tab-text">{{tab.label}}</text>	
+				</view>
+			</view>
+			<view class="flex-col group">
+				<text class="text"></text>
+				
+				<view class="flex-col group_7">
+					<view class="flex-col">
+						<!-- <text class="text_1">手机号</text> -->
+						<!-- @input="changeInput($event)" -->
+						<!-- <u-input type="number" v-model="userName" placeholder="请输入手机号" class="view text-wrapper" /> -->
+						<u-input type="number" v-model="userName"   placeholder="请输入手机号" class="view text-wrapper" maxlength="11"/>
+					</view>
+					<view class="error-tips" v-if="errorPhone"><image class="error-img" src="/static/common/img/infoCircle.png"></image> 请输入正确手机号</view>
+					<view style="height: 0;width: 0;border: 0;padding: 0;margin: 0;overflow: hidden;">
+						<u-input placeholder='' />
+					</view>
+					<view class="flex-col group_6">
+						<!-- <text class="text_1">密码</text> -->
+						<u-input type="password" v-model="passWord" placeholder="请输入密码" class="view text-wrapper" />
+					</view>
+					<!-- 密码必须包含字母、数字、特殊字符，且不能包含中文 -->
+					<view class="error-tips" v-if="errorPwd"><image class="error-img" src="/static/common/img/infoCircle.png"></image> {{errormsg}}</view>
+
+				</view>
+				<navigator class="text_6" style="width: 100%; text-align: right;" url="/pages/login/ForgetPassword/ForgetPassword">忘记密码？</navigator>
+				<u-button class="flex-col items-center text-wrapper_1" throttle-time='1000' type="primary" shape="circle"
+					@click="login"><text class="text_7">登录</text></u-button>
+				<view class="justify-center group_1">
+					<text class="text_8">还没有账号？</text>
+					<navigator class="text_9" url="/pages/login/register/register">立即注册</navigator>
+				</view>
+				<!-- <view class="flex-row group_2">
+					<u-checkbox-group class="section_1" :size='34'>
+						<u-checkbox v-model="agreement"> </u-checkbox>
+					</u-checkbox-group>
+					<view class="group_3">
+						<text class="text_10">已阅读并同意</text>
+						<text class="text_11">《用户服务协议》</text>
+						<text class="text_12">＆</text>
+						<text class="text_13">《用户隐私保护政策》</text>
+					</view>
+				</view> -->
+			</view>
+			
+		</view>
+		
+		<u-top-tips ref="uTips" :navbar-height='0'></u-top-tips>
+		<u-toast ref="uToast" />
+	</view>
+
+</template>
+
+<script>
+	import {
+		toBaiduApi
+	} from '@/utils/faceVerify.js'
+	import {
+		aesEncrypt
+	} from '@/utils/encrypt.js'
+	export default {
+		data() {
+			return {
+				show: false,
+				userName: "",
+				passWord: "",
+				agreement: true,
+				tabList: [{
+						id: 1,
+						label: '密码登录'
+					},
+					{
+						id: 2,
+						label: '验证码登录'
+					}
+				],
+				activeTab: 1,
+				errorPhone: false,
+				errorPwd: false,
+				errormsg: "",
+			};
+		},
+		onLoad(e) {},
+		onHide(){
+			this.userName= ""
+			this.passWord= ""
+		},
+		onShow() {
+			this.userName= ""
+			this.passWord= ""
+			setTimeout(() => {
+				const lifeData = uni.getStorageSync('lifeData');
+				if (lifeData.vuex_user && lifeData.vuex_token) {
+					this.$u.api.getUser().then(res => {
+						// if(!this.vuex_user.isCard){
+						// 	uni.navigateTo({
+						// 		url: '/pages/Face/index/index'
+						// 	});
+						// 	return
+						// }
+						uni.switchTab({
+							url: '../../main/index/index'
+						});
+					})
+				}
+			}, 200)
+		},
+		methods: {
+			changeInput(e){
+				setTimeout(() => {
+					this.userName = e.target.value
+				}, 0);
+			},
+			onTab(id) {
+				if(id == 1){
+					this.activeTab = id
+				}else{
+					/* uni.showToast({
+						title: '暂未开放',
+						icon: 'none'
+					}) */
+					this.$refs.uToast.show({
+						title: '暂未开放',
+						type: "warning",
+					});
+				}
+				
+			},
+			login() {
+				// this.$u.vuex("vuex_msgList", '');
+				// this.$u.vuex('vuex_user', '')
+				// this.$u.vuex('vuex_token', '')
+				// uni.clearStorage();
+				if (!/^1[3-9]\d{9}$/.test(this.userName)) {
+				// 校验手机号格式是否正确
+				this.errorPhone = true;
+				// return this.$tips("请输入正确的手机号", "error");
+				return;
+				} else {
+				this.errorPhone = false;
+				}
+				// 校验密码格式先注释掉 因为重置密码的时候密码是1q2w3e
+				// if (!/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&.])[A-Za-z\d@$!%*?&.]{5,}$/.test(this.passWord)) {
+				/* if (this.passWord.length < 6) {
+				// 校验密码是否包含字母、数字、特殊字符，且长度至少为6
+				this.errorPwd = true;
+				// return this.$tips("密码必须包含字母、数字、特殊字符，且不能包含中文", "error");
+				return;
+				} else {
+				this.errorPwd = false;
+				} */
+				/* if (!this.agreement) {
+					return this.$tips("请同意用户服务协议及用户隐私保护政策", "error");
+				} */
+				if (this.passWord.length===0) {
+					this.errorPwd = true;
+					this.errormsg = "请输入密码";
+					console.log("请输入密码");
+					return
+				}else if (this.passWord.length>0&&this.passWord.length < 6) {
+					this.errorPwd = true;
+					this.errormsg = "密码长度不能少于6位";
+					console.log("密码长度不能少于6位");
+					return
+				}else{
+					this.errorPwd = false;
+					this.errormsg = "";
+				}
+				uni.showLoading({
+					title: "登录中",
+				});
+				// 
+				let data = {
+					phone: this.userName,
+					password: aesEncrypt(this.passWord),
+				}
+				this.$u.api.LoginApp(data).then((res) => {
+					uni.hideLoading();
+					if (!res.succeed && !res.token) {
+						/* uni.showToast({
+							title: res.error,
+							duration: 2000,
+							icon: 'none'
+						}); */
+						// this.$tips(res.error, "error");
+						this.$refs.uToast.show({
+							title: err.error,
+							type: "error",
+						});
+						return
+					}
+					// this.$tips("登录成功", "success")
+					this.$refs.uToast.show({
+						title: "登录成功",
+						type: "success",
+					});
+					/* uni.showToast({
+						title: "登录成功",
+						duration: 2000,
+					}); */
+					// 保存登录后得到的用户数据
+					this.$u.vuex('vuex_user', res.user)
+					this.$u.vuex('vuex_token', res.token)
+					this.$u.vuex('vuex_glyType', res.glyType)
+					// if(!res.user.isCard){
+					// 	uni.navigateTo({
+					// 		url: '/pages/Face/index/index'
+					// 	});
+					// 	return
+					// }
+					if (res.user.isFill) {
+						uni.switchTab({
+							url: '/pages/home/home/home'
+						});
+					} else {
+						// uni.navigateTo({
+						// 	// url: "../perfect/perfect",
+						// 	url: "../roleSelection",
+						// });
+
+						// 没认证先前往人脸识别
+						toBaiduApi(this);
+
+						return
+						// 这里先注释
+						uni.navigateTo({
+							url: "/pages/login/roleSelection?source=login",
+						});
+					}
+				}).catch(err => {
+					// this.$tips(err.error, "error");
+					this.$refs.uToast.show({
+						title: err.error,
+						type: "error",
+					});
+					/* uni.showToast({
+						title: err.error,
+						icon: 'none'
+					}) */
+				})
+			},
+		},
+	};
+</script>
+
+<style scoped lang="scss">
+	.page {
+		padding-bottom: 30rpx;
+		background-color: rgb(255, 255, 255);
+		overflow-y: auto;
+		width: 100%;
+		overflow-x: hidden;
+		height: 100%;
+		background: url(/static/common/img/loginBg.png);
+		background-size: contain;
+		background-repeat: no-repeat;
+		background-position: top;
+
+		.img-box {
+			height: 420rpx;
+		}
+
+		.image {
+			flex-shrink: 0;
+			align-self: flex-start;
+			width: 102%;
+		}
+
+		.group {
+			background: #fff;
+			padding: 20rpx 25rpx;
+			width: calc(100% - 50rpx);
+			margin: 0 auto;
+			border-radius: 30rpx;
+
+			.text {
+				align-self: center;
+				color: rgb(46, 155, 255);
+				font-size: 32rpx;
+				font-family: PingFang;
+				line-height: 32rpx;
+			}
+
+			.group_7 {
+				margin-top: 40rpx;
+
+				.text-wrapper {
+					border: solid 2rpx #dcdfe6;
+					border-radius: 100rpx;
+					background: #f6f8fa;
+					
+				}
+
+				.group_6 {
+					margin-top: 30rpx;
+				}
+
+				.text_1 {
+					margin-left: 10rpx;
+					align-self: flex-start;
+					color: rgb(51, 51, 51);
+					font-size: 32rpx;
+					font-family: PingFang;
+					line-height: 30rpx;
+				}
+
+				.view {
+					margin-top: 20rpx;
+					padding: 20rpx 50rpx !important;
+				}
+			}
+
+			.text_6 {
+				margin-left: 5rpx;
+				margin-top: 50rpx;
+				align-self: flex-start;
+				// color: rgb(25, 140, 255);
+				color:#1F2232;
+				font-size: 28rpx;
+				font-family: PingFang;
+				line-height: 28rpx;
+			}
+
+			.text-wrapper_1 {
+				margin: 50rpx 0rpx 40rpx;
+				padding: 50rpx 0 50rpx;
+				// background-image: linear-gradient(90deg, rgb(135, 230, 254) 0%, rgb(91, 192, 254) 52%, rgb(46, 155, 255) 100%);
+				background: #3cb4fb;
+				box-shadow: 0px 6rpx 9rpx rgba(38, 122, 199, 0.34);
+				border-radius: 100rpx;
+
+				.text_7 {
+					color: rgb(255, 255, 255);
+					font-size: 32rpx;
+					font-family: PingFang;
+					line-height: 30rpx;
+				}
+			}
+
+			.group_1 {
+				margin-top: 24rpx;
+
+				.text_8 {
+					color: #8697AC;
+					font-size: 30rpx;
+					font-family: PingFang;
+					line-height: 26rpx;
+				}
+
+				.text_9 {
+					margin-left: 0.035rem;
+					color: #2E9CFE;
+					font-size: 30rpx;
+					font-family: PingFang;
+					line-height: 26rpx;
+				}
+			}
+
+			.group_2 {
+				margin-top: 40rpx;
+				justify-content: center;
+
+				.section_1 {
+					flex-shrink: 0;
+					width: 34rpx;
+				}
+
+				.group_3 {
+					margin-left: 24rpx;
+					height: 24rpx;
+					font-size: 0;
+
+					.text_10 {
+						color: rgb(153, 153, 153);
+						font-size: 24rpx;
+						font-family: PingFang;
+					}
+
+					.text_11 {
+						color: rgb(25, 140, 255);
+						font-size: 24rpx;
+						font-family: PingFang;
+					}
+
+					.text_12 {
+						color: rgb(102, 102, 102);
+						font-size: 24rpx;
+						font-family: PingFang;
+					}
+
+					.text_13 {
+						color: rgb(25, 140, 255);
+						font-size: 24rpx;
+						font-family: PingFang;
+					}
+				}
+			}
+		}
+	}
+	.login-box{
+		background: #fff;
+		width: calc(100% - 50rpx);
+		margin: 0 auto;
+		border-radius: 30rpx;
+		// height: calc(100% - 350rpx);
+		overflow: hidden;
+		padding-bottom:100rpx;
+		
+	}
+
+	$tab-height: 52px;
+	$active-color: #fff;
+	$default-color: #90ecf1;
+	$primary-color: #666;
+
+	.tab-list {
+		display: flex;
+		position: relative;
+		z-index: 2;
+		border-radius: 30rpx 30rpx 0 0;
+		background-color: $default-color;
+		overflow: hidden; // 重点
+
+		.tab-item {
+			flex: 1;
+			height: $tab-height;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 30rpx;
+			// opacity: 0.65;   // 暂时删除，不选中样式需要重新编写
+			
+			font-weight: 600;
+			position: relative;
+		}
+
+
+		.tab-selected {
+			color:#3cb5fb;
+			opacity: 1;
+			background: #ffffff;
+			border-radius: 24rpx 24rpx 0 0;
+			box-shadow: 48rpx 80rpx 0 $active-color, -34rpx 90rpx 0 0 $active-color; // 重点
+			.tab-text::after{
+				content: '';
+				position: absolute;
+				left: 160rpx;
+				bottom: 10rpx;
+				width: 32rpx;
+				height: 8rpx;
+				background: #3CB5FB;
+				border-radius: 20rpx;
+			}
+		}
+
+		.tab-selected::before {
+			content: '';
+			position: absolute;
+			left: -12rpx;
+			bottom: 0;
+			width: 24rpx;
+			height: $tab-height;
+			border-top-left-radius: 48rpx;
+			background-color: $active-color;
+			transform: skewX(-15deg); // 重点
+		}
+
+		.tab-selected::after {
+			content: '';
+			position: absolute;
+			right: -12rpx;
+			bottom: 0;
+			width: 24rpx;
+			height: $tab-height;
+			border-top-right-radius: 24rpx;
+			background-color: $active-color;
+			transform: skewX(15deg); // 重点
+		}
+		.not-selected {
+			color: $primary-color;
+		}
+
+		.not-selected::before {
+			content: '';
+			position: absolute;
+			left: 12rpx;
+			bottom: 0;
+			width: 24rpx;
+			height: $tab-height;
+			background: $default-color;
+			border-bottom-left-radius: 24rpx;
+			transform: skewX(15deg); // 重点
+		}
+
+		.not-selected::after {
+			content: '';
+			position: absolute;
+			right: 12rpx;
+			bottom: 0;
+			width: 24rpx;
+			height: $tab-height;
+			background: $default-color;
+			border-bottom-right-radius: 24rpx;
+			transform: skewX(-15deg); // 重点
+			z-index: -1;
+		}
+	}
+	.error-tips{
+		font-size: 24rpx;
+		color: #EF3920;	
+		display: flex;
+		text-align: center;
+		margin-top: 10rpx;
+		// padding-left: 30rpx;
+		.error-img{
+			width: 32rpx;
+			height: 32rpx;
+			margin-right: 5rpx;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/login/perfect/perfect.vue b/pages/login/perfect/perfect.vue
new file mode 100644
index 0000000..2090c2e
--- /dev/null
+++ b/pages/login/perfect/perfect.vue
@@ -0,0 +1,1344 @@
+<template>
+  <view class="flex-col page">
+    <u-navbar
+      :border-bottom="false"
+      title="个人资料"
+      :custom-back="back"
+    ></u-navbar>
+    <view v-if="step == 0" class="flex-col group_2">
+      <!-- <h3 class="text_3">个人资料设置</h3> -->
+      <view class="flex-col items-center group_1">
+        <u-avatar
+          :mode="shape"
+          :src="headerImg"
+          @click="chooseAvatar"
+          size="260"
+        />
+        <text class="text_4">请上传头像</text>
+      </view>
+      <view class="flex-col group_5 input-box">
+        <u-input
+          type="text"
+          :maxlength="8"
+          v-model="form.userName"
+          placeholder="请输入用户名称"
+          class="text-wrapper view"
+        />
+      </view>
+      <view class="flex-col input-box" style="margin-top: 16px">
+        <u-input
+          type="text"
+          :maxlength="8"
+          v-model="form.name"
+          placeholder="请输入真实的姓名"
+          class="text-wrapper view"
+        />
+      </view>
+      <view class="flex-col group_3">
+        <text class="text_7" style="margin-bottom: 26px">性别</text>
+        <u-radio-group
+          v-model="form.sex"
+          placement="row"
+          name="sexGroup"
+          width="50%"
+        >
+          <u-radio
+            v-for="(item, index) in sexOptions"
+            :key="index"
+            :name="item.value"
+          >
+            {{ item.label }}
+          </u-radio>
+        </u-radio-group>
+        <!-- <view
+          class="flex-col items-center group_6"
+          @click="form.sex = '男'"
+          :class="{ on: form.sex === '男' }"
+        >
+          <image src="/static/common/img/male.png" class="image_4" />
+          <text class="text_8">男</text>
+        </view>
+        <view
+          class="flex-col items-center group_4"
+          @click="form.sex = '女'"
+          :class="{ on: form.sex === '女' }"
+        >
+          <image src="/static/common/img/female.png" class="image_4" />
+          <text class="text_9">女</text>
+        </view> -->
+      </view>
+      <u-button
+        shape="circle"
+        class="button text-wrapper_1"
+        type="primary"
+        @click="next"
+        >下一步</u-button
+      >
+    </view>
+    <u-navbar
+      :custom-back="back"
+      v-if="step == 1"
+      :border-bottom="false"
+      :background="background"
+    >
+    </u-navbar>
+    <view v-if="step == 1" class="flex-col group_3 userList">
+      <h3 class="text_3">填写学校信息</h3>
+      <view class="flex-col group_4">
+        <view class="justify-between list-item group_5">
+          <text class="text_8">学历</text>
+          <view class="item-right">
+            <view class="input-cover" @click="educationalShow = true"></view>
+            <u-input
+              v-model="form.educationStr"
+              placeholder="请选择学历"
+              inputAlign="right"
+              disabled
+            />
+            <u-action-sheet
+              :list="educationalList"
+              v-model="educationalShow"
+              @click="educationalSelect"
+            >
+            </u-action-sheet>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">学校</text>
+          <view class="item-right">
+            <view class="input-cover" @click="shoolShow = true"></view>
+            <u-input
+              v-model="shoolName"
+              placeholder="请选择学校"
+              inputAlign="right"
+              disabled
+            />
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+            <u-select
+              v-model="shoolShow"
+              :default-value="defaultTime"
+              mode="single-column"
+              title="学校选择"
+              :list="shoolList"
+              @confirm="shoolSelect"
+            >
+            </u-select>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">学院</text>
+          <view class="item-right">
+            <view class="input-cover" @click="collegeShow = true"></view>
+            <u-input
+              v-model="form.college"
+              placeholder="请选择学院"
+              inputAlign="right"
+              disabled
+            />
+            <u-select
+              v-model="collegeShow"
+              mode="single-column"
+              :list="CollegeList"
+              @confirm="selectCpllege"
+            ></u-select>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">专业</text>
+          <view class="item-right">
+            <view class="input-cover" @click="majorShow = true"></view>
+            <u-input
+              v-model="form.major"
+              placeholder="请选择专业"
+              inputAlign="right"
+              disabled
+            />
+            <u-select
+              v-model="majorShow"
+              mode="single-column"
+              :list="MajorList"
+              @confirm="selectMajor"
+            ></u-select>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">时间</text>
+          <view class="item-right">
+            <view class="input-cover" @click="timeShow = true"></view>
+            <u-input
+              v-model="showTime"
+              placeholder="请选择时间"
+              inputAlign="right"
+              disabled
+            />
+            <u-select
+              v-model="timeShow"
+              :default-value="defaultTime"
+              mode="mutil-column"
+              title="在校时间"
+              :list="timeList"
+              @confirm="confirm"
+            >
+            </u-select>
+            <image
+              src="/static/common/img/row_right.png"
+              class="right-img"
+            ></image>
+          </view>
+        </view>
+      </view>
+      <template v-if="isGraduate">
+        <h3 class="text_3">就业信息</h3>
+        <view class="flex-col group_4">
+          <view class="justify-between list-item">
+            <text class="text_8">行业领域</text>
+            <view class="item-right">
+              <view
+                class="input-cover"
+                @click="workAreaPopupShow = true"
+              ></view>
+              <u-input
+                v-model="selectedWorkArea"
+                placeholder="请选择行业"
+                inputAlign="right"
+                disabled
+              />
+              <u-select
+                v-model="workAreaPopupShow"
+                mode="single-column"
+                title="行业领域"
+                :list="WorkAreaList"
+                @confirm="workAreaSelect"
+              >
+              </u-select>
+              <image
+                src="/static/common/img/row_right.png"
+                class="right-img"
+              ></image>
+            </view>
+          </view>
+        </view>
+      </template>
+      <u-button
+        shape="circle"
+        class="button text-wrapper_1"
+        type="primary"
+        @click="complete"
+        >完成</u-button
+      >
+    </view>
+
+    <view v-if="step == 2" class="flex-col preference-page">
+      <u-navbar title="推荐偏好" :border-bottom="false" :custom-back="back" />
+
+      <view class="selected-count">
+        已选择（{{ selectedPreferences.length }}/10）
+        <text class="desc"
+          >您选择的标签将影响系统推荐给你的信息类型，进入系统后可以在我的-个人信息中修改。</text
+        >
+      </view>
+
+      <view class="selected-tags">
+        <view
+          v-for="item in selectedPreferences"
+          :key="item.lableName"
+          class="tag selected"
+        >
+          {{ item.lableName }}
+          <image
+            class="close-btn"
+            src="/static/common/img/handDelete.png"
+            @click.stop="removePreference(item)"
+          ></image>
+        </view>
+      </view>
+      <view class="line"></view>
+      <view class="all-tags">
+        <view class="title">行业领域</view>
+        <view class="tags-list">
+          <view
+            v-for="(item, index) in industryList"
+            :key="item.lableId"
+            class="industry-tag"
+            :class="{ selected: selectedIndustryId === item.lableId }"
+            @click="handleIndustrySelect(index)"
+            >{{ item.lableName }}</view
+          >
+        </view>
+        <view class="title">行业方向</view>
+        <view class="tags-list industry-tag-list">
+          <view
+            v-for="item in industryDirectionList"
+            :key="item.lableName"
+            class="industry-tag"
+            :class="{ selected: selectedPreferences.includes(item) }"
+            @click="togglePreference(item)"
+            >{{ item.lableName }}</view
+          >
+        </view>
+      </view>
+      <view class="line-shadow"></view>
+      <view class="btn-box">
+        <u-button shape="circle" class="button" type="primary" @click="nextStep"
+          >下一步</u-button
+        >
+      </view>
+    </view>
+    <view v-if="step == 3" class="flex-col preference-page">
+      <u-navbar title="推荐偏好" :border-bottom="false" :custom-back="back" />
+      <view class="selected-count">
+        已选择（{{ selectedInterests.length }}/10）
+        <text class="desc"
+          >您选择的标签将影响系统推荐给你的信息类型，进入系统后可以在我的-个人信息中修改。</text
+        >
+      </view>
+
+      <view class="selected-tags">
+        <view
+          v-for="item in selectedInterests"
+          :key="item.lableId"
+          class="tag selected"
+        >
+          {{ item.lableName }}
+          <image
+            class="close-btn"
+            src="/static/common/img/handDelete.png"
+            @click.stop="removeInterest(item)"
+          ></image>
+        </view>
+      </view>
+      <view class="line"></view>
+      <view class="all-tags">
+        <view class="title">兴趣爱好</view>
+        <view class="tags-list">
+          <view
+            v-for="item in interestList"
+            :key="item.lableId"
+            class="tag"
+            :class="{ selected: selectedInterests.includes(item) }"
+            @click="toggleInterest(item)"
+            >{{ item.lableName }}</view
+          >
+        </view>
+      </view>
+      <view class="line-shadow"></view>
+      <view class="btn-box">
+        <u-button
+          shape="circle"
+          class="button"
+          type="primary"
+          @click="finishPreference"
+          >完成</u-button
+        >
+      </view>
+    </view>
+
+    <u-top-tips :z-index="999" ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import headerImg from "@/static/common/img/headerImg.png";
+export default {
+  data() {
+    return {
+      step: 0,
+      headerImg: headerImg,
+      shoolName: "",
+      showTime: "",
+      form: {
+        userId: "", //用户id
+        name: "", //名字
+        userName: "", //用户名
+        sex: "男", //性别
+        path: "", //头像
+        educationStr: "", //学历
+        schoolId: "", //学校
+        college: "", //学院
+        major: "", //专业
+        startYear: "", //开始时间
+        endYear: "", //结束时间,
+        collegeId: "", //学院id
+        majorId: "", //专业id
+        list: [],
+      },
+      studentId: '', //在校生id
+      sexOptions: [
+        { label: "男生", value: "男" },
+        { label: "女生", value: "女" },
+      ],
+      background: {
+        backgroundColor: "#f6f8fa",
+      },
+      value: "",
+      defaultTime: "",
+      show: false,
+      educationalShow: false,
+      educationalList: [
+        //学历选择列表
+        {
+          text: "大专",
+        },
+        {
+          text: "本科",
+        },
+        {
+          text: "硕士研究生",
+        },
+        {
+          text: "博士研究生",
+        },
+      ],
+      shoolShow: false,
+      shoolList: [], //学校选择
+      CollegeList: [], //学院选择
+      MajorList: [], //专业选择
+      timeShow: false,
+      timeList: [], //时间选择
+      collegeShow: false,
+      majorShow: false,
+      isGraduate: false,
+      workAreaPopupShow: false, //就业领域选择
+      selectedWorkArea: "",
+      selectedWorkAreaId: "",
+      WorkAreaList: [],
+      selectedPreferences: [],
+      industryList: [], // 行业领域列表
+      selectedIndustry: [], // 行业领域选择
+      industryDirectionList: [], // 行业方向列表
+      selectedIndustryDirection: [], // 行业方向选择
+      labelList: [], // 原始标签数据
+      interestList: [],
+      selectedInterests: [],
+      shape: "square",
+      selectedIndustryName: '', // 当前选中的行业领域名称
+      selectedIndustryId: null, // 当前选中的行业领域ID，初始化为null以避免匹配任何id
+    };
+  },
+  onLoad(e) {
+    // this.GetLableList();
+    // this.GetInterestLable()
+    this.getWorkFile();
+    // 监听从裁剪页发布的事件，获得裁剪结果
+    uni.$on("uAvatarCropper", (path) => {
+      this.headerImg = path;
+      let file = this.common.base64toFile(path, new Date().getTime());
+      if (file.type.indexOf("image") < 0) {
+        // this.$tips("请选择图片", "error");
+        this.$refs.uToast.show({
+          title: "请选择图片",
+          type: "error",
+        });
+        return false;
+      }
+      uni.uploadFile({
+        url: this.$u.http.config.baseUrl + "/app/User/File",
+        file: file,
+        fileType: "image",
+        header: {
+          Authorization: "Bearer " + this.vuex_token,
+        },
+        complete: (res) => {
+          this.form.path = JSON.parse(res.data).data;
+        },
+      });
+    });
+
+    if (this.vuex_user.id) {
+      this.form.userId = this.vuex_user.id;
+    } else {
+      this.$u.route({
+        url: "/pages/login/login/login",
+      });
+    }
+
+    if (this.vuex_userInfo.realName) {
+      this.form.name = this.vuex_userInfo.realName;
+    }
+
+    this.getShool();
+    var arr1 = [],
+      arr2 = [];
+    var isyear = new Date().getFullYear();
+    for (var i = 1990; i <= isyear + 10; i++) {
+      if (i <= isyear) {
+        arr1.push({
+          value: i,
+          label: i,
+        });
+      }
+      arr2.push({
+        value: i,
+        label: i,
+      });
+    }
+    this.timeList.push(arr1);
+    this.timeList.push(arr2);
+    this.defaultTime = [arr1.length - 1, arr2.length - 7];
+    this.echoFn();
+  },
+
+  methods: {
+    nextStep() {
+      this.step = 3;
+      this.GetInterestLable();
+      console.log("下一步");
+    },
+    async GetInterestLable() {
+      const res = await this.$u.apiList.GetInterestLable();
+      console.log("获取标签", res);
+      this.interestList = res;
+    },
+    toggleInterest(item) {
+      // 先判断是否已达到最大选择数量
+      if (this.selectedInterests.length >= 10) {
+        this.$refs.uToast.show({
+          title: "最多选择10个",
+          type: "error",
+        });
+        return;
+      }
+
+      // 从 interestList 中查找待移除的标签
+      const interestIndex = this.interestList.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+
+      if (interestIndex > -1) {
+        // 移除标签
+        this.interestList.splice(interestIndex, 1);
+        // 添加到已选择列表
+        this.selectedInterests.push(item);
+      }
+    },
+    removeInterest(item) {
+      // 从已选择列表中移除
+      const selectedIndex = this.selectedInterests.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+      if (selectedIndex > -1) {
+        this.selectedInterests.splice(selectedIndex, 1);
+        // 添加回 interestList
+        this.interestList.push(item);
+      }
+    },
+    togglePreference(item) {
+      // 先判断是否已达到最大选择数量
+      if (this.selectedPreferences.length >= 10) {
+        this.$refs.uToast.show({
+          title: "最多选择10个",
+          type: "error",
+        });
+        return;
+      }
+
+      // 从 industryDirectionList 中查找待移除的标签
+      const directionIndex = this.industryDirectionList.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+      if (directionIndex > -1) {
+        // 移除标签
+        this.industryDirectionList.splice(directionIndex, 1);
+        // 添加到已选择列表
+        this.selectedPreferences.push(item);
+      }
+    },
+    removePreference(item) {
+      // 从已选择列表中移除
+      const selectedIndex = this.selectedPreferences.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+      if (selectedIndex > -1) {
+        this.selectedPreferences.splice(selectedIndex, 1);
+
+        // 获取当前选中的行业领域（根据lableId）
+        const currentIndustry = this.labelList.find(
+          (i) => i.lableId === this.selectedIndustryId // ***修改：使用lableId查找***
+        );
+        if (currentIndustry && currentIndustry.list) {
+          // 如果删除的标签属于当前行业领域，则添加回列表
+          const originalItem = currentIndustry.list.find(
+            (i) => i.lableId === item.lableId
+          );
+          if (originalItem) {
+            this.industryDirectionList.push(originalItem);
+          }
+        }
+      }
+    },
+    // 回填个人信息  如果已经存在教师身份，学生身份未认证时
+    async echoFn() {
+      const res = await this.$u.apiList.SelectUserTypeApi();
+      console.log(res, "res---");
+      const jzgFlag = res.jzgFlag;
+      const studentFlag = res.studentFlag;
+      if (studentFlag === false && jzgFlag === true) {
+        this.form.name = this.vuex_user.name;
+        this.form.userName = this.vuex_user.userName
+        this.form.sex = this.vuex_user.sex;
+        this.headerImg = this.$u.http.config.baseUrl + this.vuex_user.head;
+        this.shape = 'circle'
+        this.form.path = this.vuex_user.head;
+      }
+    },
+    //完成信息填写
+    async complete() {
+      var data = this.form;
+      if (data.educationStr == "") {
+        // return this.$tips("请选择学历", "error");
+        return this.$refs.uToast.show({
+          title: "请选择学历",
+          type: "error",
+        });
+      }
+      if (data.schoolId == "") {
+        // return this.$tips("请选择学校", "error");
+        return this.$refs.uToast.show({
+          title: "请选择学校",
+          type: "error",
+        });
+      }
+      if (data.college == "") {
+        // return this.$tips("请填写学院", "error");
+        return this.$refs.uToast.show({
+          title: "请填写学院",
+          type: "error",
+        });
+      }
+      if (data.major == "") {
+        // return this.$tips("请填写专业", "error");
+        return this.$refs.uToast.show({
+          title: "请填写专业",
+          type: "error",
+        });
+      }
+      if (data.startYear == "" && data.endYear == "") {
+        // return this.$tips("请选择在校时间", "error");
+        return this.$refs.uToast.show({
+          title: "请选择在校时间",
+          type: "error",
+        });
+      }
+      if (new Date(data.startYear) - new Date(data.endYear) > 0) {
+        // return this.$tips("请选择正确的在校时间", "error");
+        return this.$refs.uToast.show({
+          title: "请选择正确的在校时间",
+          type: "error",
+        });
+      }
+      if (this.isGraduate) {
+        console.log("跳转标签设置");
+        if (this.selectedWorkAreaId == "") {
+          this.$refs.uToast.show({
+            title: "请选择行业领域",
+            type: "error",
+          });
+          return;
+        }
+        this.step = 2;
+        console.log("form---", this.form);
+        this.GetLableList();
+        return;
+      } else {
+        this.step = 3;
+        this.GetInterestLable()
+      }
+      // data.userType = 0;
+      // // 按照之前逻辑  真实姓名传参给 userName
+      // data.userName = this.form.name;
+      // // 新增用户名
+      // data.name = this.form.userName;
+      // data.list = this.selectedWorkAreaId
+      //   ? [{ lableId: this.selectedWorkAreaId }]
+      //   : [];
+      // data.workFieldId = this.WorkAreaList[0].value;
+      // console.log(data, "data--");
+      // const res = await this.$u.api.saveUserInfo(data);
+
+      // const req = {
+      //   userId: this.vuex_user.id,
+      //   educationId: res,
+      // };
+      // const result = await this.$u.apiList.SelectEducation(req);
+      // console.log(result, "result--");
+      // this.$u.vuex("vuex_token", result.token);
+      // this.$u.vuex("vuex_glyType", result.glyType);
+      // this.$u.vuex("vuex_user", result.user);
+      // this.$u.api.getUser().then(() => {
+      //   this.vuex_user.isFill = true;
+      //   uni.switchTab({
+      //     url: "../../main/index/index",
+      //   });
+      // });
+    },
+    // 获取学校
+    getShool() {
+      this.$u.api.GetAllSchool().then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.shoolList.push({
+            label: res[i].schoolName + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+
+      setTimeout(() => {
+        if (this.vuex_userInfo.schoolName) {
+          this.shoolName = this.vuex_userInfo.schoolName.name;
+          this.form.schoolId = this.vuex_userInfo.schoolName.id;
+          this.getColleg(this.form.schoolId);
+
+          // console.log(this.vuex_userInfo.schoolName.id);
+          // console.log('this.form',this.form);
+        }
+      }, 300);
+    },
+    //获取学院
+    getColleg(id) {
+      const data = {
+        schoolid: id,
+      };
+      this.$u.apiList.GetCollegeList(data).then((res) => {
+        this.CollegeList = [];
+        for (let i = 0; i < res.length; i++) {
+          this.CollegeList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取学院专业
+    getMajor(id) {
+      const data = {
+        schoolid: this.form.schoolId,
+        collegeid: id,
+      };
+      this.$u.apiList.GetMajorList(data).then((res) => {
+        this.MajorList = [];
+        for (let i = 0; i < res.length; i++) {
+          this.MajorList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    // 学历选择
+    educationalSelect(index) {
+      this.form.educationStr = this.educationalList[index].text;
+    },
+    // 时间选择
+    confirm(e) {
+      this.showTime = e[0].value + " - " + e[1].value;
+      this.form.startYear = e[0].value + "";
+      this.form.endYear = e[1].value + "";
+
+      // 判断是否为毕业生
+      const currentYear = new Date().getFullYear();
+      if (parseInt(e[1].value) < currentYear) {
+        this.isGraduate = true;
+      } else {
+        this.isGraduate = false;
+      }
+    },
+    // 学校选择
+    shoolSelect(e) {
+      this.form.college = "";
+      this.form.collegeId = "";
+      this.form.major = "";
+      this.form.majorId = "";
+      this.shoolName = e[0].label;
+      this.form.schoolId = e[0].value;
+      this.getColleg(this.form.schoolId);
+    },
+    //学院选择
+    selectCpllege(e) {
+      this.form.major = "";
+      this.form.majorId = "";
+      this.form.college = e[0].label;
+      this.form.collegeId = e[0].value;
+      this.getMajor(this.form.collegeId);
+    },
+    //选择专业
+    selectMajor(e) {
+      this.form.major = e[0].label;
+      this.form.majorId = e[0].value;
+    },
+    // 头像裁剪
+    chooseAvatar() {
+      // 此为uView的跳转方法，详见"文档-JS"部分，也可以用uni的uni.navigateTo
+      this.shape = "circle";
+      this.$u.route({
+        // 关于此路径，请见下方"注意事项"
+        url: "/uview-ui/components/u-avatar-cropper/u-avatar-cropper",
+        // 内部已设置以下默认参数值，可不传这些参数
+        params: {
+          // 输出图片宽度，高等于宽，单位px
+          destWidth: 200,
+          // 裁剪框宽度，高等于宽，单位px
+          rectWidth: 200,
+          // 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可
+          fileType: "jpg",
+          shape: "circle", // 新增：设置为圆形裁剪
+        },
+      });
+    },
+    back() {
+      if (this.step > 0) {
+        if (this.step === 3 && !this.isGraduate) {
+          // 如果不是毕业生，从 step 3 直接返回到 step 1
+          this.step = 1;
+        } else {
+          this.step--;
+        }
+      } else {
+        uni.navigateBack(); // 当 step 为 0 时，返回上一页
+      }
+    },
+    next() {
+      const data = this.form;
+      if (!data.path) {
+        // return this.$tips("请上传头像", "error");
+        return this.$refs.uToast.show({
+          title: "请上传头像",
+          type: "error",
+        });
+      }
+      if (!data.name) {
+        // return this.$tips("请填写真实姓名", "error");
+        return this.$refs.uToast.show({
+          title: "请填写真实姓名",
+          type: "error",
+        });
+      }
+      if (!data.userName) {
+        // return this.$tips("请填写真实姓名", "error");
+        return this.$refs.uToast.show({
+          title: "请填写用户名",
+          type: "error",
+        });
+      }
+      var reg = new RegExp("^[\u4e00-\u9fa5]{0,}$", "g");
+      if (!reg.test(data.name)) {
+        //  this.$tips("请输入正确的真实姓名", "error");
+        this.$refs.uToast.show({
+          title: "请输入正确的真实姓名",
+          type: "error",
+        });
+        return;
+      }
+      if (!data.sex) {
+        // return this.$tips("请选择性别", "error");
+        return this.$refs.uToast.show({
+          title: "请选择性别",
+          type: "error",
+        });
+      }
+      this.step = 1;
+      console.log(this.form, "this.form--");
+    },
+    getWorkFile() {
+      this.$u.apiList.GetWorkFile().then((res) => {
+        this.studentId = res.find(item => item.workFieldName === '在校生').id;
+        this.WorkAreaList = res.map((item) => {
+          return {
+            label: item.workFieldName,
+            value: item.id,
+          };
+        }).filter(item => item.label !== '在校生' && item.label !== '教师' && item.label !== '未知');
+      });
+      console.log('WorkAreaList----',this.WorkAreaList)
+    },
+    workAreaSelect(e) {
+      console.log("选择行业领域", e);
+      this.selectedWorkArea = e[0].label;
+      this.selectedWorkAreaId = e[0].value;
+      let param = { WorkFileId: e[0].value };
+      this.$u.apiList.GetLableList(param).then((res) => {
+        this.labelList = res;
+        console.log("res----", res);
+      });
+    },
+    GetLableList() {
+      let param = { WorkFileId: this.selectedWorkAreaId };
+      this.$u.apiList.GetLableList(param).then((res) => {
+        this.labelList = res;
+        // industryList 存储完整的对象数组
+        this.industryList = res;
+
+        // 默认选中第一个行业领域并显示其方向
+        if (res.length > 0) {
+          this.selectedIndustryId = res[0].lableId; // ***修改：使用lableId***
+          this.selectedIndustryName = res[0].lableName; // 存储名称
+
+          if (res[0].list) {
+            this.industryDirectionList = res[0].list;
+          } else {
+            this.industryDirectionList = [];
+          }
+        } else {
+          this.selectedIndustryId = null; // 如果没有数据，清空选中状态为null
+          this.selectedIndustryName = ''; // 清空名称
+          this.industryDirectionList = []; // 清空行业方向列表
+        }
+      });
+    },
+    // 处理行业领域选择
+    handleIndustrySelect(index) {
+      const clickedIndustryItem = this.industryList[index]; // 获取完整对象
+
+      // 更新选中的行业领域ID和名称
+      this.selectedIndustryId = clickedIndustryItem.lableId; // ***修改：使用lableId***
+      this.selectedIndustryName = clickedIndustryItem.lableName;
+
+      // 获取已选择的标签ID列表
+      const selectedIds = this.selectedPreferences.map((item) => item.lableId);
+
+      if (clickedIndustryItem && clickedIndustryItem.list) {
+        // 过滤掉已选择的标签
+        this.industryDirectionList = clickedIndustryItem.list.filter(
+          (item) => !selectedIds.includes(item.lableId)
+        );
+      } else {
+        this.industryDirectionList = [];
+      }
+    },
+    // 完成偏好设置
+    async finishPreference() {
+      if (
+        this.selectedPreferences.length === 0 &&
+        this.selectedInterests.length === 0
+      ) {
+        this.$refs.uToast.show({
+          title: "请至少选择一个标签",
+          type: "error",
+        });
+        return;
+      }
+
+      try {
+        // 构建标签列表，只包含当前选中的标签
+        const preferenceList = this.selectedPreferences.map((item) => ({
+          lableId: item.lableId,
+        }));
+
+        const interestList = this.selectedInterests.map((item) => ({
+          lableId: item.lableId,
+        }));
+
+        this.form.list = [...preferenceList, ...interestList];
+        this.form.userType = this.isGraduate ? 2 : 0;
+        this.form.workFieldId = this.isGraduate ? this.selectedWorkAreaId : this.studentId;  //在校生id
+        // 调用保存接口
+        const res = await this.$u.api.saveUserInfo(this.form);
+        const req = {
+          userId: this.vuex_user.id,
+          educationId: res,
+        };
+        const result = await this.$u.apiList.SelectEducation(req);
+        this.$u.vuex("vuex_token", result.token);
+        this.$u.vuex("vuex_glyType", result.glyType);
+        this.$u.vuex("vuex_user", result.user);
+
+        this.$u.api.getUser().then(() => {
+          this.vuex_user.isFill = true;
+          uni.switchTab({
+            url: "../../main/index/index",
+          });
+        });
+        // 保存成功后跳转到首页
+      } catch (error) {
+        this.$refs.uToast.show({
+          title: "保存失败，请重试",
+          type: "error",
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.page {
+  background-color: rgb(255, 255, 255);
+  overflow-y: auto;
+  width: 100%;
+  overflow-x: hidden;
+  height: 100%;
+
+  .group_2 {
+    padding: 0.49rem 0.29rem 1.15rem;
+    overflow-y: auto;
+
+    .text_3 {
+      align-self: center;
+      color: rgb(51, 51, 51);
+      font-size: 0.18rem;
+      font-family: PingFang;
+      line-height: 0.17rem;
+    }
+
+    .group_1 {
+      margin-top: 0.15rem;
+
+      .text_4 {
+        margin-top: 0.15rem;
+        color: rgb(153, 153, 153);
+        font-size: 0.14rem;
+        font-family: PingFang;
+        line-height: 0.13rem;
+      }
+    }
+
+    .group_5 {
+      margin-top: 0.4rem;
+
+      .text_5 {
+        align-self: flex-start;
+        color: rgb(51, 51, 51);
+        font-size: 0.15rem;
+        font-family: PingFang;
+        line-height: 0.14rem;
+      }
+
+      .view {
+        // border-bottom: solid 0.005rem rgb(153, 153, 153);
+      }
+
+      .text-wrapper {
+        // margin-top: 0.16rem;
+      }
+    }
+    .input-box {
+      padding: 20rpx 40rpx;
+      border-radius: 100rpx;
+      background: #f6f8f9;
+    }
+
+    .group_3 {
+      margin-top: 32rpx;
+      // height: 1.35rem;
+      position: relative;
+
+      .image_4 {
+        filter: drop-shadow(0px 0.015rem 0.03rem rgba(102, 102, 102, 0.23));
+        width: 0.68rem;
+        height: 0.68rem;
+      }
+
+      .text_7 {
+        color: rgb(51, 51, 51);
+        font-size: 32rpx;
+        font-family: PingFang;
+        line-height: 32rpx;
+        font-weight: bold;
+        // position: absolute;
+        // left: 0;
+        // top: 0;
+      }
+
+      .group_4.on,
+      .group_6.on {
+        image {
+          border: 2px solid #5ac0ff;
+          border-radius: 50%;
+          overflow: hidden;
+        }
+      }
+
+      .group_6 {
+        position: absolute;
+        left: 0.4rem;
+        top: 0.4rem;
+
+        .text_8 {
+          margin-top: 0.15rem;
+          color: rgb(51, 51, 51);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.13rem;
+        }
+      }
+
+      .group_4 {
+        position: absolute;
+        right: 0.4rem;
+        top: 0.4rem;
+
+        .text_9 {
+          margin-top: 0.15rem;
+          color: rgb(51, 51, 51);
+          font-size: 0.14rem;
+          font-family: PingFang;
+          line-height: 0.13rem;
+        }
+      }
+    }
+
+    .text-wrapper_1 {
+      padding: 0.15rem 0 0.14rem;
+      /*  background-image: linear-gradient(90deg,
+          rgb(135, 230, 254) 0%,
+          rgb(91, 192, 254) 52%,
+          rgb(46, 155, 255) 100%);
+      box-shadow: 0px 0.03rem 0.09rem rgba(38, 122, 199, 0.34); */
+      background: #3cb5fb;
+      border-radius: 0.23rem;
+    }
+
+    .button {
+      margin: 66rpx 0 0;
+    }
+  }
+}
+
+.userList {
+  // padding-left: 0.16rem;
+  // padding-top: 0.3rem;
+  background: #f6f8fa;
+  height: 100vh;
+  .text-wrapper_1 {
+    padding: 0.15rem 0 0.14rem;
+    /* background-image: linear-gradient(90deg,
+        #87e6fe 0%,
+        #5bc0fe 52%,
+        #2e9bff 100%);
+    box-shadow: 0px 0.03rem 0.09rem rgba(38, 122, 199, 0.34); */
+    background: #3cb5fb;
+    border-radius: 0.23rem;
+  }
+
+  .button {
+    margin: 0.6rem 0.15rem 0;
+  }
+
+  .text_3 {
+    // align-self: center;
+    margin-top: 40rpx;
+    margin-left: 50rpx;
+    color: rgb(51, 51, 51);
+    font-size: 0.18rem;
+    font-family: PingFang;
+    line-height: 0.17rem;
+  }
+
+  .group_4 {
+    margin: 40rpx auto;
+    background: #fff;
+    width: calc(100% - 80rpx);
+    padding: 20rpx;
+    border-radius: 32rpx;
+
+    .list-item {
+      padding: 0.05rem 0.1rem 0.05rem;
+      border-bottom: 2rpx solid #f6f8f9;
+      &:last-child {
+        border-bottom: none;
+      }
+
+      .text_8 {
+        color: #000;
+        font-size: 32rpx;
+        font-family: PingFang;
+        line-height: 0.35rem;
+        // margin-right: 0.15rem;
+      }
+      .item-right {
+        display: flex;
+        align-items: center;
+        width: calc(100% - 150rpx);
+        position: relative;
+      }
+
+      .input-cover {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 1;
+      }
+
+      .right-img {
+        width: 12rpx;
+        height: 24rpx;
+        margin-left: 10rpx;
+        margin-top: 5rpx;
+      }
+
+      .text_26 {
+        color: #000;
+        font-size: 0.17rem;
+        font-family: PingFang;
+        line-height: 32rpx;
+      }
+    }
+
+    .group_5 {
+      margin-top: 0;
+    }
+
+    ::v-deep .u-input__input {
+      font-size: 32rpx;
+    }
+  }
+}
+::v-deep .u-navbar-placeholder {
+  background: #f6f8fa;
+  // display: none;
+  height: 40rpx !important;
+}
+
+.preference-page {
+  background: #fff;
+  height: calc(100vh - 300rpx);
+  display: flex;
+  flex-direction: column;
+
+  .selected-count {
+    padding: 24rpx;
+    font-weight: bold;
+    font-size: 32rpx;
+    line-height: 48rpx;
+    color: rgba(0, 0, 0, 0.9);
+    .desc {
+      display: block;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: rgba(0, 0, 0, 0.6);
+      line-height: 40rpx;
+      margin-top: 8rpx;
+    }
+  }
+  .selected-tags {
+    padding: 0 24rpx;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 24rpx 24rpx;
+
+    .tag {
+      display: flex;
+      align-items: center;
+      background: #3cb5fb;
+      color: #fff;
+      border-radius: 64rpx;
+      padding: 20rpx;
+      font-size: 28rpx;
+      position: relative;
+      // max-width: 200rpx;
+      margin-right: 0;
+      margin-bottom: 0;
+      box-sizing: border-box;
+      justify-content: flex-start;
+      gap: 6rpx;
+    }
+
+    .close-btn {
+      font-size: 28rpx;
+      margin-right: 8rpx;
+      cursor: pointer;
+      color: #fff;
+      font-weight: bold;
+      line-height: 1;
+      display: inline-block;
+      width: 32rpx;
+      height: 32rpx;
+      text-align: center;
+      border-radius: 50%;
+      background: rgba(255, 255, 255, 0.18);
+    }
+  }
+  .line {
+    width: 100%;
+    height: 4rpx;
+    background: #f6f8f9;
+    margin-top: 24rpx;
+    margin-bottom: 44rpx;
+  }
+  .line-shadow {
+    width: 100%;
+    height: 2rpx;
+    background: #ffffff;
+    box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(0, 0, 0, 0.05);
+    margin-top: 56rpx;
+  }
+  .all-tags {
+    padding: 0 24rpx;
+    .title {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.9);
+      margin-bottom: 18rpx;
+    }
+    .tags-list {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 24rpx 24rpx;
+      margin-bottom: 32rpx;
+      align-content: flex-start;
+      .tag {
+        background: #f6f8f9;
+        color: #333;
+        border-radius: 200rpx;
+        padding: 20rpx 32rpx;
+        font-size: 28rpx;
+        &.selected {
+          background: #3cb5fb;
+          color: #fff;
+        }
+      }
+
+      .industry-tag {
+        background: #f0f4f8;
+        color: #333;
+        border-radius: 200rpx;
+        padding: 20rpx 32rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 28rpx;
+        text-align: center;
+        line-height: 28rpx;
+        box-sizing: border-box;
+        height: 64rpx;
+        &.selected {
+          background: #3cb5fb;
+          color: #fff;
+        }
+      }
+    }
+    .industry-tag-list {
+      height:776rpx;
+      overflow-y: auto;
+    }
+  }
+  .btn-box {
+    position: fixed;
+    bottom: 62rpx;
+    left: 0;
+    right: 0;
+    padding: 0 24rpx;
+  }
+  .button {
+    margin: 48rpx 0 0 0;
+    width: 100%;
+  }
+}
+</style>
diff --git a/pages/login/perfectPersonal/perfectPersonal.vue b/pages/login/perfectPersonal/perfectPersonal.vue
new file mode 100644
index 0000000..629c652
--- /dev/null
+++ b/pages/login/perfectPersonal/perfectPersonal.vue
@@ -0,0 +1,158 @@
+<template>
+  <view class="flex-col page">
+    <u-navbar :border-bottom="false" :background="background"> </u-navbar>
+    <view class="flex-col group_3">
+      <h3 class="text_3">填写学校信息</h3>
+      <view class="flex-col group_4">
+        <view class="justify-between list-item group_5">
+          <text class="text_8">学历</text>
+          <u-input v-model="form.educational" placeholder="请选择学历" type="select"  @click="show = true" />
+		  <u-action-sheet  :list="educationalList"  v-model="show"  @click="educationalSelect()" ></u-action-sheet>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">学校</text>
+          <u-input v-model="form.shool" placeholder="请选择学校" type="select" @click="show = true" />
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">学院</text>
+          <u-input v-model="form.college" placeholder="请选择学院" type="select" @click="show = true" />
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">专业</text>
+          <u-input v-model="form.major"  placeholder="请选择专业"  type="select" @click="show = true" />
+          <u-action-sheet  :list="actionSheetList"  v-model="show"  @click="actionSheetCallback()" ></u-action-sheet>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8">时间</text>
+          <u-input v-model="form.time"  placeholder="请选择时间"  type="select" @click="show = true" />
+        </view>
+      </view>
+      <u-button shape="circle" class="button text-wrapper_1" type="primary"
+        >完成</u-button
+      >
+    </view>
+  </view>
+</template>
+
+<script>
+import uButton from "../../../uview-ui/components/u-button/u-button.vue";
+export default {
+  components: { uButton },
+  data() {
+    return {
+		form:{
+			educational:'',//学历
+			shool:'',//学校
+			college:'',//学院
+			major:'',//专业
+			time:'',//时间
+		},
+      background: {
+        backgroundColor: "#fff",
+      },
+      value: "",
+      show: false,
+	  educationalList:[//学历选择列表
+		  {
+				text:'专科',
+		  },
+		  {
+		  		text:'本科',
+		  },
+		  {
+		  		text:'专科',
+		  }
+	  ],
+      actionSheetList: [
+        {
+          text: "男",
+        },
+        {
+          text: "女",
+        },
+        {
+          text: "保密",
+        },
+      ],
+    };
+  },
+  onLoad(e) {
+    ;
+  },
+  methods: {
+	  educationalSelect(index){
+		  this.form.educational = this.actionSheetList[index].text;
+	  },
+    actionSheetCallback(index) {
+		
+      this.form.major = this.actionSheetList[index].text;
+    },
+    save() {
+      uni.switchTab({
+        url: "/pages/main/index/index",
+      });
+    },
+    skip() {
+      uni.switchTab({
+        url: "/pages/main/index/index",
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.page {
+  background: #fff;
+  height: 100%;
+  .text-wrapper_1 {
+    padding: 0.15rem 0 0.14rem;
+    background-image: linear-gradient(
+      90deg,
+      #87e6fe 0%,
+      #5bc0fe 52%,
+      #2e9bff 100%
+    );
+    box-shadow: 0px 0.03rem 0.09rem rgba(38, 122, 199, 0.34);
+    border-radius: 0.23rem;
+  }
+  .button {
+    margin: 0.6rem 0.15rem 0;
+  }
+}
+
+.group_3 {
+  padding-left: 0.16rem;
+  padding-top: 0.3rem;
+  .text_3 {
+    align-self: center;
+    color: rgb(51, 51, 51);
+    font-size: 0.18rem;
+    font-family: PingFang;
+    line-height: 0.17rem;
+  }
+  .group_4 {
+    margin-top: 0.44rem;
+    .list-item {
+      padding: 0.1rem 0.2rem 0.09rem 0;
+      border-bottom: solid 0.005rem rgb(199, 199, 204);
+      .text_8 {
+        color: #000;
+        font-size: 0.18rem;
+        font-family: PingFang;
+        line-height: 0.38rem;
+        margin-right: 0.1rem;
+      }
+      .text_26 {
+        color: #000;
+        font-size: 0.17rem;
+        font-family: PingFang;
+        line-height: 0.16rem;
+      }
+    }
+    .group_5 {
+      margin-top: 0;
+    }
+  }
+}
+</style>
diff --git a/pages/login/recognitionResult/recognitionFailed.vue b/pages/login/recognitionResult/recognitionFailed.vue
new file mode 100644
index 0000000..6ce53b8
--- /dev/null
+++ b/pages/login/recognitionResult/recognitionFailed.vue
@@ -0,0 +1,147 @@
+<template>
+  <view class="recognition-result-page">
+    <u-navbar title="认证结果" :is-back="false"></u-navbar>
+
+    <view class="result-container">
+      <image
+        :src="isSuccess ? resultSuccess : resultError"
+        class="result-image"
+        mode="widthFix"
+      ></image>
+      <text class="result-text">{{
+        isSuccess ? "认证通过" : "认证未通过"
+      }}</text>
+    </view>
+
+    <view class="btn-container">
+      <button class="next-btn" @click="handleNext">
+        {{ isSuccess ? "进入系统" : "重新识别" }}
+      </button>
+    </view>
+  </view>
+</template>
+
+<script>
+import resultSuccess from "@/static/common/img/result-success.png";
+import resultError from "@/static/common/img/result-error.png";
+
+export default {
+  data() {
+    return {
+      resultSuccess,
+      resultError,
+      isSuccess: false,
+      verifyResult: null,
+      verifyInfo: null,
+      token: null,
+    };
+  },
+  onLoad(options) {
+    // 获取token参数
+    if (options && options.token) {
+      this.token = options.token;
+      console.log("获取到token:", this.token);
+      // 使用token查询认证结果
+      this.queryVerificationResult();
+    }
+  },
+  methods: {
+    // 查询认证结果
+    queryVerificationResult() {
+      if (!this.token) {
+        console.error("token为空，无法查询认证结果");
+        return;
+      }
+
+      // 调用API查询认证结果
+      this.$u.api
+        .getVerifyInfo(this.token)
+        .then((res) => {})
+        .catch((err) => {
+          console.log("API调用过程中出错:", err);
+        });
+    },
+    handleNext() {
+      if (this.isSuccess) {
+        uni.switchTab({
+          url: "/pages/main/index/index",
+        });
+      } else {
+        this.toBaiduApi();
+      }
+    },
+
+    toBaiduApi() {
+      this.$u.api.getAPIToken().then((res) => {
+        const token = res.result.verify_token;
+
+        // 跳转到百度人脸核验页面
+        this.redirectToBaiduVerification(token);
+      });
+    },
+    redirectToBaiduVerification(token) {
+      // 获取当前域名
+      const currentDomain = window.location.origin;
+
+      // 编码回调URL - 使用相对路径，让uni-app处理路由
+      // 百度人脸核验会在回调URL后附加verify_result和verify_info参数
+      const successUrl = encodeURIComponent(
+        `${currentDomain}/#/pages/login/recognitionResult/recognitionResult?token=${token}`
+      );
+      const failedUrl = encodeURIComponent(
+        `${currentDomain}/#/pages/login/recognitionResult/recognitionFailed?token=${token}`
+      );
+
+      // 构建跳转URL
+      const verifyUrl = `https://brain.baidu.com/face/print/verify/verify?token=${token}&successUrl=${successUrl}&failedUrl=${failedUrl}`;
+
+      console.log("跳转到百度人脸核验页面:", verifyUrl);
+
+      // 直接跳转到百度人脸核验页面
+      window.location.href = verifyUrl;
+
+      return;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.recognition-result-page {
+  padding: 0 24rpx;
+
+  .result-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 130rpx 0 36rpx;
+    text-align: center;
+
+    .result-image {
+      width: 160rpx;
+      height: 160rpx;
+      margin-bottom: 36rpx;
+    }
+
+    .result-text {
+      font-family: PingFang SC, PingFang SC;
+      font-size: 32rpx;
+      color: #000;
+    }
+  }
+
+  .btn-container {
+    .next-btn {
+      background-color: #45b5ff;
+      color: #ffffff;
+      height: 90rpx;
+      line-height: 90rpx;
+      border-radius: 45rpx;
+      font-size: 32rpx;
+      font-weight: 500;
+      border: none;
+    }
+  }
+}
+</style>
diff --git a/pages/login/recognitionResult/recognitionResult.vue b/pages/login/recognitionResult/recognitionResult.vue
new file mode 100644
index 0000000..e7a2d35
--- /dev/null
+++ b/pages/login/recognitionResult/recognitionResult.vue
@@ -0,0 +1,155 @@
+<template>
+  <view class="recognition-result-page">
+    <u-navbar title="认证结果" :is-back="false"></u-navbar>
+
+    <view class="result-container">
+      <image
+        :src="isSuccess ? resultSuccess : resultError"
+        class="result-image"
+        mode="widthFix"
+      ></image>
+      <text class="result-text">{{
+        isSuccess ? "认证通过" : "认证未通过"
+      }}</text>
+    </view>
+
+    <view class="btn-container">
+      <button class="next-btn" @click="handleNext">
+        {{ isSuccess ? "进入系统" : "重新识别" }}
+      </button>
+    </view>
+  </view>
+</template>
+
+<script>
+import resultSuccess from "@/static/common/img/result-success.png";
+import resultError from "@/static/common/img/result-error.png";
+
+export default {
+  data() {
+    return {
+      resultSuccess,
+      resultError,
+      isSuccess: true,
+      token: null,
+      userInfo: {
+        realName: "", // 姓名
+        // idCard: "", // 身份证号
+      },
+    };
+  },
+  onLoad(options) {
+    // 获取token参数
+    if (options && options.token) {
+      this.token = options.token;
+      console.log("获取到token:", this.token);
+      // 使用token查询认证结果
+      this.queryVerificationResult();
+    }
+  },
+  methods: {
+    // 查询认证结果
+    queryVerificationResult() {
+      if (!this.token) {
+        console.log("token为空，无法查询认证结果");
+        return;
+      }
+
+      // 调用API查询认证结果
+      this.$u.api.getVerifyInfo(this.token).then((res) => {
+        const result = res.result.idcard_confirm;
+        this.userInfo.realName = result.name;
+        // this.userInfo.idCard = result.idcard_number;
+        // console.log("this.userInfo", this.userInfo);
+
+        if (result.idcard_number) {
+          this.getSchoolInfo(result.idcard_number);
+          this.updateCardFn(result.idcard_number);
+        } else {
+          this.$u.vuex("vuex_userInfo", this.userInfo);
+        }
+      });
+      // .catch((err) => {
+      //   console.log("API调用过程中出错:", err);
+      // });
+    },
+
+    // 根据身份证号获取学校信息
+    getSchoolInfo(card) {
+      this.$u.api
+        .getInfoByCard({
+          card,
+          // card: "362429199209242513",
+        })
+        .then((res) => {
+          // console.log("返回结果:", res);
+          if (res.length > 0) {
+            this.userInfo = {
+              ...this.userInfo,
+              ...res[0],
+            };
+          }
+
+          this.$u.vuex("vuex_userInfo", this.userInfo);
+        });
+    },
+    // 更新idCard
+    updateCardFn(card) {
+      this.$u.api
+        .updateCard({
+          userId: this.vuex_user.id,
+          idCode: card,
+        })
+        .then((res) => {
+          console.log("返回结果:", res);
+        });
+    },
+
+    handleNext() {
+      uni.navigateTo({
+        url: "/pages/login/roleSelection",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.recognition-result-page {
+  padding: 0 24rpx;
+
+  .result-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 130rpx 0 36rpx;
+    text-align: center;
+
+    .result-image {
+      width: 160rpx;
+      height: 160rpx;
+      margin-bottom: 36rpx;
+    }
+
+    .result-text {
+      font-family: PingFang SC, PingFang SC;
+      font-size: 32rpx;
+      color: #000;
+    }
+  }
+
+  .btn-container {
+    .next-btn {
+      background-color: #45b5ff;
+      color: #ffffff;
+      height: 90rpx;
+      line-height: 90rpx;
+      border-radius: 45rpx;
+      font-size: 32rpx;
+      font-weight: 500;
+      border: none;
+    }
+  }
+}
+</style>
diff --git a/pages/login/register/register.vue b/pages/login/register/register.vue
new file mode 100644
index 0000000..56899e7
--- /dev/null
+++ b/pages/login/register/register.vue
@@ -0,0 +1,633 @@
+<template>
+	<view class="flex-col page">
+		<!-- <image src="/static/common/img/16530269846087107196.png" class="image" /> -->
+		<u-navbar title="注册"></u-navbar>
+		<view class="flex-col group">
+			<text class="text">手机号注册</text>
+			<view class="flex-col group_7">
+				<view class="flex-col">
+					<!-- <text class="text_1">手机号</text> -->
+					<view class="text-wrapper flex-row view" style="padding: 0">
+						<u-input type="number" v-model="userName" placeholder="请输入手机号" maxlength="11" :disabled="disabled" />
+						
+					</view>
+				</view>
+				<view class="flex-col group_6" v-show="showCap">
+					<view class="text-wrapper flex-row view" style="padding: 0">
+						<u-input type="text" v-model="captchaCode" placeholder="请输入图形验证码" />
+						<image :src="captchaImg" class="captcha-img" @click="refreshCaptcha" />
+					</view>
+				</view>
+				<view class="flex-col group_6">
+					<!-- <text class="text_1">短信验证码</text> -->
+					<view class="text-wrapper flex-row view" style="padding: 0">
+						<u-input type="text" v-model="passWord" placeholder="请输入短信验证码"  />
+						<u-button style='background:transparent;' class="custom-style" :disabled="!(send == '获取验证码')" @click="sendCode">{{ send }}
+						</u-button>
+					</view>
+				</view>
+			</view>
+			<u-button class="flex-col items-center text-wrapper_1" throttle-time="1000" type="primary" shape="circle"
+				@click="login"><text class="text_7">注册</text></u-button>
+				<view class="justify-center group_1">
+					<text class="text_8">已有账号</text>
+					<navigator class="text_9" url="/pages/login/login/login">立即登录</navigator>
+				</view>
+			<!-- <view class="flex-row group_2">
+				<u-checkbox-group class="section_1" :size="34">
+					<u-checkbox v-model="agreement"> </u-checkbox>
+				</u-checkbox-group>
+				<view class="group_3">
+					<text class="text_10">已阅读并同意</text>
+					<text class="text_11">《用户服务协议》</text>
+					<text class="text_12">＆</text>
+					<text class="text_13">《用户隐私保护政策》</text>
+				</view>
+			</view> -->
+		</view>
+		<u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import md5 from "js-md5";
+	export default {
+		data() {
+			return {
+				show: false,
+				userName: "",
+				passWord: "",
+				agreement: false,
+				send: "获取验证码",
+				disabled: false,
+				captchaCode: "", // 图形验证码
+				captchaImg: "", // 验证码图片
+				captchaId: "", // 验证码ID
+				showCap: false,
+			};
+		},
+		onLoad(e) {
+			// this.refreshCaptcha();
+		},
+		methods: {
+			// 刷新验证码
+			refreshCaptcha() {
+				const timestamp = Date.now();
+				this.captchaId = timestamp;
+				uni.request({
+					url: 'http://sl.vrgon.com:8003/api/Token/Captcha?id=' + timestamp,
+					method: 'GET',
+					responseType: 'arraybuffer',
+					headers: {
+						'Accept': '*/*',
+					},
+					success: (res) => {
+						if (res.statusCode === 200 && res.data) {
+							// res.data 是 ArrayBuffer 类型，将其转换为 Blob
+							const blob = new Blob([res.data], { type: 'image/gif' }); // 根据实际图片类型调整
+							const reader = new FileReader();
+							reader.onload = () => {
+								// 将 Blob 读取为 Data URL (Base64 编码的图片)
+								this.captchaImg = reader.result;
+							};
+							reader.onerror = (e) => {
+								console.error("FileReader error:", e);
+								this.$refs.uToast.show({
+									title: '图片转换失败',
+									type: "error",
+								});
+							};
+							reader.readAsDataURL(blob);
+						} else {
+							console.error('获取验证码失败，状态码或数据异常:', res);
+							this.$refs.uToast.show({
+								title: '获取验证码失败',
+								type: "error",
+							});
+						}
+					},
+					fail: (err) => {
+						console.error('验证码请求失败:', err);
+						this.$refs.uToast.show({
+							title: '获取验证码失败，请检查网络或CORS设置',
+							type: "error",
+						});
+					}
+				});
+			},
+			// 获取验证码
+			sendCode() {
+				var reg = new RegExp("^[1][3,4,5,6,7,8,9][0-9]{9}$", "g"); //手机号
+				if (this.userName === "" || !reg.test(this.userName)) {
+					this.$refs.uToast.show({
+						title: "请输入正确的手机号码",
+						type: "error",
+					});
+					return;
+				}
+				
+				// if (!this.captchaCode) {
+				// 	this.$refs.uToast.show({
+				// 		title: "请输入图形验证码",
+				// 		type: "error",
+				// 	});
+				// 	return;
+				// }
+				
+				// 生成13位时间戳
+				const timestamp = Date.now();
+				// 生成签名
+				const base64Key = btoa('xiaoyout!#@12345');
+				const signStr = this.userName + timestamp + base64Key;
+				const sign = md5(signStr);
+
+				this.$u.apiList.GetPhoneValidateCode({
+					phone: this.userName,
+					t: timestamp.toString(),
+					sign: sign,
+					captchaCode: this.showCap ? this.captchaCode : ''	,
+					captchaId: this.showCap ? this.captchaId.toString() : ''
+				}).then((res)=>{
+					//中间数字加密
+					// let result =this.userName.replace(this.userName.substring(3,7),"****")
+					// this.userName = result
+					this.disabled = true
+					// this.$tips("发送成功");
+					this.$refs.uToast.show({
+					title: "发送成功",
+					type: "success",
+				});
+					var second = 60;
+					this.send = second + "秒后重试";
+					var time = setInterval(() => {
+						this.send = second + "秒后重试";
+						second--;
+						if (second <= 0) {
+							this.disabled = false
+							this.send = "获取验证码";
+							clearInterval(time);
+						}
+					}, 1000);
+				})
+				.catch((err)=>{
+					console.log('err-----',err)
+					if(err?.data?.needcap && !this.showCap) {
+						this.showCap = true
+						this.$refs.uToast.show({
+							title: '请输入图形验证码',
+							type: "error",
+						});
+						this.refreshCaptcha()
+						return
+					} 
+					this.$refs.uToast.show({
+						title: err.error,
+						type: "error",
+					});
+					this.refreshCaptcha()
+				})
+			},
+			
+			login() {
+        // uni.navigateTo({
+				// 			url: "/pages/login/confirmPwd/confirmPwd?phone="+this.userName,
+				// 		});
+        // return
+				var reg = new RegExp("^[1][3,4,5,7,8,9][0-9]{9}$", "g"); //手机号
+				if (this.userName === "" || !reg.test(this.userName)) {
+				//   this.$tips("请输入正确的手机号码", "error");
+				  this.$refs.uToast.show({
+					title: "请输入正确的手机号码",
+					type: "error",
+				});
+				  return;
+				}
+				if (this.passWord === "") {
+					// return this.$tips("请输入验证码", "error");
+					return this.$refs.uToast.show({
+					title: "请输入验证码",
+					type: "error",
+				});
+				}
+				// if (!this.agreement) {
+				// 	return this.$tips("请同意用户服务协议及用户隐私保护政策", "error");
+				// }
+				const data = {
+					phone:this.userName,
+					code : this.passWord
+				}
+				this.$u.apiList.IsPhoneCode(data).then((res)=>{
+					setTimeout(() => {
+						uni.navigateTo({
+							url: "/pages/login/confirmPwd/confirmPwd?phone="+this.userName+"&code="+this.passWord,
+						});
+					}, 1000);
+				})
+				.catch((err)=>{
+					// this.$tips(err.error, "error");
+					this.$refs.uToast.show({
+						title: err.error,
+						type: "error",
+					});
+				})
+				
+			},
+		},
+	};
+</script>
+
+<style scoped lang="scss">
+	.custom-style {
+		color: #3CB5FB !important;
+		padding: 0 !important;
+		height: 70rpx !important;
+		line-height: 60rpx !important;
+	}
+
+	.custom-style::after {
+		border: none;
+	}
+
+	.page {
+		padding-bottom: 0.015rem;
+		background-color: rgb(255, 255, 255);
+		overflow-y: auto;
+		width: 100%;
+		overflow-x: hidden;
+		height: 100%;
+
+		.image {
+			flex-shrink: 0;
+			align-self: flex-start;
+			width: 102%;
+		}
+
+		.group {
+			padding: 0.7rem 0.29rem;
+
+			.text {
+				align-self: left;
+				// color: rgb(46, 155, 255);
+				color: #000;
+				font-size: 0.22rem;
+				font-family: PingFang;
+				line-height: 0.17rem;
+				font-weight: 600;
+			}
+
+			.group_7 {
+				margin-top: 0.29rem;
+
+				.text-wrapper {
+					border: solid 2rpx #dcdfe6;
+					border-radius: 100rpx;
+					background: #f6f8fa;
+				}
+
+				.group_6 {
+					margin-top: 0.2rem;
+				}
+
+				.text_1 {
+					margin-left: 0.01rem;
+					align-self: flex-start;
+					color: rgb(51, 51, 51);
+					font-size: 0.15rem;
+					font-family: PingFang;
+					line-height: 0.14rem;
+				}
+
+				.view {
+					display: flex;
+					align-items: center;
+					margin-top: 20rpx;
+					padding: 20rpx 50rpx !important;
+				}
+			}
+
+			.text_6 {
+				margin-left: 0.01rem;
+				margin-top: 0.13rem;
+				align-self: flex-start;
+				color: rgb(25, 140, 255);
+				font-size: 0.13rem;
+				font-family: PingFang;
+				line-height: 0.13rem;
+			}
+
+			.text-wrapper_1 {
+				margin: 50rpx 0rpx 40rpx;
+				padding: 50rpx 0 50rpx;
+				// background-image: linear-gradient(90deg, rgb(135, 230, 254) 0%, rgb(91, 192, 254) 52%, rgb(46, 155, 255) 100%);
+				background: #3cb4fb;
+				box-shadow: 0px 6rpx 9rpx rgba(38, 122, 199, 0.34);
+				border-radius: 100rpx;
+
+				.text_7 {
+					color: rgb(255, 255, 255);
+					font-size: 32rpx;
+					font-family: PingFang;
+					line-height: 32rpx;
+				}
+			}
+
+			.group_1 {
+				margin-top: 0.12rem;
+
+				.text_8 {
+					color: rgb(102, 102, 102);
+					font-size: 0.14rem;
+					font-family: PingFang;
+					line-height: 0.13rem;
+				}
+
+				.text_9 {
+					margin-left: 0.035rem;
+					color: rgb(25, 140, 255);
+					font-size: 0.14rem;
+					font-family: PingFang;
+					line-height: 0.13rem;
+				}
+			}
+
+			.group_2 {
+				margin-top: 0.36rem;
+				justify-content: center;
+
+				.section_1 {
+					flex-shrink: 0;
+					width: 0.17rem;
+				}
+
+				.group_3 {
+					margin-left: 0.11rem;
+					height: 0.18rem;
+					line-height: 0.18rem;
+					font-size: 0;
+
+					.text_10 {
+						color: rgb(153, 153, 153);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+
+					.text_11 {
+						color: rgb(25, 140, 255);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+
+					.text_12 {
+						color: rgb(102, 102, 102);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+
+					.text_13 {
+						color: rgb(25, 140, 255);
+						font-size: 0.11rem;
+						font-family: PingFang;
+					}
+				}
+			}
+		}
+
+		.captcha-img {
+			width: 200rpx;
+			height: 70rpx;
+			margin-right: 20rpx;
+		}
+	}
+</style>
+
+
+
+<!-- <template>
+  <view class="flex-col page">
+    <view class="flex-col group">
+      <text class="text">注册账号</text>
+      <view class="flex-col group_1">
+        <view class="flex-col group_2">
+          <u-select
+            @click="show = true"
+            :mode="'single-column'"
+            v-model="show"
+            :list="shoolList"
+            @confirm="confirm"
+            @cancel="cancel"
+          ></u-select>
+          <view class="justify-between section_1" @click="show = true">
+            <text
+              :style="{ color: this.shoolname !== '' ? '#000' : '#c1c4cc' }"
+              >{{ this.shoolname != "" ? this.shoolname : "请选择学校" }}</text
+            >
+            <image
+              src="/static/common/img/select.png"
+              class="image_1"
+            />
+          </view>
+          <view class="text-wrapper flex-col">
+            <u-input
+              v-model="userName"
+              type="text"
+              placeholder="请输入用户名"
+            />
+          </view>
+          <view class="text-wrapper flex-col view_1">
+            <u-input
+              v-model="passWord"
+              type="password"
+              placeholder="请输入密码"
+            />
+          </view>
+          <view class="text-wrapper flex-col">
+            <u-input
+              v-model="twopassWord"
+              type="password"
+              placeholder="请确认密码"
+            />
+          </view>
+        </view>
+        <view class="flex-row group_3">
+          <view class="flex-col text-wrapper_1">
+            <u-input
+              v-model="Code"
+              type="text"
+              placeholder="请输入验证码"
+            />
+            <text class="text_6"></text>
+          </view>
+          <view class="flex-col items-end text-wrapper_2">
+            <text>6789</text>
+          </view>
+        </view>
+      </view>
+      <view>
+        <u-button  class="flex-col items-center text-wrapper_3" @click="register" :throttle-time='1000'>注册</u-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      show: false,
+      userName: "",
+      passWord: "",
+      twopassWord: "",
+      Code: "",
+      shoolname: "",
+      shoolList: [
+        {
+          value: "1",
+          label: "学校一",
+        },
+        {
+          value: "2",
+          label: "学校二",
+        },
+        {
+          value: "3",
+          label: "学校三",
+        },
+        {
+          value: "4",
+          label: "学校四",
+        }
+      ],
+    };
+  },
+  onLoad(e) {
+    ;
+  },
+  methods: {
+    confirm(e) {
+      this.shoolname = "";
+      e.map((val, index) => {
+        this.shoolname += this.shoolname == "" ? val.label : "-" + val.label;
+      });
+    },
+    cancel(e) {
+      ;
+    },
+    register(){
+      uni.showLoading({
+        title: '注册中'
+      });
+
+      setTimeout(()=>{
+        uni.hideLoading();
+         uni.showToast({
+        title: '注册成功',
+        duration: 2000
+      });
+      },1000)
+     
+    }
+  },
+};
+</script>
+
+<style scoped lang="css">
+.text-wrapper {
+  margin-top: 0.095rem;
+  padding: 0.03rem 0.17rem;
+  background-color: rgb(246, 247, 250);
+  border-radius: 0.1rem;
+}
+.text_2 {
+  margin-left: 0.17rem;
+}
+.page {
+  padding: 0.045rem 0 1.5rem;
+  background-color: rgb(255, 255, 255);
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+}
+.image {
+  margin-left: 0.26rem;
+  margin-right: 0.23rem;
+  width: 3.27rem;
+  height: 0.09rem;
+}
+.group {
+  margin-top: 0.72rem;
+  padding-left: 0.34rem;
+  padding-right: 0.31rem;
+}
+.text {
+  margin-left: 0.045rem;
+  color: rgb(0, 0, 0);
+  font-size: 0.24rem;
+  line-height: 0.23rem;
+  letter-spacing: 0.024rem;
+  white-space: nowrap;
+}
+.group_1 {
+  margin-top: 0.67rem;
+}
+.text-wrapper_3 {
+  margin-top: 0.54rem;
+  padding: 0.13rem 0;
+  color: rgb(255, 255, 255);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  letter-spacing: 0.03rem;
+  white-space: nowrap;
+  background-color: rgba(46, 155, 255, 0.5);
+  border-radius: 0.1rem;
+}
+.group_2 {
+  color: rgb(193, 196, 204);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+.group_3 {
+  margin-top: 0.08rem;
+}
+.section_1 {
+  padding: 0.13rem 0.17rem;
+  background-color: rgb(246, 247, 250);
+  border-radius: 0.1rem;
+}
+.view_1 {
+  margin-top: 0.09rem;
+}
+.text-wrapper_1 {
+  padding: 0 0.17rem;
+  flex: 1 1 auto;
+  color: rgb(193, 196, 204);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+  background-color: rgb(246, 247, 250);
+  border-radius: 0.1rem;
+  height: 0.4rem;
+}
+.text-wrapper_2 {
+  margin-left: 0.08rem;
+  padding: 0.14rem 0.1rem ;
+  color: rgb(106, 134, 241);
+  font-size: 0.18rem;
+  line-height: 0.14rem;
+  letter-spacing: 0.036rem;
+  white-space: nowrap;
+  background-color: rgba(211, 220, 255, 0.5);
+  border-radius: 0.1rem;
+  height: 0.4rem;
+}
+.image_1 {
+  margin-right: 0.035rem;
+  margin-top: 0.05rem;
+  width: 0.14rem;
+  height: 0.09rem;
+}
+.text_6 {
+  margin-left: 0.17rem;
+}
+</style> -->
diff --git a/pages/login/roleSelection.vue b/pages/login/roleSelection.vue
new file mode 100644
index 0000000..ae11eb1
--- /dev/null
+++ b/pages/login/roleSelection.vue
@@ -0,0 +1,242 @@
+<template>
+  <view class="flex-col page">
+    <u-navbar
+      :custom-back="backFn"
+      :background="background"
+      :border-bottom="false"
+      title=""
+    ></u-navbar>
+    <view>
+      <view class="title">
+        <h3>请选择登录角色</h3>
+        <text class="tips"
+          >温馨提示：因为系统中存在多个角色，请选择角色后再登录</text
+        >
+      </view>
+      <view class="selectList">
+        <view
+          class="item flex-row"
+          :class="{ 'item-selected': [0,2].includes(vuex_user.userType) }"
+          @click="goStudent"
+        >
+          <view class="name">
+            <text class="text">我是学生</text>
+            <text class="text text-en">Student</text>
+          </view>
+          <view class="student"></view>
+        </view>
+        <view
+          class="item flex-row"
+          :class="{ 'item-selected': vuex_user.userType == '1' }"
+          @click="goTeacher"
+        >
+          <view class="name">
+            <text class="text">我是教师</text>
+            <text class="text text-en">Teacher</text>
+          </view>
+          <view class="teacher"></view>
+        </view>
+        <!-- <view
+          class="item flex-row"
+          :class="{ 'item-selected': vuex_user.userType == '2' }"
+          @click="goGraduate"
+        >
+          <view class="name">
+            <text class="text">我是毕业生</text>
+            <text class="text text-en">Graduate</text>
+          </view>
+          <view class="graduate"></view>
+        </view> -->
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import uButton from "../../uview-ui/components/u-button/u-button.vue";
+
+export default {
+  components: { uButton },
+  data() {
+    return {
+      background: {
+        backgroundColor: "transparent",
+      },
+      source: "",
+      userRole: uni.getStorageSync("role"),
+    };
+  },
+  onLoad(e) {
+    console.log(e, "e");
+    this.source = e.source;
+  },
+  methods: {
+    backFn() {
+      console.log(this.source, "source---");
+      if (this.source === "my") {
+        uni.switchTab({
+          url: "/pages/my/my/my",
+        });
+        return;
+      }
+      if (this.source === "login") {
+        this.$u.vuex("vuex_msgList", "");
+        this.$u.vuex("vuex_user", "");
+        this.$u.vuex("vuex_token", "");
+        this.$u.vuex("vuex_userInfo", "");
+        uni.clearStorage();
+        this.$u.route({
+          url: "/pages/login/login/login",
+        });
+        return;
+      }
+      uni.navigateBack();
+    },
+    async goTeacher() {
+      const res = await this.$u.apiList.SelectUserTypeApi();
+      console.log(res, "res---");
+      const jzgFlag = res.jzgFlag;
+      // const studentFlag = res.studentFlag
+      if (jzgFlag === false) {
+        uni.setStorageSync("role", "teacher");
+        uni.navigateTo({
+          url: "/pages/login/teacherCertification",
+        });
+        return;
+      }
+      const req = {
+        userType: 1,
+      };
+      const result = await this.$u.apiList.UpdateUserTypeApi(req);
+      console.log(result, "result---");
+      this.vuex_user.userType = 1;
+      uni.switchTab({
+        url: "/pages/my/my/my",
+      });
+    },
+    async goStudent() {
+      const res = await this.$u.apiList.SelectUserTypeApi();
+      console.log(res, "res---");
+      // const jzgFlag = res.jzgFlag;
+      const studentFlag = res.studentFlag;
+      if (studentFlag === false) {
+        uni.setStorageSync("role", "student");
+        uni.navigateTo({
+          url: "/pages/login/perfect/perfect",
+        });
+        return;
+      }
+      const req = {
+        userType: 0,
+      };
+      const result = await this.$u.apiList.UpdateUserTypeApi(req);
+      console.log(result, "result---");
+      this.vuex_user.userType = 0;
+      uni.switchTab({
+        url: "/pages/my/my/my",
+      });
+    },
+    async goGraduate() {
+      uni.navigateTo({
+        url: "/pages/login/graduateCertification/graduateCertification",
+      });
+      // uni.$u.toast("功能开发中");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+  background: linear-gradient(
+    0deg,
+    rgba(80, 123, 244, 0) 80%,
+    rgba(95, 147, 238, 0.3) 100%
+  );
+  height: 100%;
+  .button {
+    margin: 0.6rem 0.15rem 0;
+  }
+}
+
+.selectList {
+  width: calc(100% - 30rpx);
+  margin: 0 auto;
+  .item {
+    height: 278rpx;
+    padding: 15rpx;
+    margin-bottom: 15rpx;
+    box-shadow: 0rpx 20rpx 40rpx 0rpx rgba(0, 0, 0, 0.05);
+    border-radius: 32rpx;
+    border: 4rpx solid #e7ecf0;
+    .name {
+      width: 60%;
+      display: flex;
+      justify-content: center;
+      // align-items: center;
+      flex-direction: column;
+      padding-top: 20rpx;
+      padding-left: 100rpx;
+      .text {
+        margin-top: 10rpx;
+        font-size: 48rpx;
+        font-weight: bold;
+        color: #333;
+        // margin-right: 200rpx;
+        letter-spacing: 2rpx;
+      }
+      .text-en {
+        font-size: 40rpx;
+        color: #666;
+        letter-spacing: 2rpx;
+        font-weight: normal;
+      }
+    }
+  }
+  .item-selected {
+    border: 4rpx solid #8ad3fd;
+  }
+}
+.title {
+  width: calc(100% - 60rpx);
+  margin: 70rpx auto 100rpx;
+  h3 {
+    font-weight: 800;
+    font-size: 48rpx;
+    color: #000;
+    line-height: 60rpx;
+  }
+  .tips {
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+  }
+}
+.teacher {
+  width: 256rpx;
+  height: 256rpx;
+  -moz-background-image: url("/static/common/img/teacher.png");
+  -webkit-background-image: url("/static/common/img/teacher.png");
+  background-image: url("/static/common/img/teacher.png");
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+.student {
+  width: 256rpx;
+  height: 256rpx;
+  -moz-background-image: url("/static/common/img/student.png");
+  -webkit-background-image: url("/static/common/img/student.png");
+  background-image: url("/static/common/img/student.png");
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+.graduate {
+  width: 256rpx;
+  height: 256rpx;
+  -moz-background-image: url("/static/common/img/graduate.png");
+  -webkit-background-image: url("/static/common/img/graduate.png");
+  background-image: url("/static/common/img/graduate.png");
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+</style>
diff --git a/pages/login/teacherCertification.vue b/pages/login/teacherCertification.vue
new file mode 100644
index 0000000..bbde529
--- /dev/null
+++ b/pages/login/teacherCertification.vue
@@ -0,0 +1,1609 @@
+<template>
+  <view style="background-color: rgb(246, 247, 250); height: 100%">
+    <view class="flex-col group_2" v-if="step == 0">
+      <u-navbar title="教师认证"></u-navbar>
+      <view class="form">
+        <view class="flex-col group">
+          <view class="flex-col section_2">
+            <!-- 教职工 -->
+            <view v-if="roleId === '2'" class="flex-col group_5 jzg-box">
+              <!-- 头像 -->
+              <view class="flex-col items-center img-box">
+                <u-avatar
+                  mode="circle"
+                  :src="headerImg"
+                  @click="chooseAvatar"
+                />
+                <text class="text_4">请上传头像</text>
+              </view>
+              <!-- 真实姓名 -->
+              <view class="flex-row group_6">
+                <text class="text_15">真实姓名</text>
+                <u-input
+                  v-model="form.realName"
+                  :border="false"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  textAlign="right"
+                  class="input"
+                  placeholder="请输入真实姓名"
+                />
+              </view>
+              <!-- 性别 -->
+              <view class="justify-between group_7" @click="sex = true">
+                <view class="flex-row u-col-center">
+                  <text class="text_15">性别</text>
+                  <view v-if="form.sex">{{ form.sex }}</view>
+                  <view v-else style="color: #cbcacd">请选择性别</view>
+                </view>
+                <image
+                  class="image_3 image_5"
+                  src="/static/common/img/row_right.png"
+                />
+              </view>
+              <!-- <view class="flex-row group_6">
+              <text class="text_15">申请人姓名</text>
+              <u-input v-model="form.name" :border="false" :custom-style="inputStyle" :type="'text'"
+                       class="input" disabled placeholder="请输入" />
+            </view> -->
+              <view class="group_9 flex-row">
+                <text class="text_15">联系方式</text>
+                <u-input
+                  v-model="form.phone"
+                  :border="false"
+                  :custom-style="inputStyle"
+                  :type="'number'"
+                  textAlign="right"
+                  class="input"
+                  disabled
+                  placeholder="请输入"
+                />
+              </view>
+
+              <!-- 任职学校 -->
+              <view class="justify-between group_7" @click="shoolShow = true">
+                <view class="flex-row u-col-center">
+                  <text class="text_15">任职学校</text>
+                  <view v-if="shoolName">{{ shoolName }}</view>
+                  <view v-else style="color: #cbcacd">请选择任职学校</view>
+                  <!--                <u-input class="input" :custom-style="inputStyle" :type="'text'" :border="false"-->
+                  <!--                         v-model="shoolName" placeholder="请输入" disabled />-->
+                  <!--                    <u-input-->
+                  <!--            v-model="shoolName"-->
+                  <!--            :border="false"-->
+                  <!--            :custom-style="inputStyle"-->
+                  <!--            :readonly="true"-->
+                  <!--            :type="'text'"-->
+                  <!--            class="input"-->
+                  <!--            placeholder="请选择任职学校"-->
+                  <!--            @click="shoolShow = true"-->
+                  <!--          />-->
+                </view>
+                <image
+                  class="image_3 image_5"
+                  src="/static/common/img/row_right.png"
+                />
+              </view>
+              <view class="justify-between group_7" @click="schoolPost = true">
+                <view class="flex-row u-col-center">
+                  <text class="text_15">校内职务</text>
+                  <view v-if="form.schoolJob">{{ form.schoolJob }}</view>
+                  <view v-else style="color: #cbcacd">请选择校内职务</view>
+                  <!--                <u-input v-model="form.schoolJob" :border="false" :custom-style="inputStyle" :type="'text'"-->
+                  <!--                         aria-readonly class="input" placeholder="请选择" @click="schoolPost = true" />-->
+                </view>
+                <image
+                  class="image_3 image_5"
+                  src="/static/common/img/row_right.png"
+                />
+              </view>
+              <view
+                v-if="isDisabled"
+                class="justify-between group_13"
+                @click="college = true"
+              >
+                <view class="flex-row u-col-center">
+                  <text class="text_15">所属院系</text>
+                  <view v-if="form.faculty">{{ form.faculty }}</view>
+                  <view v-else style="color: #cbcacd">请选择所属院系</view>
+                  <!--                <u-input v-model="form.faculty" :border="false" :custom-style="inputStyle" :type="'text'"-->
+                  <!--                         class="input" placeholder="请选择" @click="college=true" />-->
+                  <!-- @click="address = true" -->
+                </view>
+                <image
+                  class="image_3 image_8"
+                  src="/static/common/img/row_right.png"
+                />
+              </view>
+
+              <view
+                v-if="isDisabled"
+                class="justify-between group_13"
+                style="border: none"
+                @click="job = true"
+              >
+                <view class="flex-row u-col-center">
+                  <text class="text_15">具体职位</text>
+                  <view v-if="form.job">{{ form.job }}</view>
+                  <view v-else style="color: #cbcacd">请选择具体职位</view>
+                </view>
+                <image
+                  class="image_3 image_8"
+                  src="/static/common/img/row_right.png"
+                />
+              </view>
+            </view>
+            <!-- 企业 -->
+            <view v-if="roleId === '0'" class="flex-col group_5">
+              <view class="flex-row group_6">
+                <text class="text_15">企业名称</text>
+                <u-input
+                  v-model="form.businessName"
+                  :border="false"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  class="input"
+                  placeholder="请输入"
+                />
+              </view>
+              <view class="flex-row group_6">
+                <text class="text_15">企业地址</text>
+                <u-input
+                  v-model="form.businessAddress"
+                  :border="false"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  class="input"
+                  placeholder="请选择"
+                  @click="address = true"
+                />
+              </view>
+
+              <view class="justify-between group_7">
+                <view class="flex-row">
+                  <text class="text_15">企业申请人姓名</text>
+                  <u-input
+                    v-model="form.businessUser"
+                    :border="false"
+                    :custom-style="inputStyle"
+                    :type="'text'"
+                    class="input"
+                    disabled
+                  />
+                  <!-- placeholder="请选择"
+         @click="sex = true" -->
+                </view>
+                <!-- <image
+                src="/static/common/img/row_right.png"
+                class="image_3 image_5"
+              /> -->
+              </view>
+              <view class="group_9 flex-row">
+                <text class="text_15">联系方式</text>
+                <u-input
+                  v-model="form.phone"
+                  :border="false"
+                  :custom-style="inputStyle"
+                  :type="'number'"
+                  class="input"
+                  disabled
+                  placeholder="请输入"
+                />
+              </view>
+              <view class="justify-between group_13" style="border: none">
+                <view class="flex-row">
+                  <text class="text_15">申请人职务</text>
+                  <u-input
+                    v-model="form.job"
+                    :border="false"
+                    :custom-style="inputStyle"
+                    :type="'text'"
+                    class="input"
+                    placeholder="请输入"
+                  />
+                  <!-- @click="WorkArea = true"
+        disabled -->
+                </view>
+                <!--  <image
+                src="/static/common/img/row_right.png"
+                class="image_3 image_8"
+              /> -->
+              </view>
+            </view>
+            <!-- 管理员 -->
+            <view v-if="roleId === '1'" class="flex-col group_5">
+              <view class="flex-row group_6">
+                <text class="text_15">申请人姓名</text>
+                <u-input
+                  v-model="form.name"
+                  :border="false"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  class="input"
+                  disabled
+                  placeholder="请输入"
+                />
+              </view>
+              <view class="group_9 flex-row">
+                <text class="text_15">联系方式</text>
+                <u-input
+                  v-model="form.phone"
+                  :border="false"
+                  :custom-style="inputStyle"
+                  :type="'number'"
+                  class="input"
+                  disabled
+                  placeholder="请输入"
+                />
+              </view>
+              <view class="justify-between group_7">
+                <!-- {{form.schoolName}} -->
+                <view class="flex-row">
+                  <text class="text_15">学校</text>
+                  <u-input
+                    v-model="shoolName"
+                    :border="false"
+                    :custom-style="inputStyle"
+                    :type="'text'"
+                    class="input"
+                    disabled
+                    placeholder="请输入"
+                  />
+                  <!-- <u-input
+                  class="input"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  :border="false"
+                  placeholder="请选择"
+                  v-model="shoolName"
+                  @click="shoolShow = true"
+                  disabled
+                /> -->
+                </view>
+                <!--   <image
+                src="/static/common/img/row_right.png"
+                class="image_3 image_5"
+              /> -->
+              </view>
+              <!--            <view class="justify-between group_13" style="border: none">
+              <view class="flex-row">
+                <text class="text_15">职业</text>
+                <u-input
+                  class="input"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  :border="false"
+                  placeholder="请选择"
+                  v-model="form.job"
+                  @click="WorkArea = true"
+                  disabled
+                />
+              </view>
+              <image
+                src="/static/common/img/row_right.png"
+                class="image_3 image_8"
+              />
+            </view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="file">
+        <view class="flex-col section_4">
+          <text class="text_11">申请人身份证</text>
+          <view class="equal-division">
+            <view class="flex-col equal-division-item">
+              <view class="flex-col section_5">
+                <u-upload
+                  ref="uUpload1"
+                  :action="action"
+                  :header="header"
+                  index="0"
+                  max-count="1"
+                  width="640"
+                  height="396"
+                  @on-success="onSuccess"
+                  ><template #addBtn>
+                    <image
+                      :src="idcardPositive"
+                      mode="widthFix"
+                    ></image> </template
+                ></u-upload>
+              </view>
+            </view>
+            <view class="flex-col equal-division-item">
+              <u-upload
+                ref="uUpload2"
+                :action="action"
+                :header="header"
+                index="1"
+                max-count="1"
+                width="640"
+                height="396"
+                @on-success="onSuccess"
+                ><template #addBtn>
+                  <image :src="idcardBack" mode="widthFix"></image> </template
+              ></u-upload>
+            </view>
+          </view>
+        </view>
+        <view class="flex-col section_4">
+          <text class="text_11">个人工作证</text>
+          <view class="equal-division">
+            <view class="flex-col equal-division-item">
+              <u-upload
+                ref="uUpload3"
+                :action="action"
+                :header="header"
+                index="2"
+                max-count="1"
+                width="640"
+                height="396"
+                @on-success="onSuccess"
+                ><template #addBtn>
+                  <image :src="workCard" mode="widthFix"></image> </template
+              ></u-upload>
+            </view>
+            <view v-if="roleId == 0" class="flex-col">
+              <text class="text_11">企业营业执照</text>
+              <view class="equal-division">
+                <view class="flex-col equal-division-item">
+                  <u-upload
+                    ref="uUpload4"
+                    :action="action"
+                    :header="header"
+                    index="3"
+                    max-count="1"
+                    width="640"
+                    height="396"
+                    @on-success="onSuccess"
+                    ><template #addBtn>
+                      <image
+                        :src="enterprisesImg"
+                        mode="widthFix"
+                      ></image> </template
+                  ></u-upload>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="flex-col group_9">
+          <text class="text_23">*所有上传信息仅供身份的认证</text>
+          <u-button
+            :disabled="!state"
+            :plain="!state"
+            :throttle-time="1000"
+            class="button"
+            type="primary"
+            @click="save"
+            >{{ state ? "提交认证" : "提交中" }}</u-button
+          >
+          <!-- <view class="flex-col items-center button" @click="save">
+          <text>提交认证</text>
+        </view> -->
+          <text class="text_25">示例</text>
+          <view class="grid">
+            <view class="grid-item flex-col items-center">
+              <image class="image_14" src="/static/common/img/身份证正面.png" />
+              <text style="color: #fff">身份证正面</text>
+            </view>
+            <view class="flex-col items-center grid-item">
+              <image class="image_14" src="/static/common/img/身份证反面.png" />
+              <text style="color: #fff">身份证反面</text>
+            </view>
+            <view class="grid-item flex-col items-center">
+              <image class="image_14" src="/static/common/img/个人工作证.png" />
+              <text style="color: #fff">个人工作证</text>
+            </view>
+            <view v-if="roleId == 0" class="grid-item flex-col items-center">
+              <image
+                class="image_14"
+                src="/static/common/img/企业营业执照.png"
+              />
+              <text style="color: #fff">企业营业执照</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 地址 -->
+      <u-picker
+        v-model="address"
+        :area-code="addressId"
+        mode="region"
+        @confirm="selectAddress"
+      ></u-picker>
+      <!-- 性别 -->
+      <u-select
+        v-model="sex"
+        :default-value="sexId"
+        :list="sexList"
+        mode="single-column"
+        @confirm="selectSex"
+      >
+      </u-select>
+      <!--校内职务-->
+      <u-select
+        v-model="schoolPost"
+        :default-value="schoolPostId"
+        :list="schoolPostList"
+        mode="single-column"
+        @confirm="selectScpost"
+      ></u-select>
+      <!--所属院系-->
+      <u-select
+        v-model="college"
+        :default-value="collegeId"
+        :list="CollegeList"
+        mode="single-column"
+        @confirm="selectCpllege"
+      ></u-select>
+      <!--具体职位-->
+      <u-select
+        v-model="job"
+        :default-value="jobId"
+        :list="jobList"
+        mode="single-column"
+        @confirm="selectJob"
+      >
+      </u-select>
+      <!-- 学校 -->
+      <u-select
+        v-model="shoolShow"
+        :default-value="shoolId"
+        :list="shoolList"
+        mode="single-column"
+        title="学校选择"
+        @confirm="shoolSelect"
+      >
+      </u-select>
+      <!-- 出生日期 -->
+      <u-picker
+        v-model="birthdays"
+        :default-time="birthdaysId"
+        :end-year="EndYear"
+        mode="time"
+        @confirm="selectBirthdays"
+      ></u-picker>
+      <!-- 籍贯 -->
+      <u-picker
+        v-model="NativePlace"
+        :area-code="NativePlaceId"
+        mode="region"
+        @confirm="selectNativePlace"
+      >
+      </u-picker>
+      <!-- 工作领域 -->
+      <u-select
+        v-model="WorkArea"
+        :default-value="WorkAreaId"
+        :list="WorkAreaList"
+        mode="single-column"
+        @confirm="selectWorkArea"
+      ></u-select>
+      <!-- 提示 -->
+      <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+      <u-toast ref="uToast" />
+    </view>
+    <view class="flex-col group_3 preference-page" v-if="step == 1">
+      <u-navbar
+        title="推荐偏好"
+        :custom-back="back"
+        :border-bottom="false"
+      ></u-navbar>
+      <view class="selected-count">
+        已选择（{{ selectedInterests.length }}/10）
+        <text class="desc"
+          >您选择的标签将影响系统推荐给你的信息类型，进入系统后可以在我的-个人信息中修改。</text
+        >
+      </view>
+
+      <view class="selected-tags">
+        <view
+          v-for="item in selectedInterests"
+          :key="item.lableId"
+          class="tag selected"
+        >
+          {{ item.lableName }}
+          <image
+            class="close-btn"
+            src="/static/common/img/handDelete.png"
+            @click.stop="removeInterest(item)"
+          ></image>
+        </view>
+      </view>
+      <view class="line"></view>
+      <view class="all-tags">
+        <view class="title">兴趣爱好</view>
+        <view class="tags-list">
+          <view
+            v-for="item in interestList"
+            :key="item.lableId"
+            class="tag"
+            :class="{ selected: selectedInterests.includes(item) }"
+            @click="toggleInterest(item)"
+            >{{ item.lableName }}</view
+          >
+        </view>
+      </view>
+      <view class="line-shadow"></view>
+      <view class="btn-box">
+        <u-button
+          shape="circle"
+          class="button"
+          type="primary"
+          @click="finishPreference"
+          >完成</u-button
+        >
+      </view>
+      <u-toast ref="uToast" />
+    </view>
+  </view>
+</template>
+
+<script>
+import { Debounce } from "../../common/utils.js";
+import idcardPositive from "@/static/common/img/上传身份证正面.png";
+import idcardBack from "@/static/common/img/上传身份证反面.png";
+import workCard from "@/static/common/img/上传个人工作证.png";
+import enterprisesImg from "@/static/common/img/上传营业执照.png";
+export default {
+  data() {
+    return {
+      step: 0,
+      state: true,
+      headerImg: "",
+      title: "教职工认证",
+      action: "/app/User/File",
+      teacherId: "",
+      // input 样式
+      inputStyle: {
+        lineHeight: "0.5rem",
+        height: "0.5rem",
+        width: "2rem",
+      },
+      shoolName: "",
+      sex: false, //性别选择框的显示/隐藏
+      shoolShow: false, //学校选择框的显示/隐藏
+      schoolPost: false, //校内职务选择框的显示/隐藏
+      sexList: [
+        //性别选择框内容
+        {
+          label: "男",
+          value: "0",
+        },
+        {
+          label: "女",
+          value: "1",
+        },
+      ],
+      schoolPostList: [
+        //校内职务选择框内容
+        {
+          label: "教师",
+          value: "0",
+        },
+        {
+          label: "行政管理",
+          value: "1",
+        },
+        {
+          label: "后勤",
+          value: "2",
+        },
+      ],
+      jobList: [
+        //具体职务
+        {
+          label: "助教",
+          value: "0",
+        },
+        {
+          label: "讲师",
+          value: "1",
+        },
+        {
+          label: "副教授",
+          value: "2",
+        },
+        {
+          label: "教授",
+          value: "3",
+        },
+      ],
+      header: {
+        Authorization: "",
+      },
+      shoolList: [], //学校选择
+      CollegeList: [], //院系选择,
+      sexId: [0], //记录选择的性别进行数据复现
+      shoolId: [0], //默认选择学校
+      schoolPostId: [0], //默认选择的校内职务
+      jobId: [0], //默认选择具体职务
+      collegeId: [0], //默认选择所属院系
+      address: false, //现居地址选择框的显示/隐藏
+      addressId: [11, 1101, 110101], //记录选择的现居地址进行数据复现
+      birthdays: false, //出生日期选择框的显示/隐藏
+      birthdaysId: "", //记录选择的出生日期进行数据复现
+      EndYear: 2022, //出生日期选择框的最大年份
+      NativePlace: false, //籍贯选择框的显示/隐藏
+      NativePlaceId: [11, 1101, 110101], //记录选择的籍贯进行数据复现
+      WorkArea: false, //工作领域选择框的显示/隐藏
+      WorkAreaId: [0], //记录选择的工作领域进行数据复现
+      //工作领域选择框内容
+      WorkAreaList: [],
+      form: {
+        name: "",
+        realName: "",
+        sex: "",
+        birthdays: "",
+        phone: "",
+        NativePlace: "",
+        address: "",
+        DetailedAddress: "",
+        WorkArea: "",
+        schoolId: "",
+        job: "",
+        businessName: "",
+        businessAddress: "",
+        businessUser: "",
+        businessLicense: "",
+        schoolJob: "",
+        faculty: "",
+      },
+      job: false,
+      roleId: "2",
+      college: false,
+      isDisabled: false,
+      route: "", //判断提交成功之后的页面
+      idcardPositive: idcardPositive,
+      idcardBack: idcardBack,
+      workCard: workCard,
+      enterprisesImg: enterprisesImg,
+      interestList: [], // 兴趣爱好列表
+      selectedInterests: [], // 已选择的兴趣爱好
+    };
+  },
+  onLoad(e) {
+    this.imgResFn();
+    this.action = this.$u.http.config.baseUrl + this.action;
+    this.header.Authorization = "Bearer " + this.vuex_token;
+    this.roleId = "2";
+    let name = this.vuex_user.name;
+    console.log("name-");
+    if (this.roleId == 0) {
+      this.title = "企业认证";
+      this.form.businessUser = name;
+    } else if (this.roleId == 2) {
+      this.title = "教职工认证";
+      this.form.name = name;
+    } else if (this.roleId == 1) {
+      this.title = "管理员认证";
+      this.form.name = name;
+    }
+
+    if (this.vuex_userInfo.realName) {
+      this.form.realName = this.vuex_userInfo.realName;
+    }
+
+    this.EndYear = new Date().getFullYear();
+    this.form.phone = this.vuex_user.phone;
+    this.getschoolId();
+    this.getShool();
+    this.getWorkFile();
+    this.echoFn();
+  },
+  created() {},
+  methods: {
+    back() {
+      if (this.step > 0) {
+        this.step--;
+      } else {
+        uni.navigateBack();
+      }
+    },
+    // 回填个人信息  如果已经存在学生身份，教师身份未认证时
+    async echoFn() {
+      const res = await this.$u.apiList.SelectUserTypeApi();
+      console.log(res, "res---");
+      const jzgFlag = res.jzgFlag;
+      const studentFlag = res.studentFlag;
+      if (studentFlag === true && jzgFlag === false) {
+        this.form.realName = this.vuex_user.name;
+        this.form.sex = this.vuex_user.sex;
+        this.headerImg = this.$u.http.config.baseUrl + this.vuex_user.head;
+        this.form.path = this.vuex_user.head;
+      }
+    },
+    imgResFn() {
+      // 监听从裁剪页发布的事件，获得裁剪结果
+      uni.$on("uAvatarCropper", (path) => {
+        this.headerImg = path;
+        let file = this.common.base64toFile(path, new Date().getTime());
+        if (file.type.indexOf("image") < 0) {
+          // this.$tips("请选择图片", "error");
+          this.$refs.uToast.show({
+            title: "请选择图片",
+            type: "error",
+          });
+
+          return false;
+        }
+        uni.uploadFile({
+          url: this.$u.http.config.baseUrl + "/app/User/File",
+          file: file,
+          fileType: "image",
+          header: {
+            Authorization: "Bearer " + this.vuex_token,
+          },
+          complete: (res) => {
+            console.log(res, "res--");
+            this.form.path = JSON.parse(res.data).data;
+          },
+        });
+      });
+    },
+    // 头像裁剪
+    chooseAvatar() {
+      // 此为uView的跳转方法，详见"文档-JS"部分，也可以用uni的uni.navigateTo
+      this.$u.route({
+        // 关于此路径，请见下方"注意事项"
+        url: "/uview-ui/components/u-avatar-cropper/u-avatar-cropper",
+        // 内部已设置以下默认参数值，可不传这些参数
+        params: {
+          // 输出图片宽度，高等于宽，单位px
+          destWidth: 200,
+          // 裁剪框宽度，高等于宽，单位px
+          rectWidth: 200,
+          // 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可
+          fileType: "jpg",
+        },
+      });
+    },
+    //获取学校id
+    getschoolId() {
+      this.$u.apiList.GetUserSchool().then((res) => {
+        // 学生时
+        if ([0, 2].includes(this.vuex_user.userType)) {
+          this.form.schoolId = res.items.schoolId;
+          this.shoolName = res.items.school.name;
+        }
+        // 教师时
+        if (this.vuex_user.userType === 1) {
+          this.form.schoolId = res.jzgItems.schoolId;
+          this.shoolName = res.jzgItems.school.name;
+        }
+
+        this.getColleg();
+      });
+    },
+    // 获取学校
+    getShool() {
+      this.$u.api.GetAllSchool().then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.shoolList.push({
+            label: res[i].schoolName + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+
+      setTimeout(() => {
+        if (this.vuex_userInfo.schoolName) {
+          this.shoolName = this.vuex_userInfo.schoolName.name;
+          this.form.schoolId = this.vuex_userInfo.schoolName.id;
+          this.getColleg(this.form.schoolId, this.shoolName);
+
+          // console.log(this.vuex_userInfo.schoolName.id);
+          // console.log('this.form',this.form);
+        }
+      }, 300);
+    },
+    //获取学院
+    getColleg() {
+      const data = {
+        schoolid: this.form.schoolId,
+        // name:name
+      };
+      this.form.faculty = "";
+      this.$u.apiList.GetCollegeList(data).then((res) => {
+        this.CollegeList = [];
+        for (let i = 0; i < res.length; i++) {
+          this.CollegeList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取工作领域
+    getWorkFile() {
+      this.$u.apiList.GetWorkFile().then((res) => {
+        this.teacherId = res.find((item) => item.workFieldName === "教师").id;
+        this.WorkAreaList = res.map((item) => {
+          return {
+            label: item.workFieldName,
+            value: item.id,
+          };
+        });
+      });
+    },
+    // 提示
+    tips(title, type, time) {
+      if (this.$refs.uToast) {
+        this.$refs.uToast.show({
+          title: title ? title : "",
+          type: type ? type : "success",
+          duration: time ? time + "" : "1000",
+        });
+      } else {
+        uni.showToast({
+          title: title,
+          icon: type === "error" ? "none" : "success",
+          duration: time || 1000,
+        });
+      }
+    },
+    // 保存
+    save: Debounce(function (e) {
+      let data = this.form;
+      this.form.userId = this.vuex_user.id;
+      if (this.roleId == 1) {
+        if (data.name === "") {
+          this.tips("请输入用户名", "error");
+          return;
+        }
+        //  var reg = new RegExp("^[1][3,4,5,7,8,9][0-9]{9}$", "g"); //手机号
+        //  if (data.phone === "" || !reg.test(data.phone)) {
+        // this.tips("请输入正确的手机号码", "error");
+        // return;
+        //  }
+        if (data.schoolId === "") {
+          this.tips("请选择学校", "error");
+        }
+        // if(data.job === ""){
+        //  this.tips("请选择职业","error")
+        // }
+        if (!this.filecheck()) {
+          return;
+        }
+        this.SubmitAttestationGLY();
+      } else if (this.roleId == 0) {
+        if (data.businessName === "") {
+          this.tips("请输入企业名称", "error");
+          return;
+        }
+        if (data.businessAddress === "") {
+          this.tips("请输入企业地址", "error");
+          return;
+        }
+        // if(data.phone === ""){
+        //  this.tips("请输入联系方式", "error");
+        //  return;
+        // }
+        if (data.job === "") {
+          this.tips("请输入申请人职务", "error");
+          return;
+        }
+        if (!this.filecheck()) {
+          return;
+        }
+        this.SubmitAttestationQY();
+      } else if (this.roleId == 2) {
+        console.log("2022222222222222");
+        if (!this.headerImg) {
+          this.tips("请上传头像", "error");
+          return;
+        }
+        let reg = new RegExp("^[\u4e00-\u9fa5]{0,}$", "g"); //真实姓名
+        if (data.realName === "" || !reg.test(data.realName)) {
+          this.tips("请输入正确的真实姓名", "error");
+          return;
+        }
+        if (!data.sex) {
+          this.tips("请选择性别", "error");
+          return;
+        }
+        //  var reg1 = new RegExp("^[1][3,4,5,7,8,9][0-9]{9}$", "g"); //手机号
+        //  if (data.phone === "" || !reg1.test(data.phone)) {
+        // this.tips("请输入正确的手机号码", "error");
+        // return;
+        //  }
+        if (!this.shoolName) {
+          this.tips("请选择入职学校", "error");
+          return;
+        }
+        if (data.schoolJob === "") {
+          this.tips("请选择校内职务", "error");
+          return;
+        }
+        if (data.schoolJob === "教师") {
+          if (data.faculty === "") {
+            this.tips("请输入所属院系", "error");
+            return;
+          }
+          if (data.job === "") {
+            this.tips("请选择具体职位", "error");
+            return;
+          }
+        }
+        if (!this.filecheck()) {
+          return;
+        }
+        this.step = 1;
+        this.GetInterestLable();
+        // this.SubmitAttestationJZG();
+      }
+    }, 1000),
+
+    filecheck() {
+      let file1 = this.$refs.uUpload1.lists[0];
+      let file2 = this.$refs.uUpload2.lists[0];
+      let file3 = this.$refs.uUpload3.lists[0];
+      if (!file1) {
+        this.tips("请上传身份证正面", "error");
+        return false;
+      }
+      if (!file2) {
+        this.tips("请上传身份证反面", "error");
+        return false;
+      }
+      if (!file3) {
+        this.tips("请上传个人工作证", "error");
+        return false;
+      }
+      if (this.roleId == 0) {
+        let file4 = this.$refs.uUpload4.lists[0];
+        if (!file4) {
+          this.tips("请上传企业营业执照", "error");
+          return false;
+        }
+      }
+      return true;
+    },
+    // 盘判断出生日期
+    isBirthday(data) {
+      return new Date(data) >= new Date();
+    },
+    // 选择工作领域
+    selectWorkArea(e) {
+      this.form.job = e[0].label;
+      this.WorkAreaId = [parseInt(e[0].value)];
+    },
+    // 选择籍贯
+    selectNativePlace(e) {
+      this.form.NativePlace =
+        e.province.label + "-" + e.city.label + "-" + e.area.label;
+      var arr = [];
+      //   - 0 是转化为隐式转换为数组类型
+      arr.push(e.province.value - 0);
+      arr.push(e.city.value - 0);
+      arr.push(e.area.value - 0);
+      this.NativePlaceId = arr;
+    },
+    // 选择出生日期
+    selectBirthdays(e) {
+      this.form.birthdays = e.year + "-" + e.month + "-" + e.day;
+      this.birthdaysId = e.year + "-" + e.month + "-" + e.day;
+    },
+    //   选择性别
+    selectSex(e) {
+      this.form.sex = e[0].label;
+      this.sexId = [parseInt(e[0].value)];
+    },
+    //   选择校内职务
+    selectScpost(e) {
+      if (e[0].label == "教师") {
+        this.isDisabled = true;
+      } else {
+        this.form.faculty = "";
+        this.form.job = "";
+        this.isDisabled = false;
+      }
+      this.form.schoolJob = e[0].label;
+      this.schoolPostId = [parseInt(e[0].value)];
+    },
+    //选择所属院系
+    selectCpllege(e) {
+      this.form.faculty = e[0].label;
+      this.collegeId = [parseInt(e[0].value)];
+    },
+    //   选择具体职务
+    selectJob(e) {
+      this.form.job = e[0].label;
+      this.jobId = [parseInt(e[0].value)];
+    },
+    //   选择地址
+    selectAddress(e) {
+      this.form.businessAddress =
+        e.province.label + "-" + e.city.label + "-" + e.area.label;
+      var arr = [];
+      //   - 0 是转化为隐式转换为数组类型
+      arr.push(e.province.value - 0);
+      arr.push(e.city.value - 0);
+      arr.push(e.area.value - 0);
+      this.addressId = arr;
+    },
+    // 学校选择
+    shoolSelect(e) {
+      this.shoolName = e[0].label;
+      this.form.schoolId = e[0].value;
+      this.getColleg(this.form.schoolId, this.shoolName);
+    },
+    // 提交管理员认证
+    SubmitAttestationGLY() {
+      this.state = false;
+      this.$u.apiList.SubmitAttestationGLY(this.form).then((res) => {
+        this.state = true;
+        if (this.route == "my") {
+          this.$refs.uToast.show({
+            title: "提交认证成功",
+            type: "success",
+          });
+          setTimeout(() => {
+            uni.switchTab({
+              url: "../../my/my/my",
+            });
+          }, 2000);
+        } else {
+          this.$refs.uToast.show({
+            title: "提交认证成功",
+            type: "success",
+            url: "pages/my/authentication/authentication",
+          });
+        }
+      });
+    },
+    //提交企业认证
+    SubmitAttestationQY() {
+      this.state = false;
+      setTimeout(() => {
+        this.state = true;
+        // uni.showToast({
+        //   title: '提交异常,请联系管理员',
+        //   icon: 'none'
+        // })
+      }, 5000);
+      this.$u.apiList
+        .SubmitAttestationQY(this.form)
+        .then((res) => {
+          this.state = true;
+          this.$refs.uToast.show({
+            title: "提交认证成功",
+            type: "success",
+            url: "pages/my/authentication/authentication",
+          });
+        })
+        .catch((err) => {
+          this.state = true;
+          this.tips("保存错误", "error");
+        });
+    },
+    //TODO 提交教职工认证
+    SubmitAttestationJZG() {
+      this.state = false;
+      let data = {
+        ...this.form,
+        userType: 1,
+        // 塞字段
+        path: this.form.path,
+        name: this.form.realName,
+        userName: this.form.realName,
+        jzgName: this.form.realName,
+        workFieldId: this.teacherId,
+        list: this.form.list,
+      };
+      console.log(data, "data--");
+      // return
+      this.$u.apiList.UpdateUserJZG(data).then(async (res) => {
+        console.log(res, "res---认证后返的educationId");
+        this.state = true;
+        // this.$refs.uToast.show({
+        //   title: '提交认证成功',
+        //   type: 'success',
+        //   // url: 'pages/my/authentication/authentication'
+        // })
+        this.$refs.uToast.show({
+          title: "提交认证成功",
+          type: "success",
+        });
+        // return
+        // 选中这个学校
+        const req = {
+          userId: this.vuex_user.id,
+          educationId: res,
+        };
+        const result = await this.$u.apiList.SelectJZGApi(req);
+        this.$u.vuex("vuex_token", result.token);
+        this.$u.vuex("vuex_glyType", result.glyType);
+        this.$u.vuex("vuex_user", result.user);
+        //  把这个改成true
+        this.$u.vuex("vuex_user.isFill", true);
+        setTimeout(() => {
+          uni.switchTab({
+            url: "/pages/main/index/index",
+          });
+        }, 800);
+      });
+    },
+    //图片上传成功
+    onSuccess(data, index, lists, name) {
+      if (name == 0) {
+        this.form.imgFront = data.data;
+      } else if (name == 1) {
+        this.form.imgReverse = data.data;
+      } else if (name == 2) {
+        this.form.imgWork = data.data;
+      } else if (name == 3) {
+        this.form.businessLicense = data.data;
+      }
+    },
+    async GetInterestLable() {
+      const res = await this.$u.apiList.GetInterestLable();
+      console.log("获取标签", res);
+      this.interestList = res;
+    },
+    toggleInterest(item) {
+      // 先判断是否已达到最大选择数量
+      if (this.selectedInterests.length >= 10) {
+        // uni.showToast({
+        //   title: "最多选择10个",
+        //   icon: "none",
+        //   duration: 2000
+        // });
+        this.$refs.uToast.show({
+          title: "最多选择10个",
+          type: "error",
+        });
+        return;
+      }
+
+      // 从 interestList 中查找并移除标签
+      const interestIndex = this.interestList.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+      if (interestIndex > -1) {
+        this.interestList.splice(interestIndex, 1);
+        // 添加到已选择列表
+        this.selectedInterests.push(item);
+      }
+    },
+    removeInterest(item) {
+      // 从已选择列表中移除
+      const selectedIndex = this.selectedInterests.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+      if (selectedIndex > -1) {
+        this.selectedInterests.splice(selectedIndex, 1);
+        // 添加回 interestList
+        this.interestList.push(item);
+      }
+    },
+    async finishPreference() {
+      if (this.selectedInterests.length === 0) {
+        this.$refs.uToast.show({
+            title: "请至少选择一个标签",
+            type: "error",
+          });
+        return;
+      }
+
+      try {
+        // 构建标签列表
+        const interestList = this.selectedInterests.map((item) => ({
+          lableId: item.lableId,
+        }));
+
+        this.form.list = interestList;
+        await this.SubmitAttestationJZG();
+      } catch (error) {
+        uni.showToast({
+          title: "保存失败，请重试",
+          icon: "none",
+          duration: 2000,
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.file {
+  .group_9 {
+    padding: 0.14rem 0.25rem 0;
+    background-color: rgb(246, 247, 250);
+    padding-bottom: 0.2rem;
+
+    .text_23 {
+      color: rgb(46, 155, 255);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+    }
+
+    .button {
+      margin: 0.14rem 0.07rem 0 0.08rem;
+      padding: 0.12rem 0;
+      color: rgb(255, 255, 255);
+      font-size: 0.15rem;
+      line-height: 0.16rem;
+      letter-spacing: 0.03rem;
+      white-space: nowrap;
+      background-color: rgb(46, 155, 255);
+      border-radius: 0.1rem;
+    }
+
+    .text_25 {
+      margin-left: 0.025rem;
+      margin-top: 0.21rem;
+      color: rgb(164, 174, 183);
+      font-size: 0.15rem;
+      line-height: 0.14rem;
+      letter-spacing: 0.03rem;
+      white-space: nowrap;
+    }
+
+    .grid {
+      margin: 0.1rem 0.03rem 0 0.02rem;
+      height: 1.61rem;
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      grid-row-gap: 0.11rem;
+      grid-column-gap: 0.11rem;
+
+      .grid-item {
+        background-color: rgb(176, 191, 205);
+        border-radius: 0.05rem;
+      }
+
+      .grid-item_1 {
+        padding: 0.23rem 0 0.29rem;
+        background-color: rgb(176, 191, 205);
+        border-radius: 0.05rem;
+      }
+
+      .image_14 {
+        width: 100%;
+        height: 0.8rem;
+      }
+    }
+  }
+
+  .section_4 {
+    width: calc(100% - 60rpx);
+    margin: 20rpx auto;
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+
+    .text_11 {
+      color: #191919;
+      font-size: 32rpx;
+      white-space: nowrap;
+    }
+
+    .equal-division {
+      margin-top: 0.13rem;
+      color: rgb(46, 155, 255);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+
+      .equal-division-item {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        margin-bottom: 20rpx;
+
+        .text_11 {
+          color: #191919;
+          font-size: 32rpx;
+          white-space: nowrap;
+        }
+
+        .section_5 {
+          // padding: 0.17rem 0.22rem 0.14rem 0.22rem;
+          border-radius: 0.05rem;
+          // border: 1px dotted #66b5ff;
+        }
+
+        .text_16 {
+          margin-top: 0.055rem;
+          align-self: center;
+        }
+      }
+
+      .equal-division-item_1 {
+        max-width: 48.5%;
+        margin-left: 0.14rem;
+        flex: 1 1 1.6rem;
+
+        .text_11 {
+          color: #191919;
+          font-size: 32rpx;
+          white-space: nowrap;
+        }
+
+        .section_6 {
+          padding: 0.17rem 0.22rem 0.14rem 0.22rem;
+          border-radius: 0.05rem;
+          border: 1px dotted #66b5ff;
+        }
+
+        .text_19 {
+          margin-top: 0.05rem;
+          align-self: center;
+        }
+      }
+
+      .top-section {
+        padding: 0.12rem 0 0.1rem;
+        border-radius: 0.05rem;
+        background: #eff7ff;
+
+        .image_6 {
+          width: 0.22rem;
+          height: 0.17rem;
+        }
+
+        .text_12 {
+          margin-left: 0.075rem;
+          margin-top: 0.015rem;
+        }
+      }
+
+      .bottom-section {
+        margin-top: 0.1rem;
+        padding: 0.09rem 0.17rem 0.13rem;
+        border-radius: 0.05rem;
+        background: #eff7ff;
+
+        .image_8 {
+          margin-right: 0.08rem;
+          width: 0.23rem;
+          height: 0.17rem;
+        }
+
+        .text_14 {
+          margin-top: 0.015rem;
+        }
+      }
+    }
+  }
+}
+
+.form {
+  // border: 1px solid red;
+  // margin-top: -0.3rem;
+  .headerImg {
+    padding-bottom: 0.05rem;
+  }
+
+  .section_2 > view > view {
+    margin-left: 0.21rem;
+    padding: 0 !important;
+    border-bottom: 0.01rem solid #edeeef;
+    position: relative;
+  }
+
+  .section_2 > view > view .input,
+  .section_2 > view > view text {
+    line-height: 0.5rem;
+  }
+
+  .section_2 > view > view .input {
+    padding-right: 0.2rem !important;
+  }
+
+  .section_2 > view > view text {
+    margin-right: 0.1rem;
+    min-width: 0.91rem;
+    white-space: nowrap;
+  }
+
+  .section_2 > view > view image {
+    position: absolute;
+    top: 50%;
+    right: 0.14rem;
+    transform: translateY(-50%);
+  }
+
+  .image_3 {
+    width: 0.075rem;
+    height: 0.13rem;
+  }
+
+  .group {
+    flex: 1 1 auto;
+    overflow-y: auto;
+  }
+
+  .section_2 {
+    padding: 0.055rem 0 0 0;
+    background-color: rgb(255, 255, 255);
+  }
+
+  .group_16 {
+    margin-top: 0.21rem;
+    padding: 0 0.02rem;
+  }
+
+  .button_1,
+  .button {
+    padding: 0.13rem 0;
+    color: rgb(255, 255, 255);
+    font-size: 0.15rem;
+    line-height: 0.14rem;
+    letter-spacing: 0.03rem;
+    white-space: nowrap;
+    background-color: rgb(46, 155, 255);
+    border-radius: 0.1rem;
+    width: 3.1rem;
+    margin: 0 auto;
+  }
+
+  .button_1 {
+    margin-top: 0.1rem;
+    color: rgb(55, 59, 72);
+    background-color: rgb(255, 255, 255);
+    border: solid 0.01rem rgba(160, 162, 172, 0.33);
+    margin-bottom: 0.2rem;
+  }
+
+  .view_1 {
+    margin-left: 0.02rem;
+  }
+
+  .text_15 {
+    color: rgb(55, 59, 72);
+    font-size: 0.15rem;
+    line-height: 0.16rem;
+    white-space: nowrap;
+  }
+
+  .image_2 {
+    width: 0.6rem;
+    height: 0.6rem;
+    border-radius: 50%;
+    overflow: hidden;
+  }
+
+  .image_4 {
+    margin-right: 0.15rem;
+    margin-top: 0.28rem;
+  }
+}
+.jzg-box {
+  // margin-top:-0.5rem;
+  .img-box {
+    .text_4 {
+      text-align: center;
+      margin-top: 0.15rem;
+      margin-bottom: 0.15rem;
+      color: rgb(153, 153, 153);
+      font-size: 0.14rem;
+      font-family: PingFang;
+      line-height: 0.13rem;
+    }
+  }
+}
+::v-deep .u-add-wrap {
+  display: none !important;
+}
+
+.preference-page {
+  background: #fff;
+  // height: 100%;
+  // height: calc(100vh - 300rpx);
+  display: flex;
+  flex-direction: column;
+
+  .selected-count {
+    padding: 24rpx;
+    font-weight: bold;
+    font-size: 32rpx;
+    line-height: 48rpx;
+    color: rgba(0, 0, 0, 0.9);
+    .desc {
+      display: block;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: rgba(0, 0, 0, 0.6);
+      line-height: 40rpx;
+      margin-top: 8rpx;
+    }
+  }
+  .selected-tags {
+    padding: 0 24rpx;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 24rpx 24rpx;
+
+    .tag {
+      display: flex;
+      align-items: center;
+      background: #3cb5fb;
+      color: #fff;
+      border-radius: 64rpx;
+      padding: 20rpx;
+      font-size: 28rpx;
+      position: relative;
+      margin-right: 0;
+      margin-bottom: 0;
+      box-sizing: border-box;
+      justify-content: flex-start;
+      gap: 6rpx;
+    }
+
+    .close-btn {
+      font-size: 28rpx;
+      margin-right: 8rpx;
+      cursor: pointer;
+      color: #fff;
+      font-weight: bold;
+      line-height: 1;
+      display: inline-block;
+      width: 32rpx;
+      height: 32rpx;
+      text-align: center;
+      border-radius: 50%;
+      background: rgba(255, 255, 255, 0.18);
+    }
+  }
+  .line {
+    width: 100%;
+    height: 4rpx;
+    background: #f6f8f9;
+    margin-top: 24rpx;
+    margin-bottom: 44rpx;
+  }
+  .line-shadow {
+    width: 100%;
+    height: 2rpx;
+    background: #ffffff;
+    box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(0, 0, 0, 0.05);
+    margin-top: 56rpx;
+  }
+  .all-tags {
+    padding: 0 24rpx;
+    .title {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.9);
+      margin-bottom: 18rpx;
+    }
+    .tags-list {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 24rpx 24rpx;
+      margin-bottom: 32rpx;
+      padding-bottom: 100rpx;
+      .tag {
+        background: #f6f8f9;
+        color: #333;
+        border-radius: 200rpx;
+        padding: 20rpx 32rpx;
+        font-size: 28rpx;
+        &.selected {
+          background: #3cb5fb;
+          color: #fff;
+        }
+      }
+    }
+  }
+  .btn-box {
+    position: fixed;
+    bottom: 62rpx;
+    left: 0;
+    right: 0;
+    padding: 0 24rpx;
+  }
+  .button {
+    margin: 48rpx 0 0 0;
+    width: 100%;
+  }
+}
+</style>
diff --git a/pages/main/index/index.vue b/pages/main/index/index.vue
new file mode 100644
index 0000000..2ee7a50
--- /dev/null
+++ b/pages/main/index/index.vue
@@ -0,0 +1,1633 @@
+<template>
+  <view>
+    <view class="bottom">
+      <div class="info" v-if="showInfo">
+        <view class="flex-col section_2">
+          <view class="justify-between position-relative">
+            <view class="flex-row group_5">
+              <image @click="toDetil(detailInfo.userId)" :src="$u.http.config.imgUrl + detailInfo.imageUrl"
+                     class="image_5"/>
+              <view class="name-work">
+                <view class="flex-row items-center h100">
+                  <text class="text text_1">{{ detailInfo.name }}</text>
+                  <text class="text text_3" v-if="careerList[detailInfo.workFieldName]">
+                    <img :src="careerList[detailInfo.workFieldName].icon"
+                         alt="">{{ detailInfo.workLableName || detailInfo.workFieldName }}
+                  </text>
+                  <text class="text text_3" v-else>
+                    {{ detailInfo.workLableName }}
+                  </text>
+                </view>
+              </view>
+            </view>
+            <view class="flex-row section_3">
+              <image src="/static/common/img/chats.png" class="image_6"/>
+              <text class="text text_2" @click="GoChat(detailInfo.userId)">打招呼</text>
+            </view>
+          </view>
+          <view class="flex-row tags">
+            <u-tag :text="detailInfo.college" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                   type="info"></u-tag>
+            <u-tag :text="detailInfo.major" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                   type="info"></u-tag>
+            <u-tag :text="detailInfo.startYear" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                   type="info"></u-tag>
+          </view>
+          <view>
+            <text v-if="detailInfo.aiBlurb" class="text AIdescribe">{{ detailInfo.aiBlurb }}</text>
+          </view>
+          <view class="flex-row group_6">
+            <image src="/static/common/img/location.svg" style="width: 32rpx;height: 32rpx;"></image>
+            <text class="text text_5">{{
+                detailInfo.province +
+                " " +
+                detailInfo.city +
+                " 距你 " +
+                (detailInfo.distance > 1000
+                    ? (detailInfo.distance / 1000).toFixed(1) + "KM"
+                    : detailInfo.distance + "M")
+              }}
+            </text>
+          </view>
+        </view>
+      </div>
+    </view>
+    <view class="search-box" @click="toSearch">
+
+      <image
+          src="/static/common/img/search.svg"
+          style="width: 40rpx; height: 40rpx"
+      ></image>
+    </view>
+    <!-- :scale="map.scale"  缩放max：18 min：5-->
+    <map
+        id="map"
+        ref="map"
+        :style="'width: 100vw; height: calc(100vh - .5rem );'"
+        :scale="mapScale"
+        :layer-style="'style1'"
+        @regionchange="regionchange"
+        @updated="updated"
+        :latitude="map.latitude"
+        :longitude="map.longitude"
+        :markers="covers"
+        @callouttap="de"
+        @markertap="getUserDetail"
+        @click="tap"
+    >
+    </map>
+    <!-- 回到本人定位位置   -->
+    <view class="back-to-location" @click="backToLocation"
+          v-if="latitude!=vuex_userLocation.latitude||longitude!=vuex_userLocation.longitude">
+      <image src="/static/common/img/back-to-location.png" style="width: 120rpx; height: 120rpx"></image>
+    </view>
+    <u-tabbar
+        :list="vuex_tabbar"
+        :class="{ phone: vuex_iPhone }"
+        :active-color="vuex_tabbar_config.activeColor"
+        :inactive-color="vuex_tabbar_config.inactiveColor"
+    ></u-tabbar>
+    <u-toast ref="uToast"/>
+    <!-- 弹出列表 -->
+    <view class="popup-box" v-if="showPopup" :style="{
+      maxHeight: isExpanded,height: isExpanded,
+    }">
+      <view class="popup-top"
+            @click.stop="togglePopup"
+            @touchstart.stop.prevent="touchStart"
+            @touchmove.stop.prevent="touchMoveFn"
+            @touchend.stop.prevent="touchEnd">
+        <view class="pop-top"></view>
+        <view class="pop-title">附近校友</view>
+      </view>
+      <view class="content">
+        <template v-for="(item, index) in detailInfoList">
+          <view
+              v-if="item.userId == 0"
+              class="info"
+              style="
+                position: initial;
+                transform: initial;
+                margin-bottom: 0.1rem;
+              "
+              :key="index"
+          >
+            <view class="flex-col section_2">
+              <view class="justify-between position-relative">
+                <view class="flex-row group_5">
+                  <image
+                      :src="$u.http.config.imgUrl + item.imageUrl"
+                      class="image_5"
+                  />
+                  <view class="name-work">
+                    <view class="flex-row items-center h100">
+                      <text class="text text_1">{{ item.name }}</text>
+                      <text class="text text_3" v-if="careerList[item.workFieldName]">
+                        <img :src="careerList[item.workFieldName].icon"
+                             alt="">{{ item.workLableName || item.workFieldName }}
+                      </text>
+                      <text class="text text_3" v-else>
+                        {{ item.workFieldName }}
+                      </text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view v-if="item.college||item.major||item.startYear" class="flex-row tags">
+                <u-tag :text="item.college" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                       type="info"></u-tag>
+                <u-tag :text="item.major" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                       type="info"></u-tag>
+                <u-tag :text="item.startYear" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                       type="info"></u-tag>
+              </view>
+              <view>
+                <text v-if="item.aiBlurb" class="text AIdescribe">{{ item.aiBlurb }}</text>
+              </view>
+              <view class="flex-row group_6">
+                <image
+                    src="/static/common/img/location.svg"
+                    style="width: 32rpx; height: 32rpx"
+                ></image>
+                <text class="text text_5"
+                >{{
+                    item.province +
+                    " " +
+                    item.city +
+                    " 距你 " +
+                    (item.distance > 1000
+                        ? (item.distance / 1000).toFixed(1) + "KM"
+                        : item.distance + "M")
+                  }}
+                </text>
+              </view>
+            </view>
+          </view>
+          <view
+              v-else
+              class="info"
+              style="
+                position: initial;
+                transform: initial;
+                margin-bottom: 0.1rem;
+              "
+              :key="index"
+          >
+            <view class="flex-col section_2">
+              <view class="justify-between position-relative">
+                <view class="flex-row group_5">
+                  <u-avatar
+                      @click="toDetil(item.userId)"
+                      size="0.5rem"
+                      :src="$u.http.config.imgUrl + item.imageUrl"
+                      class="image_5"
+                  ></u-avatar>
+                  <view class="name-work">
+                    <view class="flex-row items-center h100">
+                      <text class="text text_1">{{ item.name }}</text>
+                      <text class="text text_3" v-if="careerList[item.workFieldName]">
+                        <img :src="careerList[item.workFieldName].icon"
+                             alt="">{{ item.workLableName || item.workFieldName }}
+                      </text>
+                      <text class="text text_3" v-else>
+                        {{ item.workFieldName }}
+                      </text>
+                    </view>
+                    <view>
+                    </view>
+                  </view>
+                </view>
+                <view @click="GoChat(item.userId)" class="flex-row section_3">
+                  <image src="/static/common/img/chats.png" class="image_6"/>
+                  <text class="text text_2">打招呼</text>
+                </view>
+              </view>
+              <view class="flex-row tags">
+                <u-tag :text="item.college" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                       type="info"></u-tag>
+                <u-tag :text="item.major" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                       type="info"></u-tag>
+                <u-tag :text="item.startYear" bg-color="#F6F8F9" color="#000000" mode="dark" size="mini"
+                       type="info"></u-tag>
+              </view>
+              <view>
+                <text v-if="item.aiBlurb" class="text AIdescribe">{{ item.aiBlurb }}</text>
+              </view>
+              <view class="flex-row group_6">
+                <image
+                    src="/static/common/img/location.svg"
+                    style="width: 32rpx; height: 32rpx"
+                ></image>
+                <text class="text text_5"
+                >{{
+                    item.province +
+                    " " +
+                    item.city +
+                    " 距你 " +
+                    (item.distance > 1000
+                        ? (item.distance / 1000).toFixed(1) + "KM"
+                        : item.distance + "M")
+                  }}
+                </text>
+              </view>
+            </view>
+          </view>
+        </template>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+// var jweixin = require('./../../../static/common/js/jweixin.js')
+var jweixin = require("jweixin-module");
+var map;
+var qqmapsdk;
+export default {
+  data() {
+    return {
+      latitude: 0, //纬度
+      longitude: 0,
+      mapScale: 16,
+      showInfo: false,
+      height: "calc(100vh - .5rem )",
+      width: "100vw",
+      // showList: true,
+      // viewHeight: 0,
+      map: {
+        scale: 14,
+        latitude: 39.909,
+        longitude: 116.39742,
+      },
+      // 标记点
+      covers: [],
+      pointDataList: "",
+      detailInfoList: [],
+      // 中心点
+      center: {
+        userId: 0,
+        latitude: 39.909, //纬度
+        longitude: 116.39742, //经度
+        iconPath: "", //显示的图标
+        rotate: 0, // 旋转度数
+        width: 50, //宽
+        imageUrl: "",
+        height: 50, //高
+        name: "我",
+        province: "",
+        city: "",
+        distance: "0",
+        workFieldName: "",
+        title: "我的位置", //标注点名
+        alpha: 0.8, //透明度
+      },
+
+      callout: {
+        content: '',//String 文本
+        color: '',//String 文本颜色
+        fontSize: '',// Number 文字大小
+        x: 3,// label的坐标，原点是 marker 对应的经纬度
+        y: -20,// label的坐标，原点是 marker 对应的经纬度
+        borderWidth: 0,//Number边框宽度
+        borderColor: '',//String 边框颜色
+        borderRadius: 0,//Number callout边框圆角
+        bgColor: '',//String 背景色
+        padding: '',//Number 文本边缘留白
+        display: 'ALWAYS',//String 'BYCLICK':点击显示; 'ALWAYS':常显
+      },
+      careerList: {
+        '生物/制药/化工/医疗': {
+          icon: '/static/common/icon/icon-1.png',
+          minIcon: '/static/common/icon/min-icon-1.png',
+        },
+        '政府机构/翻译/其他': {
+          icon: '/static/common/icon/icon-2.png',
+          minIcon: '/static/common/icon/min-icon-2.png',
+        },
+        '人事/行政/高级管理': {
+          icon: '/static/common/icon/icon-3.png',
+          minIcon: '/static/common/icon/min-icon-3.png',
+        },
+        '设计/市场/媒体/广告': {
+          icon: '/static/common/icon/icon-4.png',
+          minIcon: '/static/common/icon/min-icon-4.png',
+        },
+        '闽建筑/房地产': {
+          icon: '/static/common/icon/icon-5.png',
+          minIcon: '/static/common/icon/min-icon-5.png',
+        },
+        '计算机/互联网/通信/电子': {
+          icon: '/static/common/icon/icon-6.png',
+          minIcon: '/static/common/icon/min-icon-6.png',
+        },
+        '服务业': {
+          icon: '/static/common/icon/icon-7.png',
+          minIcon: '/static/common/icon/min-icon-7.png',
+        },
+        '教育/培训': {
+          icon: '/static/common/icon/icon-8.png',
+          minIcon: '/static/common/icon/min-icon-8.png',
+        },
+        '销售/客服': {
+          icon: '/static/common/icon/icon-9.png',
+          minIcon: '/static/common/icon/min-icon-9.png',
+        },
+        '资讯/法律/科研': {
+          icon: '/static/common/icon/icon-10.png',
+          minIcon: '/static/common/icon/min-icon-10.png',
+        },
+        '会计/金融/银行/保险': {
+          icon: '/static/common/icon/icon-11.png',
+          minIcon: '/static/common/icon/min-icon-11.png',
+        },
+        '生产/营运/采购/物流': {
+          icon: '/static/common/icon/icon-12.png',
+          minIcon: '/static/common/icon/min-icon-12.png',
+        },
+        '学生': {
+          icon: '/static/common/icon/icon-13.png',
+          minIcon: '/static/common/icon/min-icon-13.png',
+        },
+        '教师': {
+          icon: '/static/common/icon/icon-14.png',
+          minIcon: '/static/common/icon/min-icon-14.png',
+        },
+      },
+      list: [],
+      load: true,
+      detailInfo: "",
+      Showip: "",
+      isExpanded: '0vh',
+      touchStartY: 0,
+      startScrollTop: 0,
+      showPopup: false,
+      timeer: null
+    };
+  },
+  onLoad(e) {
+    // if(!this.vuex_user.isCard){
+    // 	uni.navigateTo({
+    // 		url: '/pages/Face/index/index'
+    // 	});
+    // 	return
+    // }
+    // if (!this.vuex_user.isFill) {
+    // 	uni.navigateTo({
+    // 		url: "/pages/login/perfect/perfect",
+    // 	});
+    // 	return
+    // } else {
+    // 	this.$u.api.getUser()
+    // }
+
+    console.info("🚀 ~ file:index method:onLoad line:374 -----", this.vuex_user)
+
+    this.center.imageUrl = this.vuex_user.head;
+    this.center.workField = this.vuex_user?.workField?.workFieldName || "暂无";
+    this.center.workFieldName = this.vuex_user?.workFieldName || "暂无";
+    this.center.aiBlurb = this.vuex_user?.aiBlurb || "暂无";
+    this.center.aiLabel = this.vuex_user?.aiLabel || "";
+    this.center.college = this.vuex_user?.college || "";
+    this.center.major = this.vuex_user?.major || "";
+    this.center.startYear = this.vuex_user?.startYear || "";
+
+    // 创建地图上下文
+    map = uni.createMapContext("map", this);
+    uni.getSystemInfo({
+      success: (res) => {
+        this.height = res.windowHeight + "px";
+        this.width = res.windowWidth + "px";
+      },
+    });
+    // this.location();
+    // qqmapsdk = new QQMapWX({
+    // 	key: '2OLBZ-OOSRQ-RYZ5A-GMCM2-DJ43O-3QFLS', //开发者密钥
+    // })
+    // console.log(this.vuex_user.isFill)
+  },
+  onShow() {
+    /* uni.getSystemInfo({
+      success: (res) => {
+        this.viewHeight = res.windowHeight;
+      },
+    }); */
+
+    this.map.latitude = this.vuex_userLocation.latitude;
+    this.map.longitude = this.vuex_userLocation.longitude;
+    this.center.latitude = this.vuex_userLocation.latitude;
+    this.center.longitude = this.vuex_userLocation.longitude;
+    setTimeout(() => {
+      if (!this.map.latitude || !this.map.longitude) {
+        this.location(true);
+      }
+      this.test();
+    }, 500);
+    if (!this.vuex_user.isFill) {
+      uni.navigateTo({
+        url: "/pages/login/perfect/perfect",
+      });
+      return;
+    } else {
+      this.$u.api.getUser();
+    }
+  },
+  methods: {
+    // 回到当前位置
+    backToLocation() {
+      this.location(true);
+      map.moveToLocation({
+        latitude: this.vuex_userLocation.latitude || this.center.latitude,
+        longitude: this.vuex_userLocation.longitude || this.center.longitude,
+      });
+
+      this.latitude = this.vuex_userLocation.latitude || this.center.latitude;
+      this.longitude = this.vuex_userLocation.longitude || this.center.longitude;
+    },
+    // 查看详情
+    toDetil(id) {
+      this.$u.route({
+        url: "/pages/AlumniCircle/userDetail/userDetail?id=" + id,
+      });
+    },
+    //   去聊天
+    GoChat(id) {
+      this.showInfo = false;
+      uni.navigateTo({
+        url:
+            "../../message/dialogBox/dialogBox?id=" + id + "&chatType=0&type=0",
+      });
+    },
+    toSearch() {
+      if (this.vuex_user.isAttestationXY || true) {
+        this.$u.route({
+          url: "/pages/main/search/search",
+          params: {
+            type: 'index',
+          },
+        });
+      } else {
+        this.$refs.uToast.show({
+          title: "认证后才能进行搜索哦",
+          url: "/pages/my/ShoolList/ShoolList",
+        });
+      }
+    },
+    test() {
+      map.getRegion({
+        success: (res) => {
+          this.Showip = {
+            northeast: res.northeast,
+            southwest: res.southwest,
+          };
+          this.getList();
+        },
+      });
+    },
+    getEpsByScale(zoomLevel) {
+      // 缩放等级范围限制在 1 到 18
+      if (zoomLevel < 1) zoomLevel = 1;
+      if (zoomLevel > 18) zoomLevel = 18;
+
+      // 基础距离（单位：米），通常在缩放等级 0 时显示整个地球（约 40075 公里）
+      const earthCircumference = 40075000; // 地球赤道周长（米）
+
+      // 根据缩放等级计算当前等级下的单个瓦片的地面宽度
+      const tileSize = 256; // 地图瓦片大小（通常是 256x256 像素）
+      const scale = 2 ** zoomLevel; // 缩放等级对应的缩放比例
+
+      // 计算每个像素代表的地面距离（米/像素）
+      const metersPerPixel = earthCircumference / (tileSize * scale);
+
+      // 返回一个以 50 像素为参考的距离（可以根据需求调整这个值）
+      const pixelRange = 50; // 聚合点之间的最小像素距离
+      return metersPerPixel * pixelRange;
+    },
+    //根据东北 西南经纬度 以及后台返回标记点 格式化成marker点
+    async getFortMatMarkerList(northeast, southwest, scale, backendMarkerList) {
+      // 当前显示的坐标范围
+
+      // console.log(southwest.longitude, northeast.longitude, northeast.latitude, southwest.latitude)
+      //屏幕中显示的经度的长度和纬度的长度
+      let mapWidth = southwest.longitude - northeast.longitude;
+      let mapHeight = northeast.latitude - southwest.latitude;
+      //将屏幕中地图分割的横向 格子数和 纵向格子数
+      // let widthSize = scale;
+      // let heightSize = widthSize + parseInt(scale / 2);
+      let widthSize = 30 - parseInt(scale / 2);
+      let heightSize = 30 - parseInt(scale / 2);
+
+      //计算每个格子的经纬度的长度
+      let unitWidth = mapWidth / widthSize;
+      let unitHeight = mapHeight / heightSize;
+      // console.log(southwest.longitude - northeast.longitude, unitHeight)
+      let pointData = {};
+      backendMarkerList.forEach((latLng) => {
+        //如果点在显示范围内
+        if (
+            latLng.latitude < northeast.latitude &&
+            latLng.latitude > southwest.latitude &&
+            latLng.longitude < northeast.longitude &&
+            latLng.longitude > southwest.longitude
+        ) {
+          let relativeX = latLng.longitude - northeast.longitude;
+          let relativeY = latLng.latitude - southwest.latitude;
+          //计算出这个点，处于哪个格子
+          let x = parseInt(Math.floor(relativeX / unitWidth));
+          let y = parseInt(Math.floor(relativeY / unitHeight));
+          if (x < 0 || y < 0) {
+            console.log("点位不在格子内", "失败");
+          }
+          //生成单元格点位数据
+          let pointKey = x + "," + y;
+          if (pointData[pointKey] == undefined) {
+            pointData[pointKey] = [];
+          }
+          if (pointData[pointKey].length <= 99) {
+            pointData[pointKey].push(latLng);
+          } else {
+            return
+          }
+        } else {
+          console.log("点位不在显示范围内", "失败");
+        }
+      });
+      console.info("🚀 ~ file:index method:getFortMatMarkerList line:547 -----", pointData)
+
+
+      // ===== 新增：使用 DBSCAN 进行全局点聚合 start =====
+      const eps = this.getEpsByScale(scale); // 根据缩放级别调整 eps 值
+      pointData = this.dbscan(pointData, parseInt(eps)); // 聚合参数可调整
+
+
+      this.pointDataList = pointData;
+
+
+      let resultMapArray = [];
+      for (let y = 0; y < heightSize; y++) {
+        for (let x = 0; x < widthSize; x++) {
+          let pointKey = x + "," + y;
+          if (
+              pointData[pointKey] != undefined &&
+              (pointData[pointKey][0].userId ||
+                  pointData[pointKey][0].userId === 0)
+          ) {
+            let markerItem = {};
+
+            //聚合点与单点共存 , 长度等于一 不聚合点
+            if (pointData[pointKey].length == 1) {
+              var HeadImg = "/static/common/img/adminHeaderImg.png?number=1";
+              if (pointData[pointKey][0].userId == 0) {
+                if (this.vuex_user.sex == "男") {
+                  HeadImg = "/static/common/img/male.png?number=1";
+                }
+                if (this.vuex_user.sex == "女") {
+                  HeadImg = "/static/common/img/female.png?number=1";
+                }
+              }
+              // 请求在线图片文件 判断是否存在
+              // const imgExist = await this.doesImageExist(this.$u.http.config.imgUrl +
+              //     pointData[pointKey][0].imageUrl +
+              //     "?number=1");
+              //
+              // if (imgExist) {
+              //   HeadImg =
+              //       this.$u.http.config.imgUrl +
+              //       pointData[pointKey][0].imageUrl +
+              //       "?number=1";
+              // }
+              // 线上会出现奇怪的问题，所以先注释掉
+
+              if (pointData[pointKey][0].imageUrl != "") {
+                HeadImg =
+                    this.$u.http.config.imgUrl +
+                    pointData[pointKey][0].imageUrl +
+                    "?number=1";
+              }
+
+
+              markerItem = {
+                id: parseInt(
+                    (pointData[pointKey][0].latitude -
+                        -pointData[pointKey][0].longitude) *
+                    100000
+                ),
+                latitude: pointData[pointKey][0].latitude,
+                longitude: pointData[pointKey][0].longitude,
+                iconPath: HeadImg,
+                width: 50,
+                height: 50,
+                callout: {
+                  content: scale == 18 ? pointData[pointKey][0].aiLabel : '',
+                  display: 'ALWAYS',
+                  borderRadius: 100,
+                  bgColor: '#3CB5FB',
+                  color: '#fff',
+                  borderColor: '#3CB5FB',
+                },
+                label: {
+                  ...this.callout,
+                  width: 50,
+                  height: 50,
+                  content: !this.careerList[pointData[pointKey][0].workFieldName] ? `` : `<img src="${this.careerList[pointData[pointKey][0].workFieldName].minIcon}">`
+                }
+              };
+
+
+              if (pointData[pointKey][0].userId === 0) {
+                markerItem.id = '0'
+                if (!pointData[pointKey][0].aiLabel) {
+                  markerItem.title = '我的位置'
+                }
+
+              }
+              // let iconPath = pointData[pointKey][0].ScanAndCharge == 1 ? '/img/scanMarkerIcon.png' : '/img/markerIcon.png';
+              //长度大于一聚合点
+            } else if (pointData[pointKey].length > 1) {
+              // console.log('聚合点', pointData[pointKey]);
+              // id会被转为number类型，字符类型不能触发点击时间，
+              // 最后面加1是为了在结尾为0的情况时，0在转被为number不被裁剪掉，
+              // 对比判断id时去掉加上的 1
+              if (pointData[pointKey].length > 99) {
+                pointData[pointKey] = pointData[pointKey].slice(0, 99)
+              }
+
+              markerItem = {
+                id: pointKey.split(",")[0] + "." + pointKey.split(",")[1] + "1",
+                latitude: pointData[pointKey][0].latitude,
+                longitude: pointData[pointKey][0].longitude,
+                iconPath: await this.generateGroupAvatar(pointData[pointKey]), // 使用生成的群组头像
+                width: 50,
+                height: 50,
+                list: pointData[pointKey],
+              };
+            }
+
+            resultMapArray.push(markerItem);
+          }
+        }
+      }
+
+      return resultMapArray;
+    }
+    ,
+    async doesImageExist(url) {
+      try {
+        const response = await fetch(url, {method: 'HEAD'});
+        return response.ok;
+      } catch (error) {
+        console.error('图片不存在或发生错误:', error);
+        return false;
+      }
+    },
+    generateGroupAvatar(users) {
+
+      return new Promise((resolve, reject) => {
+        try {
+          const canvasSize = 100;
+          const maxAvatars = 9;
+          const filteredUsers = users.slice(0, maxAvatars);
+          const total = filteredUsers.length;
+
+          if (total === 0) {
+            resolve('/static/common/img/map_icon.png');
+            return;
+          }
+
+          // 缓存 key
+          const userIds = filteredUsers.map(u => u.userId).join(',');
+          const cacheKey = `groupAvatar_${userIds}`;
+          if (this[cacheKey]) {
+            resolve(this[cacheKey]);
+            return;
+          }
+
+          // 创建 Canvas
+          const canvas = document.createElement('canvas');
+          canvas.width = canvasSize;
+          canvas.height = canvasSize;
+          const ctx = canvas.getContext('2d');
+          ctx.fillStyle = '#ffffff';
+          ctx.fillRect(0, 0, canvasSize, canvasSize);
+
+          let drawnCount = 0;
+          const padding = 2;
+          const verticalPadding = 3;
+
+          // 布局配置
+          const layoutConfig = {
+            1: {rows: 1, cols: 1, centeredRows: [0]},
+            2: {rows: 1, cols: 2}, // 横向排列，但垂直居中
+            3: {rows: 2, cols: [1, 2], centeredRows: [0]}, // 上1 下2，上居中
+            4: {rows: 2, cols: 2}, // 2x2 四宫格
+            5: {rows: 2, cols: [2, 3], centeredRows: [0]}, // 上2 下3，上居中
+            6: {rows: 2, cols: 3}, // 上3 下3
+            7: {rows: 3, cols: [1, 3, 3], centeredRows: [0]}, // 上1 中3 下3
+            8: {rows: 3, cols: [2, 3, 3], centeredRows: [0]}, // 上2 中3 下3
+            9: {rows: 3, cols: 3},
+          };
+
+          const config = layoutConfig[total] || layoutConfig[9];
+          const {rows, cols} = config;
+          const colCounts = Array.isArray(cols) ? cols : Array(rows).fill(cols);
+          const centeredRows = config.centeredRows || [];
+
+          // 计算最大列数，用于计算每个头像宽度
+          const maxCols = Math.max(...colCounts);
+          const avatarWidth = (canvasSize - padding * (maxCols - 1)) / maxCols;
+          const rowHeight = (canvasSize - verticalPadding * (rows - 1)) / rows;
+
+
+          // 绘制每个头像
+          filteredUsers.forEach((user, index) => {
+            const image = new Image();
+            image.crossOrigin = 'anonymous';
+            image.src = this.$u.http.config.imgUrl + user.imageUrl;
+
+
+            // 确定当前头像属于哪一行
+            let currentRow = 0;
+            let count = 0;
+            for (let i = 0; i < rows; i++) {
+              const colCount = colCounts[i];
+              if (index < count + colCount) {
+                currentRow = i;
+                break;
+              }
+              count += colCount;
+            }
+
+            const colIndex = index - count;
+            const currentColCount = colCounts[currentRow];
+
+            // 如果该行需要居中，则计算起始X坐标
+            const startX = centeredRows.includes(currentRow)
+                ? (canvasSize - currentColCount * (avatarWidth + padding) + padding) / 2
+                : 0;
+
+            const x = startX + colIndex * (avatarWidth + padding);
+            const y = currentRow * (rowHeight + verticalPadding);
+
+            // 固定绘制为正方形，避免拉伸
+            const drawSize = Math.min(avatarWidth, rowHeight);
+
+            // 居中绘制
+            const offsetY = (rowHeight - drawSize) / 2;
+
+            image.onload = () => {
+              ctx.save();
+              ctx.beginPath();
+              ctx.rect(x, y + offsetY, drawSize, drawSize);
+              ctx.clip();
+
+              // 从图片中心裁剪出一个正方形
+              const imgRatio = image.width / image.height;
+              const cropSize = imgRatio > 1 ? image.height : image.width;
+              const offsetX = (image.width - cropSize) / 2;
+              const offsetYImg = (image.height - cropSize) / 2;
+
+              ctx.drawImage(
+                  image,
+                  offsetX, offsetYImg, cropSize, cropSize, // 源图裁剪区域
+                  x, y + offsetY, drawSize, drawSize       // 目标绘制区域
+              );
+
+              ctx.restore();
+
+              drawnCount++;
+              if (drawnCount === filteredUsers.length) {
+                // 如果超过最大数量，覆盖整个画布并居中显示 "+n"
+                if (users.length > maxAvatars) {
+                  ctx.fillStyle = 'rgba(0, 0, 0, 0.2)';
+                  ctx.beginPath();
+                  ctx.rect(0, 0, canvasSize, canvasSize);
+                  ctx.fill();
+
+                  ctx.fillStyle = '#ffffff';
+                  ctx.font = 'bold 40px Arial';
+                  ctx.textAlign = 'center';
+                  ctx.textBaseline = 'middle';
+                  ctx.fillText(`+${users.length}`, canvasSize / 2, canvasSize / 2);
+                }
+
+                // 缓存结果并返回
+                const result = canvas.toDataURL('image/png');
+                this[cacheKey] = result;
+                resolve(result); // 异步完成
+              }
+            };
+
+            image.onerror = (err) => {
+              image.src = "data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYGCAsMCgoLCgoMEAwMDAwMDBAMDg8QDw4MExMUFBMTHBsbGxwfHx8fHx8fHx8fAQcHBw0MDRgQEBgaFREVGh8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx//wAARCADIAMgDAREAAhEBAxEB/8QAcQABAQEAAwEBAAAAAAAAAAAAAAUEAQMGAgcBAQAAAAAAAAAAAAAAAAAAAAAQAAIBAwICBgkDBQAAAAAAAAABAhEDBCEFMVFBYXGREiKBscHRMkJSEyOh4XLxYjNDFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8A/fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHbHFyZ/Dam+yLA+Z2L0Pjtyj2poD4AAAAAAAAAAAAAAAAAAAAAAAAKWFs9y6lcvvwQeqj8z9wFaziY1n/HbUX9XF97A7QAGXI23EvJ1goyfzR0YEfN269jeZ+a03pNe0DIAAAAAAAAAAAAAAAAAAAACvtO3RcVkXlWutuL9YFYAAAAAOJRjKLjJVi9GmB5/csH/mu1h/in8PU+QGMAAAAAAAAAAAAAAAAAAaMDG/6MmMH8C80+xAelSSVFolwQAAAAAAAHVlWI37ErUulaPk+hgeYnCUJuElSUXRrrQHAAAAAAAAAAAAAAAAABa2Oz4bM7r4zdF2ICmAAAAAAAAAg7zZ8GX41wuJP0rRgYAAAAAAAAAAAAAAAAAD0m2R8ODaXU33tsDSAAAAAAAAAlb9HyWZcnJd9PcBHAAAAAAAAAAAAAAAAAPS7e64Vn+KA0AAAAAAAAAJm+v8Ftf3ewCKAAAAAAAAAAAAAAAAAX9muqeGo9NttP06+0DcAAAAAAAAAjb7dTu2ra+VOT9P8AQCWAAAAAAAAAAAAAAAAAUNmyPt5Ltv4bui/kuAF0AAAAAAADiUlGLlJ0SVW+oDzOXfd/Ind6JPRdS0QHSAAAAAAAAAAAAAAAAAE2nVaNcGB6Lbs6OTao9LsF51z60BrAAAAAABJ3jOVHjW3r/sa9QEgAAAAAAAAAAAAAAAAAAAPu1duWriuW34ZR4MC9hbnZyEoy8l36XwfYBsAAADaSq9EuLAlZ+7xSdrGdW9Hc5dgEdtt1erfFgAAAAAAAAAAAAAAAAADVjbblX6NR8MH80tEBRs7HYivyzlN8lovaBPzduvY0m6eK10TXtAyAarO55lpJK54orolr+4GqO/Xaea1FvqbXvA+Z77kNeW3GPbV+4DJfzcm/pcm3H6Vou5AdAFLC2ed2Pjv1txa8sV8T6wOL+yZEKu1JXFy4MDBOE4ScZxcZLinoB8gAAAAAAAAAAAB242LeyJ+C3GvN9C7QLmJtePYpKS+5c+p8F2IDYAANJqj1T4oCfk7Nj3G5Wn9qXJax7gJ93Z82D8sVNc4v30A6Xg5i42Z+iLfqARwcyT0sz9MWvWBps7LlTf5Grce9/oBTxdtxseklHxT+uWr9AGoAB138ezfj4bsFJdD6V2MCPm7RdtJzs1uW1xXzL3gTgAAAAAAAAADRhYc8q74I6RWs5ckB6GxYtWLat21SK731sDsAAAAAAAAAAAAAAAASt021NO/YjrxuQXT1oCOAAAAAAABzGLlJRSq26JAelwsWONYjbXxcZvmwO8AAAAAAAAAAAAAAAAAAef3TEWPkVivx3NY9T6UBiAAAAAABo2+VmGXblddIJ8eivRUD0oAAAAAAAAAAAAAAAAAAAYt4tKeFKVNYNSXfRgefAAAAAAAAr7VuSSWPedKaW5v1MCsAAAAAAAAAAAAAAAAAAIe6bj96Ts2n+JPzSXzP3ATgAAAAAAAAFbbt1UUrOQ9FpC4/UwK6aaqtU+DAAAAAAAAAAAAAAA4lKMIuUmoxWrb4ARNx3R3q2rLpa4Sl0y/YCcAAAAAAAAAAANmFud7G8r89r6X0dgFvGzLGRGtuWvTF6NAdwAAAAAAAAAAAy5W442PVN+K59EePp5ARMvOv5MvO6QXCC4AZwAAAAAAAAAAAAAcxlKLUotprg1owN+PvORborq+7Hnwl3gUbO74VzRydt8pKn68ANcJwmqwkpLmnUDkAAAAfNy9atqtyagut0AxXt5xIV8Fbj6lRd7Am5G65V6qUvtwfyx94GMAAAAAAAAAAAAAAAAAAAOU2nVOj5gdsc3LiqRvTpyqwOxbnnrhdfpSfrQB7pnv/AGvuS9gHXPMy5/Fem1yq0v0A6W29XqwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf//Z";
+              image.onload = () => {
+                ctx.save();
+                ctx.beginPath();
+                ctx.rect(x, y + offsetY, drawSize, drawSize);
+                ctx.clip();
+
+                // 从图片中心裁剪出一个正方形
+                const imgRatio = image.width / image.height;
+                const cropSize = imgRatio > 1 ? image.height : image.width;
+                const offsetX = (image.width - cropSize) / 2;
+                const offsetYImg = (image.height - cropSize) / 2;
+
+                ctx.drawImage(
+                    image,
+                    offsetX, offsetYImg, cropSize, cropSize, // 源图裁剪区域
+                    x, y + offsetY, drawSize, drawSize       // 目标绘制区域
+                );
+
+                ctx.restore();
+
+                drawnCount++;
+                if (drawnCount === filteredUsers.length) {
+                  // 如果超过最大数量，覆盖整个画布并居中显示 "+n"
+                  if (users.length > maxAvatars) {
+                    ctx.fillStyle = 'rgba(0, 0, 0, 0.2)';
+                    ctx.beginPath();
+                    ctx.rect(0, 0, canvasSize, canvasSize);
+                    ctx.fill();
+
+                    ctx.fillStyle = '#ffffff';
+                    ctx.font = 'bold 40px Arial';
+                    ctx.textAlign = 'center';
+                    ctx.textBaseline = 'middle';
+                    ctx.fillText(`+${users.length}`, canvasSize / 2, canvasSize / 2);
+                  }
+
+                  // 缓存结果并返回
+                  const result = canvas.toDataURL('image/png');
+                  this[cacheKey] = result;
+                  resolve(result); // 异步完成
+                }
+              }
+            };
+          });
+        } catch (error) {
+          console.error('生成聚合头像时发生异常:', error);
+          resolve('/static/common/img/map_icon.png');
+        }
+      });
+    }
+    ,
+    /**
+     * DBSCAN 聚类算法（输出格式与 pointData 一致）
+     * @param points 原始点数组 { latitude, longitude }
+     * @param eps 聚类距离阈值（单位：米）
+     * @returns {{}} 统一格式的 pointData 结构，key 格式为 "x,y"
+     */
+    dbscan(points, eps = 50) {
+
+      function getDistanceInMeters(lat1, lon1, lat2, lon2) {
+        const R = 6371; // 地球半径（公里）
+        const dLat = (lat2 - lat1) * Math.PI / 180;
+        const dLon = (lon2 - lon1) * Math.PI / 180;
+        const a =
+            Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+            Math.cos(lat1 * Math.PI / 180) * Math.cos(lat2 * Math.PI / 180) *
+            Math.sin(dLon / 2) * Math.sin(dLon / 2);
+        const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        const distanceInKm = R * c;
+        const distanceInMeters = distanceInKm * 1000; // 将公里转换为米
+        console.info("🚀 ~ file:index method:getDistanceInMeters line:886 -----", distanceInMeters)
+
+        return parseInt(distanceInMeters) > 100000 ? 100000 : parseInt(distanceInMeters);
+      }
+
+      let deletedPoints = [];
+      for (let key in points) {
+        if (deletedPoints.includes(key)) {
+          continue;
+        }
+        let X = key.split(',')[0]
+        let Y = key.split(',')[1]
+        for (let keyTwo in points) {
+          let innerX = keyTwo.split(',')[0]
+          let innerY = keyTwo.split(',')[1]
+          if (key === keyTwo) {
+            continue
+          }
+          if (Math.abs(X - innerX) <= 1 && Math.abs(Y - innerY) <= 1) {
+            if (getDistanceInMeters(points[key][0].latitude, points[key][0].longitude, points[keyTwo][0].latitude, points[keyTwo][0].longitude) < eps) {
+              points[key] = points[key].concat(points[keyTwo])
+              deletedPoints.push(keyTwo)
+            }
+          }
+        }
+      }
+      for (let key in points) {
+        if (deletedPoints.includes(key)) {
+          delete points[key]
+        }
+      }
+      return points;
+      // ===== 构造统一格式 end =====
+    }
+
+    ,
+    /**
+     * 将聚类结果转为类似 pointData 的结构（"x,y": []）
+     * @param clusters 聚类结果二维数组
+     * @param noise 噪声点
+     * @returns [[]] 合并后的伪格子结构
+     */
+    _generateFakeGrids(clusters, noise) {
+      const result = [...clusters]; // 每个 cluster 单独作为一个格子
+
+      // 如果需要可选地将噪声点也作为一个格子加入
+      if (noise.length > 0) {
+        result.push(noise); // 可选
+      }
+
+      return result;
+    }
+    ,
+    updated() {
+      // console.log("渲染完成");
+    }
+    ,
+    // 当视野发生改变
+    regionchange(e) {
+      // console.log("当视野发生改变");
+      // 视野移动结束再获取数据
+      if (e.type == "begin") return;
+      // 关闭显示的窗口
+      this.showInfo = false
+
+      this.test()
+
+      // let loadDelay = 200;
+      // if (this.load) {
+      // 	// console.log("等待加载");
+      // } else {
+      // 	this.load = true;
+      // 	setTimeout(() => {
+      // 		// this.getList();
+      // 		this.test();
+      // 	}, loadDelay);
+      // }
+    }
+    ,
+    isWechat() {
+      var ua = window.navigator.userAgent.toLowerCase();
+      if (ua.match(/micromessenger/i) == "micromessenger") {
+        // console.log(‘是微信客户端’)
+        return true;
+      } else {
+        // console.log(‘不是微信客户端’)
+        return false;
+      }
+    }
+    ,
+    //在需要定位页面调用
+    getlocation: function (callback) {
+      if (!this.isWechat()) {
+        //console.log('不是微信客户端')
+        return;
+      }
+    }
+    ,
+    //打开位置
+    openlocation: function (data) {
+      if (!this.isWechat()) {
+        //console.log('不是微信客户端')
+        return;
+      }
+      jweixin.ready(function () {
+        jweixin.openLocation({
+          latitude: data.latitude,
+          longitude: data.longitude,
+          name: data.name,
+          address: data.address,
+          scale: 14,
+        });
+      });
+    }
+    ,
+    //定位当前
+    location(state) {
+      var that = this;
+      uni.showLoading({
+        title: '正在加载...',
+        mask: true
+      })
+      if (state && this.isWechat()) {
+        const isiOS = !!navigator.userAgent.match(
+            /\(i[^;]+;( U;)? CPU.+Mac OS X/
+        ); //ios终端
+        // 进行签名的时候  Android 不用使用之前的链接， ios 需要
+        const signLink = isiOS
+            ? window.entryUrl
+            : window.location.href.split("#")[0];
+        //获取当前url然后传递给后台获取授权和签名信息，后台需要解码才能使用
+        // const url =encodeURIComponent(signLink);
+        const url = signLink;
+        const data = {
+          url: url,
+        };
+
+        this.$u.api.GetInfoMation(data).then((res) => {
+          jweixin.config({
+            debug: false,
+            appId: res.appId,
+            timestamp: res.timestamp,
+            nonceStr: res.noncestr,
+            signature: res.signature,
+            jsApiList: [
+              //这里是需要用到的接口名称
+              "getLocation", //获取位置
+              "openLocation", //打开位置
+            ],
+          });
+
+          // jweixin.config 执行失败时调用
+          jweixin.error((err) => {
+            uni.hideLoading();
+            that.location(false);
+            console.log("授权失败，您可能无法使用部分功能", err);
+          });
+          jweixin.ready(function () {
+            jweixin.getLocation({
+              type: "gcj02", // 默认为wgs84的gps坐标，如果要返 回直接给openLocation用的火星坐标，可传入'gcj02'
+              success: (res) => {
+                uni.hideLoading();
+                var resdata = res;
+                // console.log(res,'success');
+                map.moveToLocation({
+                  latitude: resdata.latitude,
+                  longitude: resdata.longitude,
+                });
+                // alert(JSON.stringify(res))
+                that.center.latitude = resdata.latitude; //纬度
+                that.center.longitude = resdata.longitude; //经度
+
+                // 更新坐标
+                var data = {
+                  userId: that.vuex_user.id,
+                  longitude: resdata.longitude + "",
+                  latitude: resdata.latitude + "",
+                };
+                that.$u.api.upPosition(data).then(() => {
+                  that.getList(resdata.latitude, resdata.longitude);
+                  that.test();
+                });
+              },
+              fail: function (res) {
+                uni.hideLoading();
+                // console.log(res, "err");
+              },
+              complete: function (res) {
+                uni.hideLoading();
+                // console.log(res, "is");
+              },
+            });
+          });
+        });
+      } else {
+        uni.getLocation({
+          // type: "wgs84 ",
+          type: "gcj02 ",
+          isHighAccuracy: true,
+          highAccuracyExpireTime: 3000,
+          success: (res) => {
+
+            uni.hideLoading();
+            // console.info("🚀 ~ file:index method:success line:497 -----", res);
+
+            // console.log(res.latitude + "," + res.longitude, "gcj02");
+            map.moveToLocation({
+              latitude: res.latitude,
+              longitude: res.longitude,
+            });
+            this.center.latitude = res.latitude; //纬度
+            this.center.longitude = res.longitude; //经度
+
+            // 更新坐标
+            var data = {
+              userId: this.vuex_user.id,
+              longitude: res.longitude + "",
+              latitude: res.latitude + "",
+            };
+            this.$u.api.upPosition(data).then(() => {
+              this.getList(res.latitude, res.longitude);
+              this.test();
+            });
+          },
+          fail: (err) => {
+            uni.hideLoading();
+            console.log("地理位置获取失败", err);
+          },
+        });
+      }
+    }
+    ,
+
+    testlist() {
+      // this.getList();
+      this.test();
+    }
+    ,
+    // 获取用户列表
+    getList(la = 0, lo = 0) {
+      var arr = [];
+      map.getCenterLocation({
+        success: (res) => {
+          let latitude = res.latitude;
+          let longitude = res.longitude;
+          if (la !== 0) {
+            latitude = la;
+            longitude = lo;
+          }
+
+
+          // console.info("🚀 ~ file:index method:success line:1038 -----", latitude,longitude)
+          this.latitude = latitude;
+          this.longitude = longitude;
+          let data = {
+            userId: this.vuex_user.id,
+            lat: this.center.latitude,
+            lon: this.center.longitude,
+            nort_lat: this.Showip?.northeast?.latitude || 0,
+            nort_lon: this.Showip?.northeast?.longitude || 0,
+            sout_lat: this.Showip?.southwest?.latitude || 0,
+            sout_lon: this.Showip?.southwest?.longitude || 0,
+          };
+          if (this.timeer) {
+            clearTimeout(this.timeer)
+          }
+          this.timeer = setTimeout(() => {
+            this.$u.api.HomeMap(data).then((res) => {
+              if (res) {
+                res.unshift(this.center);
+                // res = res.reverse();
+                this.list = res;
+                // this.test();
+              } else {
+                /* uni.showToast({
+                  title: res.data.msg,
+                  icon: "none",
+                }); */
+              }
+              map.getScale({
+                success: async (ress) => {
+                  this.covers = await this.getFortMatMarkerList(
+                      this.Showip.northeast,
+                      this.Showip.southwest,
+                      ress.scale,
+                      this.list
+                  );
+                  document.querySelectorAll(
+                      "#map .csssprite:nth-child(1)"
+                  )[0].style.border = "none";
+                },
+              });
+            }).catch(() => {
+              this.list = [this.center];
+              map.getScale({
+                success: async (ress) => {
+                  this.covers = await this.getFortMatMarkerList(
+                      this.Showip.northeast,
+                      this.Showip.southwest,
+                      ress.scale,
+                      this.list
+                  );
+                  document.querySelectorAll(
+                      "#map .csssprite:nth-child(1)"
+                  )[0].style.border = "none";
+                },
+              });
+            });
+          }, 500)
+        },
+      });
+    }
+    ,
+    tap() {
+      this.showInfo = false;
+    }
+    ,
+    // 点击获取当前用户信息  注意：<每个 marker 点都必须要有id 不然点击maxker的事件不会触发>
+    getUserDetail(i) {
+      // console.info(
+      //     "🚀 ~ file:index method:getUserDetail line:574 -----",
+      //     i.detail.markerId
+      // );
+
+      //点击中心点时不显示
+      if (i.detail.markerId == 0) return;
+      // 判断是否是聚合点
+      this.detailInfoList = [];
+      if (String(i.detail.markerId).split(".").length > 1) {
+        var pointKey = String(i.detail.markerId).replace(".", ",");
+        pointKey = pointKey.slice(0, pointKey.length - 1);
+        let arr = this.pointDataList[pointKey];
+        let isprovince = "";
+        let iscity = "";
+        // 地址解析 免费 每日10000请求量
+        uni.showLoading({
+          title: "加载中",
+        });
+        this.$jsonp(
+            "https://apis.map.qq.com/ws/geocoder/v1/?key=2OLBZ-OOSRQ-RYZ5A-GMCM2-DJ43O-3QFLS&location=" +
+            arr[0].latitude +
+            "," +
+            arr[0].longitude +
+            "&output=jsonp&get_poi=1"
+        ).then((res) => {
+          if (res.status == 0) {
+            isprovince = res.result.address_component.province;
+            iscity = res.result.address_component.city;
+            for (let i in arr) {
+              arr[i].province = isprovince ? isprovince : "未";
+              arr[i].city = iscity ? iscity : "知";
+            }
+            this.detailInfoList = arr;
+            this.isExpanded = '0vh';
+            this.showPopup = true
+            setTimeout(() => {
+              this.isExpanded = '90vh';
+            }, 10);
+            // this.showList();
+            uni.hideLoading();
+          }
+        });
+      } else {
+
+        // 根据id筛选获取用户信息
+        let a = this.list.filter((item) => {
+
+          return (
+              parseInt((item.latitude - -item.longitude) * 100000) ==
+              i.detail.markerId
+          );
+        })[0];
+
+        if (a.userId == this.detailInfo.userId) {
+          setTimeout(() => {
+            this.showInfo = true;
+            this.showPopup = false
+          }, 100);
+          return;
+        }
+
+        // 地址解析
+        this.$jsonp(
+            "https://apis.map.qq.com/ws/geocoder/v1/?key=2OLBZ-OOSRQ-RYZ5A-GMCM2-DJ43O-3QFLS&location=" +
+            a.latitude +
+            "," +
+            a.longitude +
+            "&output=jsonp&get_poi=1"
+        ).then((res) => {
+          // console.log("解析地址成功", res);
+          // console.log("当前地址：", res.result.address);
+          if (res.status == 0) {
+            a.province = res.result.address_component.province;
+            a.city = res.result.address_component.city;
+          }
+          this.detailInfo = a;
+          setTimeout(() => {
+            this.showInfo = true;
+            this.showPopup = false
+          }, 100);
+        });
+      }
+    }
+    ,
+
+    togglePopup() {
+      this.isExpanded = '90vh';
+    }
+    ,
+    touchStart(e) {
+      // 记录起始触摸点
+      this.touchStartY = e.touches[0].clientY;
+      // 记录起始滚动位置
+      this.startScrollTop = e.currentTarget.scrollTop;
+    }
+    ,
+    touchMove(e) {
+
+      const currentY = e.touches[0].clientY;
+      const diff = this.touchStartY - currentY;
+      const scrollTop = e.currentTarget.scrollTop;
+
+      // 判断是否在内容顶部或底部
+      const isAtTop = scrollTop <= 0;
+      const isAtBottom = scrollTop + e.currentTarget.clientHeight >= e.currentTarget.scrollHeight;
+
+      // 在顶部向下滑动或在底部向上滑动时，阻止默认行为
+      if ((isAtTop && diff < 0) || (isAtBottom && diff > 0)) {
+        e.preventDefault();
+      }
+
+      // 向上滑动超过50px时展开
+      if (diff > 50) {
+        this.isExpanded = '90vh';
+      }
+      // 向下滑动超过50px时收起
+      else if (diff < -50) {
+        if (this.isExpanded == '40vh') {
+          console.log("关闭");
+          this.isExpanded = '0vh';
+          setTimeout(() => {
+            this.showPopup = false
+          }, 100);
+        } else {
+          console.log("收起");
+          this.isExpanded = '40vh';
+        }
+      }
+    }
+    ,
+    touchMoveFn(e) {
+      if (this.timeer) {
+        clearTimeout(this.timeer)
+      }
+      this.timeer = setTimeout(() => {
+        this.touchMove(e)
+      }, 100)
+    }
+    ,
+    touchEnd(e) {
+      // 可以在这里添加滑动结束后的处理逻辑
+    }
+    ,
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.AIdescribe {
+  display: block;
+  font-size: 26rpx;
+  color: rgba(0, 0, 0, 0.4);
+  line-height: 30rpx;
+  text-align: left;
+  margin-top: 20rpx;
+  max-width: 67vw;
+  white-space: break-spaces;
+}
+
+.tags {
+  gap: 10rpx;
+  margin-top: 20rpx;
+}
+
+.h100 {
+  height: 100%
+}
+
+.search-box {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 50%;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  position: absolute;
+  top: 50rpx;
+  left: 50rpx;
+  z-index: 1;
+  box-shadow: 0rpx 10rpx 10rpx -6rpx rgba(0, 0, 0, 0.1),
+  0rpx 16rpx 20rpx 2rpx rgba(0, 0, 0, 0.06),
+  0rpx 6rpx 28rpx 4rpx rgba(0, 0, 0, 0.05);
+}
+
+::v-deep .uni-scroll-view-content {
+  background: #f6f8f9 !important;
+}
+
+::v-deep #map .csssprite {
+  border-radius: 50%;
+  border: 2px solid #358ddf !important;
+  filter: drop-shadow(0px 0px 2px #358ddf);
+  transform: scale(0.8);
+}
+
+::v-deep #map > div > div > div > div > div:nth-last-child(4) > div > div {
+  overflow: initial !important;
+}
+
+
+// ::v-deep #map>div>div>div>div>div:nth-last-child(4)>div>div:nth-child(1)>.csssprite[src=''] {
+// 	border: none !important;
+// }
+.name-work {
+  display: flex;
+  flex-direction: column;
+  padding-left: 20rpx;
+}
+
+.info {
+  position: absolute;
+  right: 0;
+  left: 0;
+  transform: translateY(-125%);
+
+  .section_2 {
+    padding: 0.11rem 0.18rem 0.15rem 0.21rem;
+    background-color: rgb(255, 255, 255);
+    box-shadow: 0px 0px 0.1rem rgba(0, 0, 0, 0.1);
+    border-radius: 0.1rem;
+
+    .text_3 {
+      color: #3CB5FB;
+      font-size: 26rpx;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin-left: 10rpx;
+      vertical-align: middle;
+
+      img {
+        vertical-align: middle;
+        Width: 48rpx;
+      }
+    }
+
+    .group_6 {
+      white-space: nowrap;
+      border-top: 1px solid #F4F6F8;
+      padding-top: 20rpx;
+      margin-top: 20rpx;
+
+      .text_4 {
+        margin-right: 0.1rem;
+        color: rgb(63, 63, 63);
+        font-size: 0.14rem;
+        line-height: 0.16rem;
+        white-space: nowrap;
+      }
+
+      .text_5 {
+        font-size: 28rpx;
+        color: rgba(0, 0, 0, 0.6);
+        line-height: 0.16rem;
+        letter-spacing: 0.014rem;
+        white-space: nowrap;
+      }
+    }
+
+    .group_5 {
+      color: rgb(56, 58, 63);
+      font-size: 0.18rem;
+      line-height: 0.17rem;
+      white-space: nowrap;
+
+      .image_5 {
+        width: 0.44rem;
+        height: 0.44rem;
+        border-radius: 50%;
+      }
+
+      .text_1 {
+        font-size: 30rpx;
+        // margin-left: 0.13rem;
+        //margin-top: 22rpx;
+      }
+    }
+
+    .section_3 {
+      padding: 20rpx 20rpx;
+      color: rgb(255, 255, 255);
+      font-size: 24rpx;
+      white-space: nowrap;
+      background-color: #3cb5fb;
+      border-radius: 0.15rem;
+      height: 56rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: absolute;
+      right: 0;
+      top: 50%;
+      transform: translateY(-50%);
+
+      .image_6 {
+        width: 32rpx;
+        height: 32rpx;
+      }
+
+      .text_2 {
+        margin-left: 0.055rem;
+      }
+    }
+
+    // .text {
+    // 	text-transform: uppercase;
+    // }
+  }
+}
+
+.bottom {
+  position: fixed;
+  z-index: 10;
+  bottom: 0;
+  right: 2%;
+  left: 2%;
+  padding-bottom: 0.48rem;
+
+  .btn {
+    display: flex;
+    justify-content: center;
+    margin-top: 0.22rem;
+  }
+
+  .section_4 {
+    margin-right: 0.025rem;
+    margin-top: 0.17rem;
+    padding: 0.2rem 0.2rem 0.3rem;
+    color: rgb(193, 196, 204);
+    font-size: 0.14rem;
+    line-height: 0.14rem;
+    white-space: nowrap;
+    background-color: rgb(255, 255, 255);
+    box-shadow: 0px 0px 0.03rem rgba(0, 0, 0, 0.1);
+    border-radius: 0.1rem 0.1rem 0 0;
+
+    .search {
+      margin-left: 0.14rem;
+      margin-right: 0.1rem;
+      padding: 0.14rem 0 0.13rem;
+      background-color: rgb(246, 247, 250);
+      border-radius: 0.05rem;
+
+      // .text {
+      // 	text-transform: uppercase;
+      // }
+    }
+  }
+}
+
+.popup-box {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  min-height: 240rpx;
+  box-shadow: 0rpx -14rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
+  border-top-left-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+  transition: all 0.3s ease;
+  z-index: 100;
+}
+
+
+.popup-top {
+  // position: fixed;
+  // top: 0;
+  width: 100%;
+  padding-top: 20rpx;
+  background: #fff;
+  border-top-left-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+  cursor: pointer; // 添加手型光标
+}
+
+.pop-top {
+  width: 88rpx;
+  height: 10rpx;
+  background: #9ea1b9;
+  border-radius: 200rpx;
+  margin: 20rpx auto 0;
+}
+
+.pop-title {
+  padding: 20rpx 32rpx 40rpx;
+  font-weight: 600;
+  font-size: 32rpx;
+  color: #191919;
+  background: #fff;
+}
+
+.content {
+  height: calc(100% - 174rpx) !important;
+  overflow-y: auto;
+  background: #f6f8f9;
+  padding: 30rpx 30rpx 50rpx;
+  // -webkit-overflow-scrolling: touch;
+}
+
+.back-to-location {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  bottom: 180rpx;
+  right: 50rpx;
+  z-index: 1;
+}
+
+::v-deep #map > div:nth-child(1) > div > div:nth-child(1) > div > div:nth-child(2) {
+  z-index: 999999 !important;
+}
+
+::v-deep #map a[title="到腾讯地图查看此区域"] {
+  display: none !important;
+}
+
+.position-relative {
+  position: relative;
+}
+</style>
diff --git a/pages/main/search/search.vue b/pages/main/search/search.vue
new file mode 100644
index 0000000..49d790d
--- /dev/null
+++ b/pages/main/search/search.vue
@@ -0,0 +1,736 @@
+<template>
+	<view>
+		<u-navbar :is-back="true" title="" :custom-back="router">
+			<view class="slot-wrap flex-row search">
+				<!-- <u-input style='flex:0;' v-model="searchType" placeholder='' type="select" @click="show = true" />
+				<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet> -->
+				<u-search v-model='searchText' :input-style="searchStyle" search-icon="" @custom="search" :search='search'
+					:show-action="false" >
+				</u-search>
+				<u-button style="width: 120rpx;height: 60rpx;border-radius: 50rpx;margin-left: 20rpx;" type="primary" @click="toSearch">搜索</u-button>
+			</view>
+		</u-navbar>
+		<view class="flex-col group_1" v-if='state==0'>
+			<view class="flex-col section_1">
+				<text class="text_1 text_2">推荐搜索</text>
+				<view class="justify-left group_2" style="margin-top:0.2rem;">
+					<view class="flex-row" style='flex-wrap:wrap;'>
+						<text class="text_1 text_5" @click='search(item)' v-for="(item,index) in keyword.split(',')"
+							:key='index'>{{item}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="flex-col section_2">
+				<text class="text_1 text_6">可能认识的人</text>
+				<view class="flex-col group_4">
+					<scroll-view scroll-x="true" class="flex-row equal-division">
+						<view class="flex-col items-center equal-division-item" @click="toDetil(item.userId)" v-for="(item, index) in mayKnowList"
+							:key="index">
+							<u-avatar :src="$u.http.config.imgUrl+item.imageUrl" class="image_2" ></u-avatar>
+							<text class="text_1 text_7">{{item.name.length > 3? item.name.slice(0, 3) + "...": item.name}}</text>
+							<!-- <text class="text_1 text_8">{{item.workFieldName}}</text> -->
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<view class="userList" v-if='state==1'>
+			<view class="flex-col group_2">
+				<view class="flex-col list">
+					<template v-for="(v, i) in searchList">
+						<view class="list-item flex-row group_5" :key="i" @click="toDetil(v.userId)">
+							<u-avatar class="image_1" size="0.4rem" mode="circle"
+								:src="$u.http.config.imgUrl+v.imageUrl">
+							</u-avatar>
+							<view class="right-section justify-between view_4">
+								<view class="top-group flex-col view_5">
+									<view class="text_2 flex-row view_6">
+										<text class="text_11">{{v.name}}</text>
+									</view>
+									<text class="text_4 text_15">{{v.workFieldName}}</text>
+								</view>
+								<text class="text_6 text_16">{{(v.distance>1000?(v.distance/1000).toFixed(1)+'KM':v.distance+'M')}}</text>
+							</view>
+						</view>
+					</template>
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				searchText:'',//搜索内容
+				state: 0,
+				searchType: '姓名',
+				show: false,
+				searchStyle: {
+					width: "100%",
+				},
+				keyword: '',
+				actionSheetList: [{
+						text: '姓名'
+					},
+					{
+						text: '工作'
+					},
+				],
+				nearbyList: [],
+				searchList: [],
+				mayKnowList:[],
+				fromPage:''
+			};
+		},
+		onLoad(e) {
+			this.getSearchInfo()
+			if(e.type){
+				this.fromPage = e.type
+			}
+			if(e.word){
+				this.search(e.word)
+			}
+		},
+		methods: {
+			// // 点击actionSheet回调
+			// actionSheetCallback(index) {
+			// 	this.searchType = this.actionSheetList[index].text;
+			// },
+			toDetil(id){
+				this.$u.route({url:'/pages/AlumniCircle/userDetail/userDetail?id='+id+'&type=3&word='+this.searchText})
+			},
+			toSearch(){
+				this.search(this.searchText)
+			},
+			// 搜索
+			search(value) {
+				this.searchText=value
+				if (!value) {
+					this.$u.toast('请输入搜索词')
+					return;
+				}
+				const data = {
+					userId: this.vuex_user.id,
+					key: value
+				}
+				this.$u.api.getSearch(data).then(res => {
+					if(res.length){
+					this.searchList = res;
+					this.state = 1
+					}else{
+						this.$u.toast('搜索结果为空')
+					}
+				})
+			},
+			router(){
+				if(this.searchText){
+					this.searchText=''
+					this.state = 0
+				}
+				else{
+					if(this.fromPage == "home"){
+						uni.switchTab({
+							url:'/pages/home/home/home'
+						})
+					}else{
+						uni.switchTab({
+							url:'/pages/main/index/index'
+						})
+					}
+				}
+			},
+			// 获取搜索界面数据
+			getSearchInfo() {
+
+				this.$u.api.getPosition().then((res) => {
+					const data = {
+						userId: res.userId,
+						lat: res.latitude,
+						lon: res.longitude
+					}
+					this.$u.api.SearchInfo(data).then(ress => {
+						this.keyword = ress.keyword;
+						this.nearbyList = ress.nearbyList
+						this.mayKnowList = ress.mayKnowList
+						
+					})
+				})
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .u-navbar-placeholder,
+.u-navbar-inner {
+	height: 100rpx !important;
+	padding: 20rpx 0rpx !important;
+}
+	::v-deep .u-avatar__sex {
+		width: 0.1rem !important;
+		height: 0.1rem !important;
+		border: none;
+	}
+
+	::v-deep .u-slot-content {
+		display: block;
+	}
+
+	.search ::v-deep {
+		// .u-content {
+		// 	border-bottom-left-radius: 0 !important;
+		// 	border-top-left-radius: 0 !important;
+		// 	padding:0,
+		// }
+		padding: 20rpx;
+
+		.u-input__input {
+			width: 0.25rem;
+			min-height: 0.32rem !important;
+			padding-left: 0.1rem;
+			font-size: 0.12rem;
+		}
+
+		.u-input {
+			background-color: rgb(242, 242, 242);
+			border-radius: 50px;
+			border-bottom-right-radius: 0 !important;
+			border-top-right-radius: 0 !important;
+			padding-left: 0.05rem
+		}
+	}
+
+	.group_1 {
+		padding: 0.14rem 0.15rem 0.2rem;
+		flex: 1 1 auto;
+		overflow-y: auto;
+
+		.section_1 {
+			padding: 0.2rem 0.17rem;
+			background-color: rgb(255, 255, 255);
+			border-radius: 0.1rem;
+
+			.text_2 {
+				color: rgb(56, 58, 63);
+				font-size: 0.16rem;
+				line-height: 0.17rem;
+				white-space: nowrap;
+			}
+
+			.group_2 {
+				margin-top: 0.23rem;
+				padding: 0 0.015rem;
+				color: rgb(63, 63, 63);
+				font-size: 0.14rem;
+				line-height: 0.13rem;
+				white-space: nowrap;
+				position: relative;
+
+				.text_3 {
+					text-transform: uppercase;
+					position: absolute;
+					left: 0.015rem;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+
+				.text_5 {
+          border:1px solid rgb(163, 161, 161);
+          border-radius: 0.05rem;
+          padding-left:0.1rem;
+          padding-right:0.1rem;
+          padding-top:0.02rem;
+          padding-bottom:0.05rem;
+					margin-right: 0.1rem;
+					margin-bottom: 0.08rem;
+				}
+			}
+		}
+
+		.section_2 {
+			margin-top: 0.18rem;
+			padding: 0.2rem 0.17rem;
+			background-color: rgb(255, 255, 255);
+			border-radius: 0.1rem;
+
+			.text_6 {
+				// margin-left: 0.17rem;
+				color: rgb(56, 58, 63);
+				font-size: 0.16rem;
+				line-height: 0.17rem;
+				white-space: nowrap;
+			}
+
+			.group_4 {
+				margin-top: 0.15rem;
+
+				// padding: 0.8rem 0 0.01rem;
+				// position: relative;
+				// .section_3 {
+				//   margin-left: 0.17rem;
+				//   margin-right: 0.2rem;
+				//   background-image: url("https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/621c59e162a7d90011002985/16460344151483836600.png");
+				//   background-size: 100% 100%;
+				//   background-repeat: no-repeat;
+				//   height: 0.2rem;
+				// }
+				.equal-division {
+					top: 0;
+					right: 0;
+					bottom: 0;
+					left: 0;
+					width: auto;
+
+					::v-deep .uni-scroll-view-content {
+						display: flex;
+						white-space: nowrap;
+					}
+
+					// position: absolute;
+					.equal-division-item {
+						padding: 0.065rem 0 0.05rem;
+						margin-right: 6%;
+						.text_7 {
+							margin-top: 0.095rem;
+							color: rgb(63, 63, 63);
+							font-size: 0.14rem;
+							line-height: 0.13rem;
+							white-space: nowrap;
+						}
+
+						.text_8 {
+							margin-top: 0.06rem;
+							color: rgb(46, 155, 255);
+							font-size: 0.1rem;
+							line-height: 0.1rem;
+							white-space: nowrap;
+							background: #eaf5ff;
+							border-radius: 0.2rem;
+							padding: 0.05rem 0.1rem;
+						}
+					}
+
+					.equal-division-item_1 {
+						padding: 0.065rem 0 0.055rem;
+						flex: 1 1 0.66rem;
+
+						.text_9 {
+							margin-top: 0.095rem;
+							color: rgb(63, 63, 63);
+							font-size: 0.14rem;
+							line-height: 0.13rem;
+							white-space: nowrap;
+						}
+
+						.text_10 {
+							margin-top: 0.15rem;
+							color: rgb(46, 155, 255);
+							font-size: 0.1rem;
+							line-height: 0.1rem;
+							white-space: nowrap;
+						}
+					}
+
+					.equal-division-item_2 {
+						padding: 0.065rem 0.035rem 0.06rem 0.14rem;
+						flex: 1 1 0.66rem;
+
+						.text_11 {
+							margin-top: 0.095rem;
+							align-self: center;
+							color: rgb(63, 63, 63);
+							font-size: 0.14rem;
+							line-height: 0.13rem;
+							white-space: nowrap;
+						}
+
+						.text_12 {
+							margin-top: 0.15rem;
+							align-self: center;
+							color: rgb(46, 155, 255);
+							font-size: 0.1rem;
+							line-height: 0.095rem;
+							white-space: nowrap;
+						}
+					}
+
+					.equal-division-item_3 {
+						padding: 0.05rem 0.065rem 0.06rem 0.14rem;
+						flex: 1 1 0.66rem;
+
+						.text_13 {
+							margin-top: 0.11rem;
+							align-self: flex-end;
+							color: rgb(63, 63, 63);
+							font-size: 0.14rem;
+							line-height: 0.13rem;
+							white-space: nowrap;
+						}
+
+						.text_14 {
+							margin-right: 0.07rem;
+							margin-top: 0.15rem;
+							align-self: flex-end;
+							color: rgb(46, 155, 255);
+							font-size: 0.1rem;
+							line-height: 0.095rem;
+							white-space: nowrap;
+						}
+					}
+
+					.equal-division-item_4 {
+						padding: 0.05rem 0 0.06rem;
+						flex: 1 1 0.66rem;
+
+						.text_15 {
+							margin-top: 0.12rem;
+							color: rgb(63, 63, 63);
+							font-size: 0.14rem;
+							line-height: 0.13rem;
+							white-space: nowrap;
+						}
+
+						.text_16 {
+							margin-top: 0.15rem;
+							color: rgb(46, 155, 255);
+							font-size: 0.1rem;
+							line-height: 0.095rem;
+							white-space: nowrap;
+						}
+					}
+
+					.image_2 {
+						border-radius: 50%;
+						width: 0.4rem;
+						height: 0.4rem;
+						box-shadow: 0 0 1px #6f6f6f;
+					}
+				}
+			}
+		}
+
+		.section_4 {
+			margin-top: 0.14rem;
+			padding: 0.14rem 0.21rem 0.25rem;
+			background-color: rgb(255, 255, 255);
+			border-radius: 0.1rem;
+
+			.text_17 {
+				color: rgb(56, 58, 63);
+				font-size: 0.18rem;
+				line-height: 0.15rem;
+				white-space: nowrap;
+			}
+
+			.group_5 {
+				margin-top: 0.22rem;
+				padding: 0 0.28rem;
+
+				.section_5 {
+					margin-top: 0.04rem;
+					padding: 0.1rem 0.015rem 0.14rem 0.16rem;
+					color: rgb(255, 255, 255);
+					font-size: 0.09rem;
+					line-height: 0.075rem;
+					white-space: nowrap;
+					background-image: url("https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/621c59e162a7d90011002985/16480042463399723422.png");
+					background-size: 100% 100%;
+					background-repeat: no-repeat;
+					width: 1.16rem;
+					height: 1.16rem;
+
+					.group_7 {
+						margin-top: 0.29rem;
+
+						.text_22 {
+							margin-top: 0.07rem;
+							align-self: center;
+						}
+					}
+
+					.text_18 {
+						align-self: center;
+					}
+
+					.text_19 {
+						margin-top: 0.1rem;
+					}
+
+					.text_20 {
+						margin-top: 0.07rem;
+						align-self: flex-end;
+					}
+				}
+
+				.group_8 {
+					margin-bottom: 0.035rem;
+					width: 0.96rem;
+
+					.text_23 {
+						color: rgb(56, 58, 63);
+						font-size: 0.15rem;
+						line-height: 0.15rem;
+						white-space: nowrap;
+					}
+
+					.group_9 {
+						color: rgb(56, 58, 63);
+						font-size: 0.13rem;
+						line-height: 0.15rem;
+						white-space: nowrap;
+						padding: 0 0.025rem;
+
+						.section_6 {
+							margin: 0.025rem 0 0.02rem;
+							background-color: rgb(255, 190, 11);
+							width: 0.1rem;
+							height: 0.1rem;
+						}
+
+						.text_24 {
+							margin-left: 0.1rem;
+						}
+
+						.section_7 {
+							margin: 0.015rem 0 0.03rem;
+							background-color: rgb(251, 86, 7);
+							width: 0.1rem;
+							height: 0.1rem;
+						}
+
+						.text_25 {
+							margin-left: 0.095rem;
+						}
+
+						.section_8 {
+							margin: 0.025rem 0 0.02rem;
+							background-color: rgb(131, 56, 236);
+							width: 0.1rem;
+							height: 0.1rem;
+						}
+
+						.text_26 {
+							margin-left: 0.095rem;
+						}
+
+						.section_9 {
+							margin: 0.015rem 0 0.03rem;
+							background-color: rgb(58, 134, 255);
+							width: 0.1rem;
+							height: 0.1rem;
+						}
+
+						.text_27 {
+							margin-left: 0.1rem;
+						}
+
+						.section_10 {
+							margin: 0.015rem 0 0.03rem;
+							background-color: rgb(83, 207, 142);
+							width: 0.1rem;
+							height: 0.1rem;
+						}
+
+						.text_28 {
+							margin-left: 0.095rem;
+						}
+					}
+
+					.view {
+						margin-top: 0.1rem;
+					}
+
+					.view_1 {
+						margin-top: 0.045rem;
+					}
+
+					.view_2 {
+						margin-top: 0.03rem;
+					}
+
+					.view_3 {
+						margin-top: 0.045rem;
+					}
+
+					.view_4 {
+						margin-top: 0.035rem;
+					}
+				}
+			}
+		}
+
+		.text_1 {
+			text-transform: uppercase;
+		}
+	}
+
+	.userList {
+		background: #fff;
+
+		.list-item {
+			padding-left: 0.2rem;
+		}
+
+		.image_1 {
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+			border-radius: 50%;
+			box-shadow: 0 0 1px #6f6f6f;
+		}
+
+		.right-section {
+			margin-left: 0.15rem;
+			padding: 0.14rem 0 0.18rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			height: 0.66rem;
+		}
+
+		.top-group {
+			margin-right: 0.1rem;
+		}
+
+		.text_6 {
+			margin-top: 0.09rem;
+			color: rgb(180, 182, 189);
+			font-size: 0.12rem;
+			line-height: 0.12rem;
+			letter-spacing: 0.012rem;
+			white-space: nowrap;
+		}
+
+		.text_2 {
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+
+		.text_4 {
+			margin-bottom: 0.05rem;
+			color: rgb(193, 196, 204);
+			font-size: 0.12rem;
+			line-height: 0.095rem;
+			letter-spacing: 0.012rem;
+			white-space: nowrap;
+		}
+
+		.text_11 {
+			margin-bottom: 0.03rem;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+
+		.right-text-wrapper {
+			padding: 0.035rem 0.08rem;
+			color: rgb(115, 129, 255);
+			margin-left: 0.1rem;
+			font-size: 0.11rem;
+			line-height: 0.11rem;
+			letter-spacing: 0.011rem;
+			white-space: nowrap;
+			background-color: rgba(115, 129, 255, 0.1);
+			border-radius: 0.09rem;
+			height: 0.18rem;
+		}
+
+		.text_13 {
+			margin-right: 0.03rem;
+		}
+
+		//   .group_2 {
+		//     padding-bottom: 0.15rem;
+		//     flex: 1 1 auto;
+		//     overflow-y: auto;
+		//   }
+
+		.group_4 {
+			padding: 0 0.01rem;
+			padding-left: 0.2rem;
+		}
+
+		.group_5 {
+			padding-left: 0.2rem;
+			margin-top: 0.015rem;
+		}
+
+		.group_4:active,
+		.group_5:active {
+			background: #efefef;
+		}
+
+		.group_8 {
+			padding-left: initial;
+		}
+
+		.view_2 {
+			margin-left: 0.11rem;
+			padding: 0.18rem 0.035rem 0.14rem;
+			height: 0.67rem;
+			margin-right: 0.03rem;
+		}
+
+		.view_4 {
+			margin-left: 0.16rem;
+			padding: 0.15rem 0 0.14rem;
+			height: 0.67rem;
+		}
+
+		.view_3 {
+			margin-right: initial;
+		}
+
+		.view_5 {
+			margin-right: initial;
+		}
+
+		.text_16 {
+			margin-top: 0.07rem;
+			color: rgb(193, 196, 204);
+			line-height: 0.095rem;
+			margin-right: 0.095rem;
+		}
+
+		.text_28 {
+			margin-top: initial;
+			position: absolute;
+			left: 0;
+			bottom: 0.17rem;
+		}
+
+		.text_8 {
+			line-height: 0.14rem;
+		}
+
+		.text_9 {
+			margin-right: 0.025rem;
+		}
+
+		.view_6 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+		}
+
+		.text_15 {
+			margin-bottom: initial;
+			color: rgb(180, 182, 189);
+			line-height: 0.12rem;
+			margin-top: 0.08rem;
+		}
+
+		.view_19 {
+			margin-left: 0.045rem;
+		}
+	}
+</style>
diff --git a/pages/message/adminList/adminList.vue b/pages/message/adminList/adminList.vue
new file mode 100644
index 0000000..4746800
--- /dev/null
+++ b/pages/message/adminList/adminList.vue
@@ -0,0 +1,234 @@
+<template>
+	<view>
+		<u-navbar title="管理列表" :border-bottom="false"></u-navbar>
+		<scroll-view scroll-y="true" class="scroll">
+			<view class="flex-col list" v-if='list.length'>
+				<view class="flex-row list_item" v-for="(item, i) in list" @click="GoChat(item)" :key="i">
+					<u-avatar class="image" :show-sex="vuex_msgList.indexOf(item.fromUserId+'admin,')>=0" sex-icon=""
+						sex-bg-color="red" :src="$u.http.config.imgUrl+item.fromUserHead"></u-avatar>
+					<view class="right-section flex-col">
+						<view class="top-group justify-between view_1">
+							<view class="flex-row">
+								<text class="text_1">{{item.fromUserName}}</text>
+								<view class="right-text-wrapper flex-col items-end">
+									<text class="text_3">{{item.schoolName}}</text>
+								</view>
+							</view>
+							<text
+								v-if='new Date(item.sendDate) - 0 + (3600000*24)> new Date()&&new Date(item.sendDate).getDate()==new Date().getDate()'
+								class="text_5">{{ item.sendDate.slice(10,16)}}</text>
+							<text v-else class="text_5">{{ item.sendDate.slice(0,10)}}</text>
+						</view>
+						<view class="bottom-group justify-between">
+							<text class="text_7">{{item.message}}</text>
+							<text class="text_9" v-if="item.messageState == 0">未读</text>
+							<text class="text_9" v-if="item.messageState == 1">已读</text>
+							<text class="text_10" v-if="item.messageState == 2">待回复</text>
+							<text class="text_10" v-if="item.messageState == 3">回复中...</text>
+							<text class="text_10" v-if="item.messageState == 4">已回复</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else style='padding-top:30vh'>
+				<!-- <u-empty text="暂无消息列表" mode="message"></u-empty> -->
+				<no-data text="暂无消息列表"></no-data>
+			</view>
+		</scroll-view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+import NoData from 'components/NoData.vue'
+	export default {
+		components: {
+			NoData
+		},
+		data() {
+			return {
+				list: [],
+			};
+		},
+		onLoad() {},
+		onShow() {
+			this.getList()
+		},
+		methods: {
+			//   去聊天
+			GoChat(data) {
+				//管理员聊天绑定
+				this.$u.api.toBind({
+					manageUser: this.vuex_user.id,
+					lockUser: data.fromUserId
+				}).then(res => {
+					uni.navigateTo({
+						url: '../dialogBox/dialogBox?id=admin' + '&shoolid=' + data.schoolId + '&fromid=' + data
+							.fromUserId
+					});
+				}).catch(err=>{
+					/* uni.showToast({
+						title: '已有老师回复',
+						duration: 2000,
+						icon:'none'
+					}); */
+					this.$refs.uToast.show({
+						title: '已有老师回复',
+						type: 'warning',
+					});
+
+					
+				})
+				
+			},
+			getList() {
+				this.$u.api.getAdminList().then(res => {
+					this.list = res
+				})
+			},
+			//返回上一级
+			router() {
+				uni.switchTab({
+					url: '../../message/msgList/msgList'
+				})
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-avatar__sex {
+		width: 0.1rem !important;
+		height: 0.1rem !important;
+		border: none;
+	}
+
+	.scroll {
+		background-color: rgb(246, 247, 250);
+		width: 100%;
+		height: calc(100vh - 0.44rem);
+	}
+
+	.list_item {
+		padding-left: 0.2rem;
+		background: #fff;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		border-bottom: 1px solid rgb(234, 234, 234);
+	}
+
+	.image {
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+		border-radius: 50%;
+	}
+
+	.right-section {
+		margin-left: 0.14rem;
+		padding: 0.13rem 0.015rem 0.15rem;
+		flex: 1 1 auto;
+		height: 0.66rem;
+
+	}
+
+	.list_item:last-child .right-section {
+		border: none;
+	}
+
+	.top-group {
+		margin-top: 0.09rem;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.bottom-group {
+		margin-top: 0.05rem;
+	}
+
+	.text_5 {
+		text-align: right;
+		margin-right: 0.1rem;
+		margin-top: 0.02rem;
+		color: rgb(193, 196, 204);
+		font-size: 0.12rem;
+		line-height: 0.095rem;
+		letter-spacing: 0.012rem;
+		white-space: nowrap;
+		min-width: 0.5rem;
+	}
+
+	.text_7 {
+		margin-top: 0.035rem;
+		color: rgb(177, 179, 182);
+		font-size: 0.12rem;
+		line-height: 0.12rem;
+		letter-spacing: 0.012rem;
+		white-space: nowrap;
+		text-align: right;
+	}
+
+	.text_9 {
+		margin-right: 0.085rem;
+		margin-bottom: 0.035rem;
+		color: rgb(46, 155, 255);
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		min-width: 0.5rem;
+		text-align: right;
+	}
+
+	.text_10 {
+		color: rgb(177, 179, 182);
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		min-width: 0.5rem;
+		text-align: right;
+		margin-right: 0.1rem;
+		margin-top: 0.035rem;
+
+
+	}
+
+	.text_1 {
+		margin: 0.02rem 0;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+		max-width: 0.65rem;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.right-text-wrapper {
+		margin-left: 0.045rem;
+		padding: 0.035rem 0.08rem;
+		color: rgb(115, 129, 255);
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		background-color: rgba(115, 129, 255, 0.1);
+		border-radius: 0.09rem;
+		height: 0.18rem;
+	}
+
+	.text_3 {
+		margin-right: 0.03rem;
+	}
+
+	.list {
+		padding-top: 0.01rem;
+	}
+
+	.view_1 {
+		margin-top: initial;
+		width: initial;
+		height: initial;
+	}
+</style>
diff --git a/pages/message/attentionList/attentionList.vue b/pages/message/attentionList/attentionList.vue
new file mode 100644
index 0000000..8d7f412
--- /dev/null
+++ b/pages/message/attentionList/attentionList.vue
@@ -0,0 +1,673 @@
+<template>
+  <view>
+    <u-navbar back-text="" title="新增关注"></u-navbar>
+    <scroll-view scroll-y="true" class="scroll">
+      <view class="guanzhu">
+        <view class="flex-col renzheng" v-if="!vuex_user.isAttestationXY&& false">
+          <view class="flex-col section_4">
+            <view class="flex-row section_5">
+              <text class="text_3">待认证，请先完成认证~</text>
+              <text class="text_4" @click="onAuto">去认证 >></text>
+            </view>
+          </view>
+          <view class="flex-col group_3">
+            <view class="flex-col">
+              <image src="/static/common/img/16535374500948048054.png" class="image_1" />
+            </view>
+            <text class="text_5">暂无数据，请尽快认证补充资料~</text>
+          </view>
+        </view>
+        <view class="flex-col group_2" v-else>
+          <view class="flex-col list">
+            <view class="list-item flex-row group_3" v-for="(item, index) in UserFollowList" :key='index'
+              @click='toDetail(item.carewUserId, item.userRole, item.carewUserHead)'>
+              <u-avatar :src="$u.http.config.imgUrl + item.carewUserHead" class="text_3 image_1"></u-avatar>
+              <view class="bottom-text-wrapper justify-between view_1">
+                <view class="">
+                  <text class="text_5 text_7"><text>{{ item.carewUserName }}</text><text>{{
+                    "(" + item.carewName +
+                      ")" }}</text></text>
+                  <view class="center-text-wrapper flex-col items-end">
+                    <text class="text_8">{{ item.school }}</text>
+                  </view>
+                </view>
+                <view v-if='item.carewType == 2 && item.carewName != "管理员"'
+                  class="right-text-wrapper flex-col items-center">
+                  <text class="text_10">互相关注</text>
+                </view>
+                <view v-if='item.carewType == 1 && item.carewName != "管理员"'
+                  class="right-text-wrapper flex-col items-center view_21">
+                  <text class="text_10">已关注</text>
+                </view>
+              </view>
+            </view>
+            <view v-if="!UserFollowList.length"
+              style="margin-top:20vh;display: flex;justify-content: center;align-items: center;flex-direction: column;">
+              <image src="/static/common/img/empty.png" class="image" />
+              <view style="color:grey;margin-top: -5vh;">暂无关注</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import noData from '@/components/NoData.vue';
+export default {
+  components: {
+    noData
+  },
+  data() {
+    return {
+      list: [],
+      UserFollowList: [],
+    };
+  },
+  onLoad() {
+    // this.getList()
+    //接收系统消息
+    this.$connection.on("SystemMessage", (title, content, time) => {
+      if (this.route.indexOf('sysList') >= 0) {
+        this.list.unshift({
+          messageDate: time,
+          title: title,
+          message: content
+        })
+      }
+    });
+  },
+  onShow() {
+    this.FollowList()
+
+    if (this.vuex_msgList) {
+      var msgList = this.vuex_msgList;
+      msgList = msgList.replace('SystemMessage,', '')
+      this.$u.vuex('vuex_msgList', msgList)
+      if (!msgList) {
+        var tab = this.vuex_tabbar;
+        tab[1].isDot = false;
+        this.$u.vuex('vuex_tabbar', tab);
+      }
+    }
+  },
+  methods: {
+    FollowList() {
+			this.$u.api.getFollowList().then(res => {
+
+				this.UserFollowList = res
+			})
+		},
+    toDetail(id, role, head) {
+			if (role == 0) {
+				this.$u.route({
+					url: '/pages/AlumniCircle/userDetail/userDetail?id=' + id + '&type=0'
+				})
+			} else {
+				uni.navigateTo({
+					url: "../dialogBox/dialogBox?id=" + id + '&chatType=1&type=0&head=' + head,
+				});
+			}
+		},
+    getList() {
+      this.$u.api.getSysList().then(res => {
+        this.list = res
+      })
+    },
+   
+    //返回上一级
+    router() {
+      uni.switchTab({
+        url: '../../message/msgList/msgList'
+      })
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.scroll {
+//   background-color: rgb(246, 247, 250);
+  background-color: #fff;
+  width: 100%;
+  height: calc(100vh - 0.44rem);
+}
+
+.list-item {
+  margin-top: 0.1rem;
+  padding: 20rpx;
+  background-color: rgb(255, 255, 255);
+  border-radius: 20rpx;
+}
+
+.items-title {
+  display: flex;
+  padding-bottom: 20rpx;
+  margin-bottom: 20rpx;
+  border-bottom: 2rpx solid #F6F8F9;
+
+  image {
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 50%;
+  }
+
+  .title-time {
+    margin-left: 0.1rem;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    padding: 5rpx 0;
+    // align-items: flex-start;
+  }
+}
+
+.title-text {
+  font-weight: 600;
+  font-size: 28rpx;
+  color: rgba(0, 0, 0, 0.9);
+}
+
+.text_1 {
+  // align-self: center;
+  color: rgb(193, 196, 204);
+  font-size: 0.12rem;
+  line-height: 0.095rem;
+  // letter-spacing: 0.012rem;
+  white-space: nowrap;
+}
+
+.bottom-section {
+  padding-left: 10rpx;
+}
+
+.text_3 {
+  color: rgb(2, 2, 2);
+  font-size: 28rpx;
+  line-height: 0.16rem;
+  // letter-spacing: 0.018rem;
+  white-space: nowrap;
+}
+
+.text_5 {
+  margin-left: 0.015rem;
+  margin-top: 0.1rem;
+  color: #908a8a;
+  font-size: 28rpx;
+  line-height: 1.5;
+  // letter-spacing: 0.01rem;
+  // text-indent: 0.3rem;
+}
+
+.text_6 {
+  margin-top: 0.1rem;
+  font-size: 0.16rem;
+  line-height: 0.16rem;
+  letter-spacing: 0.01rem;
+
+  text {
+    margin-left: 0.015rem;
+    text-indent: 0.3rem;
+    display: block;
+    color: #908a8a;
+    font-size: 0.14rem;
+    margin-top: 0.1rem;
+  }
+}
+
+.list {
+  padding: 0rem 0.15rem;
+  flex: 1 1 auto;
+  overflow-y: auto;
+}
+.guanzhu {
+	.list-item {
+		padding: 0.14rem 0 0.1rem;
+		align-self: flex-end;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		width: 3.02rem;
+		position: relative;
+	}
+
+	.text_3 {
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.bottom-text-wrapper {
+		margin-top: 0.1rem;
+		padding: 0.035rem 0;
+		// color: rgb(115, 129, 255);
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		// background-color: rgba(115, 129, 255, 0.1);
+		border-radius: 0.09rem;
+		color: #3CB5FB;
+		background-color: rgba(60,181,251,0.1);
+	}
+
+	.text_5 {
+		margin-left: 0.1rem;
+		margin-right: 0.03rem;
+	}
+
+	.center-text-wrapper {
+		padding: 0.035rem 0.08rem;
+		color: #3CB5FB;
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		background-color: rgba(60,181,251,0.1);
+		border-radius: 0.09rem;
+		display: inline-block;
+		margin-top: 16rpx;
+	}
+
+	.right-text-wrapper {
+		// margin-right: 0.06rem;
+		// margin-top: 0.03rem;
+		// margin-left: 0.06rem;
+		// padding: 0.085rem 0.08rem;
+		color: #3CB5FB;
+		font-size: 24rpx;
+		line-height: 58rpx;
+		white-space: nowrap;
+		// background-color: rgb(46, 155, 255);
+		border-radius: 0.15rem;
+    	border: 2rpx #3CB5FB solid;
+		width: 120rpx;
+		height: 64rpx;
+		position: relative;
+	}
+
+	.text_8 {
+		margin-right: 0.03rem;
+	}
+
+	.text_10 {
+		text-transform: uppercase;
+	}
+
+	.text_12 {
+		margin-left: 0.05rem;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.text_14 {
+		margin-left: 0.1rem;
+		margin-right: 0.03rem;
+	}
+
+	.group_2 {
+		// padding: 0.11rem 0 4.94rem;
+		// flex: 1 1 auto;
+		// overflow-y: auto;
+		position: relative;
+	}
+
+	.text-wrapper {
+		// margin-left: 0.17rem;
+		padding: 0.11rem 0 0.12rem;
+		color: rgb(255, 255, 255);
+		font-size: 0.18rem;
+		line-height: 0.17rem;
+		letter-spacing: 0.018rem;
+		white-space: nowrap;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		width: 0.4rem;
+		height: 0.4rem;
+		margin-top: 0.08rem;
+		background: #6574fc;
+		border-radius: 50%;
+
+		text {
+			display: inline-block;
+			width: 100%;
+			text-align: center;
+		}
+	}
+
+	.list {}
+
+	.text_2 {
+		color: #fff;
+	}
+
+	.group_3 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+		// box-shadow: 0px 0.005rem #eaeaea;
+		// padding-left: 0.2rem;
+	}
+
+	.group_4 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+		margin-top: 0.015rem;
+	}
+
+	.group_5 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_6 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_7 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_8 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_9 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.image_1 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		width: 0.4rem;
+		height: 0.4rem;
+		border-radius: 50%;
+		overflow: hidden;
+		// margin-top: 0.12rem;
+		margin-top: 26rpx;
+	}
+
+	.view_1 {
+		margin-top: initial;
+		// padding: 0.1rem 0;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.08rem;
+		margin-right: 0.04rem;
+		flex: 1 1 auto;
+		position: relative;
+		align-items: center;
+	}
+
+	.image_2 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_4 {
+		margin-top: initial;
+		padding: 0.14rem 0 0.1rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.12rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+	}
+
+	.image_3 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_8 {
+		margin-top: initial;
+		padding: 0.15rem 0 0.14rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.13rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+	}
+
+	.image_4 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_12 {
+		margin-top: initial;
+		padding: 0.17rem 0 0.08rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.12rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+	}
+
+	.image_5 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_16 {
+		margin-top: initial;
+		padding: 0.15rem 0 0.11rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.16rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		height: 0.67rem;
+	}
+
+	.image_6 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_19 {
+		margin-top: initial;
+		padding: 0.18rem 0 0.18rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.16rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		height: 0.67rem;
+		position: relative;
+
+	}
+
+	.text_7 {
+		margin-left: initial;
+		margin-right: initial;
+		color: rgb(2, 2, 2);
+		font-size: 28rpx;
+		line-height: 0.14rem;
+		// letter-spacing: 0.015rem;
+		white-space: nowrap;
+		display: block;
+		font-weight: bold;
+
+		text:nth-child(1) {
+			display: inline-block;
+			white-space: nowrap;
+			max-width: 0.9rem;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			vertical-align: bottom;
+		}
+	}
+
+	.text_26 {
+		margin-left: initial;
+		margin-right: initial;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.view_20 {
+		left: -0.03rem;
+		bottom: 0.075rem;
+	}
+
+	.view_21 {
+		// margin-right: 0.06rem;
+		// margin-top: initial;
+		// padding: 0.09rem 0 0.06rem;
+		color: rgb(73, 76, 87);
+		background-color: initial;
+		border: solid 0.01rem rgb(185, 185, 185);
+	}
+}
+
+.renzheng {
+	padding-bottom: 0rem;
+
+	.section_4 {
+		padding: 0.33rem 0 0.34rem;
+		background-color: rgb(255, 255, 255);
+
+		.section_5 {
+			margin-left: 0.18rem;
+			margin-right: 0.24rem;
+			padding: 0.2rem 0.18rem 0.18rem 0.24rem;
+			background-color: rgb(246, 247, 250);
+			justify-between: space-between;
+
+			.text_3 {
+				color: rgb(160, 162, 172);
+				font-size: 0.15rem;
+				line-height: 0.15rem;
+				letter-spacing: 0.015rem;
+				white-space: nowrap;
+			}
+
+			.text_4 {
+				margin-left: 0.05rem;
+				color: rgb(46, 155, 255);
+				font-size: 0.15rem;
+				line-height: 0.15rem;
+				white-space: nowrap;
+				text-transform: uppercase;
+			}
+		}
+	}
+
+	.group_3 {
+		margin-top: 0.76rem;
+		padding-left: 0.8rem;
+		padding-right: 0.69rem;
+		color: rgb(163, 182, 202);
+		font-size: 0.15rem;
+		line-height: 0.15rem;
+		white-space: nowrap;
+
+		.text_5 {
+			margin-left: 0.02rem;
+			margin-top: 0.13rem;
+		}
+
+		.image_1 {
+			margin-right: 0.14rem;
+			width: 2.12rem;
+			height: 1.89rem;
+		}
+	}
+}
+
+</style>
diff --git a/pages/message/dialogBox/dialogBox.vue b/pages/message/dialogBox/dialogBox.vue
new file mode 100644
index 0000000..3110bd5
--- /dev/null
+++ b/pages/message/dialogBox/dialogBox.vue
@@ -0,0 +1,1351 @@
+<template>
+  <view>
+    <u-navbar :border-bottom="false" back-text="" title="">
+      <view slot="" class="navbar-center">
+        <view class="info">
+          <text class="name">{{ userInfo.name }}</text>
+        </view>
+      </view>
+      <!-- <view class="navbar-right" slot="right">
+        <u-button v-if='userInfo.carewState && userInfo.carewState != "admin"' @click='InsertOrDelFollow()'
+          size="mini" class='btn' :plain="userInfo.carewState.indexOf('未关注') < 0" type="primary">{{
+            userInfo.carewState }}</u-button>
+      </view> -->
+    </u-navbar>
+    <view v-if="userInfo.carewState.indexOf('未关注') && showAttention" style="width: 100%;background-color: #fff;">
+      <view class="attention-box">
+        <view>关注方便以后常联系</view>
+        <view class="attention-right">
+          <view class="attention-btn" @click='InsertOrDelFollow()'>关注</view>
+          <image src="/static/common/img/close.png" @click="() => showAttention = false"></image>
+        </view>
+      </view>
+    </view>
+    <!-- 认证用户 -->
+    <view id="messagesList"></view>
+    <view v-if="false" class="quick Tips">
+      <view class="justify-center section_2">
+        <text>关注他，方便以后常聊</text>
+        <image class="image_2" src="/static/common/img/msgclose.png"/>
+      </view>
+    </view>
+    <!-- 未认证yonghu -->
+    <view :style="{ height: errShow ? '0.16rem' : '0' }" class="errTips">
+      <view class="flex-row group_3">
+        <image class="image_2" src="/static/common/img/16462770928974838161.png"/>
+        <text class="text_5">该用户尚未进行认证，请注意信息的甄别，保护个人信息！</text>
+      </view>
+    </view>
+    <view :class="[{ emoji: emoji }, { msg: CommonWords }, { text: inputShow }]" class="msgList" @mousedown="close">
+      <scroll-view :scroll-top="scrollTop" :scroll-with-animation="true" class="scroll" scroll-y="true"
+                   @refresherrefresh=''>
+        <!-- <scroll-view scroll-y="true" class="scroll" @refresherrefresh='' :scroll-top="scrollTop"
+        :scroll-with-animation="true" :refresher-enabled='true' refresher-background='#f6f7fa'
+        refresher-default-style="black"> -->
+        <template v-for="(v, i) in MsgList">
+          <view style='display:none'>{{ v.sendDate ? v.sendDate = v.sendDate.replace(/-/g, "/") : '' }}</view>
+          <!-- 提示消息（时间） -->
+          <view v-if='new Date(v.sendDate) - new Date(MsgList[i > 1 ? i - 1 : 0].sendDate) > 30000'
+                class="tis">
+            <text
+                v-if='new Date(v.sendDate) - 0 + (3600000 * 24) > new Date() && new Date(v.sendDate).getDate() == new Date().getDate()'
+                class="text">{{ v.sendDate.slice(10, 16) }}
+            </text>
+            <text v-else class="text">{{ v.sendDate }}</text>
+          </view>
+          <!-- 系统提示对方基本信息 -->
+          <view v-if='v.istips && v.type == 0' class="systis">
+            <view>
+              <view class="flex-col section_2">
+                <view class="flex-row group_2">
+                  <text>姓名：{{ v.Name }}</text>
+                </view>
+                <view class="flex-row group_2">
+                  <text>年龄：{{ v.Age }}</text>
+                </view>
+                <view class="flex-row group_2">
+                  <text>班级：{{ v.School }}</text>
+                </view>
+                <view class="flex-row group_2">
+                  <text>现居地（区）：{{ v.Address }}</text>
+                </view>
+                <view class="flex-row group_2">
+                  <text>手机号码:{{ v.Phone }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view v-if='v.istips && v.type == 1' class="tis">
+            <text class="text">{{ v.title }}</text>
+          </view>
+          <template v-if='!v.mymsg && !v.hemsg && !v.istips'>
+            <!-- 我方的消息 -->
+            <view v-if='v.fromUserId == vuex_user.id' class="mymsg">
+              <view class="justify-end group_5">
+                <view class="flex-col items-center text-wrapper">
+                  <text>{{ v.message }}</text>
+                </view>
+                <!-- <image :src="$u.http.config.imgUrl+vuex_user.head" class="image_3" /> -->
+                <u-avatar :src="$u.http.config.imgUrl + vuex_user.head" class="image_1"></u-avatar>
+              </view>
+            </view>
+            <!-- 对方消息 -->
+            <view v-else class="hemsg">
+              <view class="flex-row group">
+                <u-avatar :src="$u.http.config.imgUrl + userInfo.head" class="image_3 image_11"
+                          @click='toDeatil'></u-avatar>
+                <view class="right-text-wrapper_1 flex-col items-center">
+                  <text>{{ v.message }}</text>
+                </view>
+              </view>
+            </view>
+          </template>
+
+          <!-- 我方交换信息 -->
+          <template v-else>
+            <view v-if='v.mymsg' class="mymsg">
+              <view class="justify-end group_5">
+                <view class="exchange">
+                  <view class="top-group justify-center">
+                    <view class="flex-col section_3">
+                      <text class="text_11 text_12">请求交换信息</text>
+                      <!-- <view class="bottom-group flex-row view_1">
+                      <view @click='InfoExchange(v.type,false)' class="left-text-wrapper flex-col items-center">
+                        <text>拒绝</text>
+                      </view>
+                      <view @click='InfoExchange(v.type,true)' class="right-text-wrapper flex-col items-center">
+                        <text>同意</text>
+                      </view>
+                    </view> -->
+                    </view>
+                  </view>
+                </view>
+                <!-- <image :src="$u.http.config.imgUrl+vuex_user.head" class="image_3" /> -->
+                <u-avatar :src="$u.http.config.imgUrl + vuex_user.head" class="image_3"></u-avatar>
+              </view>
+            </view>
+            <!-- 对方交换信息 -->
+            <view v-if='v.hemsg' class="hemsg">
+              <view class="flex-row group">
+                <!-- <image @click='toDeatil' :src="$u.http.config.imgUrl+userInfo.head" class="image_3 image_11" /> -->
+                <u-avatar :src="$u.http.config.imgUrl + userInfo.head" class="image_1"
+                          @click='toDeatil'></u-avatar>
+                <view class="exchange">
+                  <view class="top-group justify-center">
+                    <view class="flex-col section_3">
+                      <text class="text_11 text_12">请求交换信息</text>
+                      <view class="bottom-group flex-row view_1" style='justify-content: center;'>
+                        <view v-if='v.type == 0' class="left-text-wrapper flex-col items-center"
+                              @click='InfoExchange(false, i)'>
+                          <text>拒绝</text>
+                        </view>
+                        <view v-if='v.type == 0' class="right-text-wrapper flex-col items-center"
+                              @click='InfoExchange(true, i)'>
+                          <text>同意</text>
+                        </view>
+                        <view v-if='v.type == 1'
+                              class="left-text-wrapper flex-col items-center">
+                          <text>已同意</text>
+                        </view>
+                        <view v-if='v.type == 2'
+                              class="left-text-wrapper flex-col items-center">
+                          <text>已拒绝</text>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </template>
+        </template>
+      </scroll-view>
+    </view>
+
+    <view class="msgbox">
+      <view v-if='chatType != 1' :style="[{ background: quick ? '#fff' : 'none' }]" class="quick">
+        <view v-if="quick" class="justify-between section_7">
+          <view class="flex-row" style='transform: translateX(-50%);'>
+            <view class="flex-col  items-center text-wrapper_2" @click='exchangeInfo(1)'>
+              <text class="text">交换信息</text>
+            </view>
+            <!-- 	<view @click='exchangeInfo(0)' class="flex-col items-end text-wrapper_3">
+              <text class="text">交换联系方式</text>
+            </view> -->
+          </view>
+          <image class="image_13" src="/static/common/img/msgclose.png" @click="quick = false"/>
+        </view>
+        <!-- <view style="display: flex; justify-content: flex-end" v-else>
+          <image style="margin: 0.08rem; width: 0.2rem; height: 0.2rem" @click="quick = true"
+            src="/static/common/img/msgopen.png" class="image_13" />
+        </view> -->
+      </view>
+      <view class="flex-row section_1">
+        <view class="input-box">
+          <!-- <text class="text" @click="CommonWords = !CommonWords; emoji = false;">常用语</text> -->
+          <u-input v-model="message" :auto-height="true" :type="'textarea'" class="input" @blur="inputBlur"
+                   @click="shuru" @focus="inputFocus"/>
+          <view class="icon" @click="emoji = !emoji; CommonWords = false; emojicurrent = 0;">
+            <image class="image" src="/static/common/img/icon-happy-face.png"/>
+          </view>
+          <view v-if="message != ''" class="btn">
+            <u-button class="sendOut" size="mini" @click="SendMessage">发送</u-button>
+          </view>
+          <view v-else class="icon" @click="expandBox = !expandBox">
+            <image class="image" src="/static/common/img/add-circle.png"/>
+          </view>
+        </view>
+      </view>
+      <!-- 常用语 -->
+      <view class="CommonWords">
+        <scroll-view :class="CommonWords ? 'open' : ''" scroll-y="true"
+                     style="transition: all 0.3s; height: 0rem">
+          <text v-for="(v, i) in CommonlyMsg" :key="i" @click="choice(v)">{{ v }}</text>
+        </scroll-view>
+      </view>
+      <!-- emoji 表情 -->
+      <swiper :class="emoji ? 'emojishow' : ''" :current="emojicurrent" class="slider">
+        <swiper-item v-for="(item, key) in emojiData" :key="key" :class="[key == emojiData.length - 1 ? 'lastbox' : '']"
+                     class="slider-emoji">
+          <text v-for="(emoji, index) in item" :key="index" class="slider-emoji-icon"
+                @click="selemoji(emoji)">{{
+              emoji
+            }}
+          </text>
+        </swiper-item>
+      </swiper>
+      <!-- 点击加号 -->
+      <view class="expandBox">
+        <view :class="expandBox ? 'open' : ''" style="transition: all 0.3s; height: 0rem">
+          <view class="expand-content">
+            <view v-for="i in expandList" class="expand-item" @click="expandFn(i.type)">
+              <image :src="i.img"></image>
+              <text class="expand-text">{{ i.text }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"/>
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+  </view>
+</template>
+
+<script>
+import emoji from "../../../static/common/js/emoji";
+
+export default {
+  data() {
+    return {
+      // 常用语
+      CommonlyMsg: ['您好，很高兴认识你！', '您好，有空聊一聊吗？', '嗨，你好呀！', '好的，我知道了。', '我们下次再聊，拜拜。'],
+      CommonWords: false, // 常用语 显示隐藏
+      quick: false, // 交换信息 显示隐藏
+      message: "", // 交换信息 显示隐藏
+      emojiData: [],
+      emoji: false,
+      inputShow: false,
+      scrollTop: 999999999999,
+      emojicurrent: 0,
+      userId: '',
+      userInfo: '',
+      MsgList: [],
+      errShow: false,
+      chatType: -1,
+      id: '',
+      type: 0,
+      connectionId: '',
+      state: false,
+      role: 0,
+      showAttention: true,
+      expandBox: false, // 点击加号展开
+      expandList: [
+        /* {
+        text: '拍照',
+        img: '/static/common/img/changeCard.png',
+        type:0
+      }, {
+        text: '相册',
+        img: '/static/common/img/changePhone.png',
+        type:1
+      }, {
+        text: '位置',
+        img: '/static/common/img/changeAddress.png',
+        type:2
+      },  */
+        {
+          text: '交换名片',
+          img: '/static/common/img/changeCard.png',
+          type: 3
+        }]
+    };
+  },
+  onLoad(e) {
+
+    // 管理员对用户
+    if (e.id == 'admin') {
+      this.type = 2;
+      this.chatType = 1;
+      this.userId = e.fromid;
+      this.role = 1,
+          this.getList()
+
+      this.emojiInit();
+      this.LinkChar();
+      this.goBottom()
+      this.toBind()
+      return
+    }
+
+    // 判断聊天类型
+    if (e.chatType == undefined) {
+      uni.switchTab({
+        url: "../../message/msgList/msgList",
+      });
+      return;
+    }
+    this.type = e.type
+    this.id = e.id
+    this.chatType = e.chatType
+
+    // 用户对管理员
+    if (e.chatType == 1) {
+      this.userInfo = {
+        name: '管理员',
+        head: e.head,
+        carewState: 'admin'
+      }
+      this.getList()
+    }
+    // 用户和用户
+    if (e.chatType == 0) {
+      if (!e.id) {
+        uni.switchTab({
+          url: "../../main/index/index",
+        });
+        return;
+      }
+      this.userId = e.id;
+      this.getList()
+      this.getDetail();
+    }
+
+    if (this.errShow) {
+      setTimeout(() => {
+        this.errShow = false
+      }, 3000)
+    }
+    this.goBottom()
+    this.emojiInit();
+    this.LinkChar();
+  },
+  onShow() {
+
+    if (this.vuex_msgList) {
+      var msgList = this.vuex_msgList;
+      if (this.chatType == 1) {
+        if (this.type = 2) {
+          msgList = msgList.replace((this.userId + 'user,'), '')
+        } else {
+          msgList = msgList.replace('admin,', '')
+        }
+      } else {
+        msgList = msgList.replace((this.userId + ','), '')
+      }
+      this.$u.vuex('vuex_msgList', msgList)
+      if (!msgList || msgList.indexOf(',') < 0) {
+        this.$u.vuex('vuex_msgList', '')
+        var tab = this.vuex_tabbar;
+        tab[1].isDot = false;
+        this.$u.vuex('vuex_tabbar', tab);
+      }
+    }
+    this.goBottom()
+    this.getDetail();
+  },
+  onHide() {
+    if (this.chatType == 1) {
+      this.colseBind()
+    }
+  },
+  onUnload() {
+    if (this.chatType == 1) {
+      this.colseBind()
+    }
+  },
+  methods: {
+    expandFn(type) {
+      switch (type) {
+        case 3:
+          this.exchangeInfo()
+          break;
+      }
+    },
+    //管理员聊天绑定
+    toBind() {
+      let data = {
+        manageUser: this.vuex_user.id,
+        lockUser: this.userId
+      }
+      this.$u.api.toBind(data).then(res => {
+      })
+    },
+    //管理员聊天取消绑定
+    colseBind() {
+      let data = {
+        lockUser: this.userId
+      }
+      this.$u.api.colseBind(data).then(res => {
+      })
+    },
+    // 回应交换信息
+    InfoExchange(bool, index) {
+      this.$connection
+          .invoke("whetherAgreeExchange", this.vuex_user.id, this.userId, bool)
+          .then((res) => {
+            this.MsgList[index].type = bool ? 1 : 2;
+            this.goBottom()
+          })
+    },
+    //请求交换信息
+    exchangeInfo() {
+      this.$connection
+          .invoke("exchangeInfo", this.vuex_user.id, this.userId)
+          .then((res) => {
+            this.MsgList.push({
+              fromUserId: this.vuex_user.id,
+              mymsg: true,
+              type: 0,
+              sendDate: this.getIsTime()
+            })
+            this.goBottom()
+            this.quick = false
+          })
+    },
+    // 获取当前时间
+    getIsTime() {
+      const year = new Date().getFullYear();
+      const Month = new Date().getMonth() + 1;
+      const day = new Date().getDate();
+      const Hours = new Date().getHours();
+      const Minut = new Date().getMinutes();
+      const second = new Date().getSeconds();
+
+      //小于10的拼接上0字符串
+      function addZero(s) {
+        return s < 10 ? ('0' + s) : s;
+      }
+
+      return year + '-' + addZero(Month) + '-' + addZero(day) + ' ' + addZero(Hours) + ':' + addZero(Minut) +
+          ':' + addZero(second)
+    },
+
+    // 获取聊天记录
+    getList(id) {
+      const data = {
+        getUserId: this.vuex_user.id,
+        userId: this.userId,
+        chatType: this.chatType
+      }
+      if (id) {
+        data.getUserId = id;
+      }
+      this.$u.api.getChatRecord(data).then(res => {
+        this.MsgList = res
+      })
+    },
+    // 查看用户主页
+    toDeatil() {
+      if (this.chatType == 0) {
+        this.$u.route({
+          url: '/pages/AlumniCircle/userDetail/userDetail?id=' + this.userId + '&type=1'
+        })
+      }
+    },
+    // 关注
+    InsertOrDelFollow() {
+      const data = {
+        userId: this.vuex_user.id,
+        carewId: this.userId,
+      }
+      this.$u.apiList.InsertOrDelFollow(data).then(res => {
+        console.log(res, '关注成功');
+        if (res.succeed) {
+          // this.$tips('关注成功!', 'success')
+          this.$refs.uToast.show({
+            title: '关注成功',
+            type: 'success',
+          })
+          this.showAttention = false
+        }
+        // this.getDetail()
+      })
+    },
+    //获取用户信息
+    getDetail() {
+      this.$u.api.getUserInfo({
+        userId: this.userId
+      }).then((res) => {
+        this.userInfo = {
+          name: res.baseData.userName,
+          head: res.baseData.head,
+          carewState: res.carewState
+        }
+        if (res.carewState.includes('未关注')) {
+          this.showAttention = true
+        } else {
+          this.showAttention = false
+        }
+      });
+    },
+    //链接聊天
+    LinkChar() {
+      // 聊天限制提示3条后不能发送消息
+      this.$connection.on("FailInSend", (user, msg) => {
+        if (type == false) {
+          this.MsgList.push({
+            title: msg,
+            sendDate: this.getIsTime(),
+            istips: true,
+            type: 1,
+          })
+          this.goBottom()
+        }
+      })
+
+      //交换信息对方选择
+      this.$connection.on("whetherAgreeExchange", (user, type) => {
+        if (type == false) {
+          this.MsgList.push({
+            title: '对方已拒绝您的交换请求',
+            sendDate: this.getIsTime(),
+            istips: true,
+            type: 1,
+          })
+          this.goBottom()
+        }
+      })
+
+      //交换信息
+      this.$connection.on("ExchangeInfo", (user, type) => {
+        this.MsgList.push({
+          fromUserId: user,
+          hemsg: true,
+          type: 0,
+          sendDate: this.getIsTime()
+        })
+        this.goBottom()
+      })
+      // 显示
+      this.$connection.on("ShowUserInfo", (user, message) => {
+        // console.log(user, message);
+        const data = JSON.parse(message)
+        this.MsgList.push({
+          Name: data.Name,
+          sendDate: this.getIsTime(),
+          istips: true,
+          type: 0,
+          Phone: data.Phone,
+          Age: data.Age,
+          Address: data.Address,
+          School: data.School
+        })
+        this.goBottom()
+      });
+      //接收数据
+      this.$connection.on("ReceiveMessage", (user, message, type) => {
+        // console.log(user, message, type, this.chatType)
+        if (this.route.indexOf('dialogBox') >= 0) {
+          if (type <= 2 && this.chatType == 0 || type >= 3 && this.chatType == 1) {
+            if (user == this.userId || (this.userId == '' && type == 4)) {
+              this.MsgList.push({
+                fromUserId: user,
+                message: message,
+                sendDate: this.getIsTime(),
+                toUserId: this.vuex_user.id,
+              })
+              this.goBottom()
+            } else {
+              this.AddTisp(user, type)
+            }
+          } else {
+            this.AddTisp(user, type)
+          }
+        }
+      });
+    },
+    // 添加提示
+    AddTisp(user, type) {
+      var tab = this.vuex_tabbar;
+      tab[1].isDot = true;
+      this.$u.vuex('vuex_tabbar', tab);
+      var msgList = this.vuex_tabbar
+      var msgList = this.vuex_msgList
+      // 管理员对普通用户
+      if (type == 4) {
+        user = 'admin'
+      }
+      if (type == 3) {
+        user += 'user'
+      }
+      if (msgList.indexOf(user) < 0) {
+        msgList += (user + ',');
+      }
+      this.$u.vuex('vuex_msgList', msgList)
+    },
+    charLink() {
+      var that = this;
+      (function start(ms, that) {
+        setTimeout(() => {
+          try {
+            that.$connection
+                .start()
+                .then(() => {
+                  that.connectionId = that.$connection.connection.transport.url.split(
+                      "=")[1]
+                  that.CharLogin()
+                  if (that.state) {
+                    this.SendMessage()
+                    that.state = false
+                  }
+                })
+                .catch((e) => {
+                  //重试
+                  // console.log("websocket连接失败", e);
+                  return start(500, that);
+                });
+          } catch (e) {
+            //重试
+            // console.log("websocket连接失败", e);
+            return start(500, that);
+          }
+        }, ms);
+      })(0, that)
+    },
+    CharLogin() {
+      //绑定用户账号和connectionId
+      if (this.vuex_user.id) {
+        this.$connection
+            .invoke("login", this.connectionId, this.vuex_user.id)
+            .then((res) => {
+              // console.log("登录成功", res);
+            })
+            .catch((err) => {
+              // console.log("登录失败", err);;
+            });
+      } else {
+        setTimeout(() => {
+          this.CharLogin()
+        }, 1000)
+      }
+    },
+    // 发送消息
+    async SendMessage() {
+      // 判断当前学校是否认证，未认证不可聊天
+
+      const req = {
+        userId: this.vuex_user.id,
+      }
+      const res = await this.$u.apiList.MyPage(req)
+      console.log(JSON.parse(JSON.stringify(res)), 'res')
+      const edcationList = res.edcationList
+      if (!edcationList.length) {
+        return this.$refs.uToast.show({
+          title: '认证后可进行聊天操作',
+          type: 'warning',
+        })
+
+      }
+      const findRow = edcationList.find(x => x.isSelected === true);
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: '认证后可进行聊天操作',
+          type: 'warning',
+        })
+
+      }
+      this.$connection
+          .invoke("sendMessage", this.vuex_user.id, this.userId, this.message, parseInt(this.chatType), this
+              .role)
+          .then((res) => {
+            this.MsgList.push({
+              fromUserId: this.vuex_user.id,
+              message: this.message,
+              sendDate: this.getIsTime(),
+              toUserId: this.userId,
+            })
+            this.state = true
+            this.close()
+            this.goBottom()
+            this.message = ''
+          }).catch((err) => {
+        this.charLink()
+      });
+    },
+    // 退出连接
+    closeChar() {
+      this.$connection.invoke("signOut", this.vuex_user.id).then((res) => {
+        ;
+      });
+      // this.$connection.onclose(function (data) { //去掉斜杠
+      //   console.log("websocket连接断开");
+      //   //重试
+      //   this.LinkChar()
+      // })
+    },
+    // 表情
+    emojiInit() {
+      var number = 60;
+      var page = Math.ceil(emoji.length / number);
+      for (let i = 0; i < page; i++) {
+        this.emojiData[i] = [];
+        for (let k = 0; k < number; k++) {
+          emoji[i * number + k] ?
+              this.emojiData[i].push(emoji[i * number + k]) : "";
+        }
+      }
+    },
+    inputFocus() {
+      this.CommonWords = false;
+      this.emoji = false;
+      this.goBottom();
+    },
+    inputBlur() {
+      ;
+    },
+    shuru() {
+      this.goBottom()
+    },
+    choice(txt) {
+      this.message = txt;
+    },
+    close() {
+      this.CommonWords = false;
+      this.emoji = false;
+    },
+    sendOut() {
+      this.close();
+    },
+    selemoji(m) {
+      this.message += m;
+    },
+    goBottom() {
+      setTimeout(() => {
+        this.scrollTop += 1;
+      }, 200);
+    },
+    //返回上一级
+    router() {
+      if (this.type == 2) {
+        this.$u.route({
+          url: '/pages/message/adminList/adminList'
+        });
+        return
+      }
+      if (this.type == 0) {
+        uni.switchTab({
+          url: '../../message/msgList/msgList'
+        })
+      } else {
+        this.$u.route({
+          url: 'pages/AlumniCircle/userDetail/userDetail?id=' + this.id + '&type=3'
+        });
+      }
+
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.msgList.emoji,
+.msgList.msg {
+  position: relative;
+  bottom: 3rem;
+}
+
+.errTips {
+  position: absolute;
+  z-index: 9999;
+  width: 100%;
+  background: #fff;
+  height: 0.16rem;
+  overflow: hidden;
+  transition: all 1s;
+
+  .group_3 {
+    color: rgb(255, 117, 134);
+    font-size: 0.11rem;
+    line-height: 0.12rem;
+    letter-spacing: 0.011rem;
+    white-space: nowrap;
+    justify-content: center;
+  }
+
+  .image_2 {
+    width: 0.16rem;
+    height: 0.14rem;
+  }
+
+  .text_5 {
+    margin-left: 0.085rem;
+    line-height: 1.4;
+  }
+}
+
+.emojishow {
+  height: 3rem !important;
+}
+
+.slider {
+  background: #fff;
+  width: 7.75rem;
+  height: 0rem;
+  transition: all 0.3s;
+
+  .slider-emoji {
+    overflow-y: scroll;
+    width: 100vw !important;
+  }
+
+  &-emoji {
+    width: 6.75rem;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
+
+    &-icon {
+      font-size: 0.265rem;
+      display: inline-block;
+      width: 10%;
+      text-align: center;
+      padding: 0.05rem 0;
+      border-radius: 0.1rem;
+      //   border-bottom: 1px solid #ccc;
+    }
+
+    &-icon:active {
+      background: #ccc;
+    }
+  }
+}
+
+.lastbox {
+  justify-content: flex-start;
+}
+
+.msgList {
+  .scroll {
+    height: calc(100vh - 1rem);
+    background: #fff;
+    padding: 0 0.17rem;
+    box-sizing: border-box;
+
+    ::v-deep .uni-scroll-view-content {
+      height: auto;
+      padding-bottom: 0.2rem;
+    }
+  }
+
+  > view {
+    margin-top: 0;
+  }
+
+  .systis {
+    width: 80%;
+    background-color: #f1f1f5;
+    margin: 0.15rem auto;
+    margin-top: 0.2rem;
+    border-radius: 0.1rem;
+
+    .section_2 {
+      margin-right: 0.02rem;
+      margin-top: 0.15rem;
+      padding: 0.13rem 0.075rem 0.13rem 0.18rem;
+      border-radius: 0.087rem 0.087rem 0.087rem 0.087rem;
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+    }
+
+    .group_2 {
+      color: rgb(160, 162, 172);
+      font-size: 0.12rem;
+      line-height: 0.2rem;
+      letter-spacing: 0.012rem;
+
+      text {
+        width: 100%;
+      }
+    }
+
+    .text_6 {
+      margin-top: 0.08rem;
+      color: rgb(160, 162, 172);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      letter-spacing: 0.012rem;
+      white-space: nowrap;
+    }
+
+    .group_3 {
+      margin-top: 0.095rem;
+      color: rgb(160, 162, 172);
+      font-size: 0.12rem;
+      line-height: 0.12rem;
+      letter-spacing: 0.012rem;
+      white-space: nowrap;
+    }
+
+    .group_4 {
+      margin-top: 0.095rem;
+      padding-left: 0.005rem;
+    }
+
+    .text_5 {
+      margin-top: 0.07rem;
+    }
+
+    .text_8 {
+      margin-left: 0.04rem;
+    }
+
+    .text_9 {
+      align-self: center;
+      color: rgb(160, 162, 172);
+      font-size: 0.12rem;
+      line-height: 0.12rem;
+      letter-spacing: 0.012rem;
+      white-space: nowrap;
+    }
+
+    .text_10 {
+      color: rgb(46, 155, 255);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+    }
+  }
+
+  .exchange {
+    .top-group {
+      margin-left: 0.15rem;
+      margin-top: 0.085rem;
+      margin-right: 0.15rem;
+    }
+
+    .left-text-wrapper {
+      padding: 0.065rem 0 0.055rem;
+      background-color: rgb(255, 255, 255);
+      border-radius: 0.03rem;
+      width: 0.65rem;
+      height: 0.25rem;
+      border: solid 0.01rem rgb(255, 255, 255);
+    }
+
+    .right-text-wrapper {
+      margin-left: 0.24rem;
+      padding: 0.06rem 0;
+      background-color: rgb(255, 255, 255);
+      border-radius: 0.03rem;
+      width: 0.65rem;
+      height: 0.25rem;
+      border: solid 0.01rem rgb(255, 255, 255);
+    }
+
+    .text_11 {
+      color: rgb(255, 255, 255);
+      font-size: 0.15rem;
+      line-height: 0.14rem;
+      letter-spacing: 0.015rem;
+      white-space: nowrap;
+      text-align: center;
+    }
+
+    .bottom-group {
+      color: rgb(115, 129, 255);
+      font-size: 0.12rem;
+      line-height: 0.12rem;
+      letter-spacing: 0.012rem;
+      white-space: nowrap;
+    }
+
+    .right {
+      margin-left: 0.14rem;
+    }
+
+    .section_3 {
+      margin-top: 0.06rem;
+      padding: 0.15rem 0.33rem;
+      border-radius: 0.075rem 0.075rem 0.075rem 0.075rem;
+      background-image: url("~@/static/common/img/exchangeBjImg.png");
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+    }
+
+    .text_12 {
+    }
+
+    .view_1 {
+      margin-top: 0.21rem;
+    }
+  }
+
+  .hemsg {
+    margin-top: 0.15rem;
+
+    .image_3 {
+      width: 0.4rem !important;
+      height: 0.4rem !important;
+      border-radius: 50%;
+      overflow: hidden;
+      flex: 0 0 0.4rem !important;
+    }
+
+    .right-text-wrapper_1 {
+      margin-left: 0.15rem;
+      margin-top: 0.085rem;
+      padding: 0.1rem;
+      background-color: #f6f8fa;
+      border-radius: 0.1rem;
+      // border-top-left-radius: 0;
+      max-width: 65%;
+      word-break: break-all;
+    }
+
+    .group {
+      color: rgb(0, 0, 0);
+      font-size: 0.15rem;
+      line-height: 0.16rem;
+      letter-spacing: 0.015rem;
+      //   white-space: nowrap;
+    }
+
+    .image_11 {
+      margin-bottom: 0.035rem;
+    }
+  }
+
+  .tis {
+    margin-top: 0.15rem;
+
+    .text {
+      display: block;
+      text-align: center;
+      color: rgb(180, 182, 189);
+      font-size: 0.11rem;
+      line-height: 0.12rem;
+      letter-spacing: 0.011rem;
+      white-space: nowrap;
+    }
+  }
+
+  .mymsg {
+    margin-top: 0.1rem;
+
+    .image_3 {
+      width: 0.4rem;
+      height: 0.4rem;
+      border-radius: 50%;
+    }
+
+    .text-wrapper {
+      margin-right: 0.14rem;
+      margin-top: 0.085rem;
+      padding: 0.1rem 0.1rem 0.09rem;
+      border-radius: 0.1rem;
+      // border-top-right-radius: 0;
+      background: #3CB5FB;
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+      max-width: 65%;
+      word-break: break-all;
+
+    }
+
+    .group_5 {
+      margin-top: 0.025rem;
+      color: rgb(255, 255, 255);
+      font-size: 0.15rem;
+      line-height: 0.16rem;
+      letter-spacing: 0.015rem;
+      white-space: wrap;
+    }
+  }
+}
+
+.Tips {
+  position: absolute;
+  z-index: 9;
+  top: 0.44rem;
+  left: 0;
+  right: 0;
+  background: #fff;
+}
+
+.navbar-center {
+  text-align: center;
+  width: 100%;
+
+  text {
+    display: block;
+  }
+
+  .info {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .name {
+    line-height: 0.15rem;
+    font-weight: 800;
+    font-size: 32rpx;
+    color: rgba(0, 0, 0, 0.9);
+  }
+
+  .shool {
+    font-size: 0.11rem;
+    color: #cacaca;
+  }
+}
+
+.navbar-right {
+  .btn {
+    // height: 0.3rem;
+    background-color: #2e9bff;
+    border-radius: 0.05rem;
+    font-size: 0.15rem;
+    line-height: 0.15rem;
+    color: #ffffff;
+    margin-right: 0.22rem;
+  }
+}
+
+.quick {
+  .section_2 {
+    padding: 0.08rem 0.095rem 0.06rem;
+    color: rgb(46, 155, 255);
+    font-size: 0.11rem;
+    line-height: 0.12rem;
+    letter-spacing: 0.011rem;
+    white-space: nowrap;
+    position: relative;
+  }
+
+  .image_2 {
+    position: absolute;
+    right: 0.095rem;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 0.18rem;
+    height: 0.18rem;
+  }
+
+  .info {
+    font-size: 0.11rem;
+    line-height: 0.18rem;
+    letter-spacing: 0.01rem;
+    color: #2e9bff;
+  }
+
+  .text {
+    text-transform: uppercase;
+    color: #fff !important;
+    line-height: 0.25rem !important;
+  }
+
+  .section_7 {
+    padding: 0.055rem 0.095rem 0.045rem 50%;
+    color: rgb(255, 255, 255);
+    font-size: 0.12rem;
+    line-height: 0.12rem;
+    white-space: nowrap;
+    background-color: rgba(46, 155, 255, 0.1);
+  }
+
+  .image_13 {
+    margin: 0.04rem 0 0.025rem;
+    width: 0.18rem;
+    height: 0.18rem;
+  }
+
+  .text-wrapper_2 {
+    background-color: rgb(115, 129, 255);
+    border-radius: 0.05rem;
+    width: 0.97rem;
+    height: 0.25rem;
+    color: #fff;
+  }
+
+  .text-wrapper_3 {
+    margin-left: 0.14rem;
+    background-color: rgb(115, 129, 255);
+    border-radius: 0.05rem;
+    height: 0.25rem;
+  }
+}
+
+.msgbox {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+
+  .section_1 {
+    // height: 0.52rem;
+    background-color: #fff;
+    border: solid 0.01rem #eeeeee;
+    padding: 0.11rem 0.1rem 0.11rem 0.1rem;
+
+    .input-box {
+      display: flex;
+      width: 100%;
+      background: #f6f8f9;
+      padding: 6rpx;
+      border-radius: 20rpx;
+      align-items: center;
+    }
+  }
+
+  .text {
+    font-size: 0.14rem;
+    line-height: 0.15rem;
+    color: #505051;
+    margin: 0 0.1rem;
+    line-height: 0.36rem;
+  }
+
+  .input {
+    width: 80%;
+    min-height: 0.36rem !important;
+    line-height: 0.36rem;
+    // background-color: #f7f7f7;
+    border-radius: 0.1rem;
+    font-size: 0.14rem;
+    padding-right: 0.1rem !important;
+
+    ::v-deep .u-input__input {
+      padding: 0.05rem;
+      min-height: 0.16rem !important;
+      transform: translateY(0.03rem);
+    }
+  }
+
+  .icon {
+    margin-left: 0.05rem;
+    // padding: 0.03rem 0;
+    margin-top: 10rpx;
+  }
+
+  .btn {
+    padding: 0.03rem 0;
+
+    .sendOut {
+      height: 60rpx;
+      line-height: 60rpx;
+      width: 90rpx;
+      margin-left: 0.05rem;
+      background: linear-gradient(178deg, #3CB5FB 0%, #06E1FA 100%);;
+      color: #ffffff;
+
+    }
+  }
+
+  .image {
+    width: 0.26rem;
+    height: 0.26rem;
+  }
+
+  .CommonWords {
+    width: 100%;
+    background-color: #f6f7fa;
+
+    text {
+      transition: all 0.3s;
+      display: block;
+      padding: 0.1rem 0 0.1rem 0.2rem;
+      font-size: 0.14rem;
+      line-height: 0.2rem;
+      height: 0.4rem;
+      overflow: hidden;
+      color: #505051;
+    }
+
+    text:active {
+      background: #ccc;
+    }
+  }
+
+  .open {
+    height: 3rem !important;
+    transition: all 0.3s;
+  }
+
+  .expandBox {
+    width: 100%;
+    background-color: #fff;
+
+    .expand-content {
+      width: 100%;
+      padding: 20rpx 30rpx;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+
+      .expand-item {
+        width: 140rpx;
+        text-align: center;
+        color: #999999;
+      }
+
+      image {
+        width: 140rpx;
+        height: 140rpx;
+        margin-bottom: 10rpx;
+      }
+    }
+
+  }
+
+  .open {
+    width: 100%;
+    height: 1.5rem !important;
+    transition: all 0.3s;
+  }
+}
+
+.attention-box {
+  width: 686rpx;
+  height: 100rpx;
+  background: #F6F8F9;
+  box-shadow: 0rpx 2rpx 10rpx -2rpx rgba(0, 0, 0, 0.06), 0rpx 4rpx 4rpx 0rpx rgba(0, 0, 0, 0.04), 0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.02);
+  border-radius: 24rpx;
+  margin: 0 auto;
+  padding: 0 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.attention-right {
+  display: flex;
+  align-items: center;
+
+  image {
+    width: 44rpx;
+    height: 44rpx;
+  }
+}
+
+.attention-btn {
+  width: 120rpx;
+  height: 48rpx;
+  text-align: center;
+  line-height: 48rpx;
+  background: linear-gradient(178deg, #3CB5FB 0%, #06E1FA 100%);
+  border-radius: 64rpx;
+  font-size: 24rpx;
+  color: #fff;
+  margin-right: 20rpx;
+}
+</style>
diff --git a/pages/message/interactionList/interactionList.vue b/pages/message/interactionList/interactionList.vue
new file mode 100644
index 0000000..9d14a80
--- /dev/null
+++ b/pages/message/interactionList/interactionList.vue
@@ -0,0 +1,438 @@
+<template>
+	<view>
+		<u-navbar title="互动消息" :border-bottom="false"></u-navbar>
+		<u-tabs-swiper ref="uTabs" :list="tabList" :current="current" :is-scroll="false"
+			:active-item-style="{ color: '#3CB5FB', fontSize: '0.15rem' }" :bar-style="{ background: '#3CB5FB' }"
+			@change="tabsChange"></u-tabs-swiper>
+		<scroll-view scroll-y="true" class="scroll">
+			<view class="flex-col list" v-if='list.length'>
+				<template v-for="(item, i) in list">
+					<view v-if='item.interType != 3' class="list-item flex-col section_4" :key="i">
+						<view class="image_2 flex-row view_14">
+								<u-avatar :src="$u.http.config.imgUrl + item.userHead"
+									@click='toDetil(item.interUserId)' class="image_2"></u-avatar>
+								<view class="flex-col group_2">
+									<view class="flex-row group_3">
+										<text class="text_16">{{ item.interUserName }}</text>
+										<text class="text_18">{{ item.interDate }}</text>
+									</view>
+									<view class="right-text-wrapper">
+									<text v-if="item.interType == 0">点赞了你的作品</text>
+									<text v-if="item.interType == 1">收藏了你的作品</text>
+									<text v-if="item.interType == 2">转发了你的作品</text>
+								</view>
+								</view>
+							</view>
+						<view class="bottom-section flex-row">
+							<image v-if='item.dynamicHead' :src="$u.http.config.imgUrl + item.dynamicHead.split(',')[0]"
+								class="image_4" />
+							<text v-if="item.interType == 0" class="text_6">{{ item.commentContent }}</text>
+							<text v-if="item.interType == 1" class="text_6">{{ item.dynamicTitle }}</text>
+							<text v-if="item.interType == 2" class="text_6">{{ item.dynamicTitle }}</text>
+						</view>
+						<view class="flex-row group_4">
+						</view>
+					</view>
+					<view v-else class="list-item flex-col section_4">
+						<view class="top-group flex-row view_13">
+							<view class="image_2 flex-row view_14">
+								<u-avatar :src="$u.http.config.imgUrl + item.userHead"
+									@click='toDetil(item.interUserId)' class="image_2"></u-avatar>
+								<view class="flex-col group_2">
+									<view class="flex-row group_3">
+										<text class="text_16">{{ item.interUserName }}</text>
+										<!-- <view class="flex-col items-center text-wrapper_1">
+											<text>{{ item.commentContent == '【我的评论】' ? '评论' : '回复' }}了</text>
+										</view> -->
+										<text class="text_18">{{ item.interDate }}</text>
+									</view>
+									<text class="text_20">{{ item.commentContent == '【我的评论】' ? '评论' :
+										'回复' }}了你:{{ item.content }}</text>
+								</view>
+							</view>
+							<!-- <view class="right-group flex-col items-center view_15">
+								<text class="top-group_2">回复</text>
+							</view> -->
+						</view>
+
+						<view class="bottom-section flex-row">
+							<text v-if="item.commentContent == '【我的评论】'" class="text_6">{{ item.dynamicTitle }}</text>
+							<text v-else class="text_6">{{ item.commentContent }}</text>
+						</view>
+						<view class="flex-row group_4">
+							<!-- <image
+								src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/621c59e162a7d90011002985/16460348611151830106.png"
+								class="image_11" />
+							<text class="text_22">还有10条评论 ></text> -->
+						</view>
+					</view>
+				</template>
+			</view>
+			<view v-else style='padding-top:30vh'>
+				<!-- <u-empty text="暂无消息列表" mode="message"></u-empty> -->
+				<no-data text="暂无消息列表"></no-data>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import NoData from 'components/NoData.vue'
+	export default {
+		components: {
+			NoData
+		},
+	data() {
+		return {
+			list: [],
+			tabList: [
+				{
+					name: "全部",
+				},
+				{
+					name: "评论",
+				},
+				{
+					name: "点赞",
+				},
+				{
+					name: "收藏",
+				},
+				{
+					name: "转发",
+				},
+			],
+			current:0,
+		};
+	},
+	onLoad() {
+		this.getList(-1)
+		//接收互动消息
+		this.$connection.on("InteractMessage", (data, type) => {
+			if (this.route.indexOf('interactionList') >= 0) {
+				this.list.unshift(data.data)
+			}
+		});
+	},
+	onShow() {
+		if (this.vuex_msgList) {
+			var msgList = this.vuex_msgList;
+			msgList = msgList.replace('InteractMessage,', '')
+			this.$u.vuex('vuex_msgList', msgList)
+			if (!msgList) {
+				var tab = this.vuex_tabbar;
+				tab[1].isDot = false;
+				this.$u.vuex('vuex_tabbar', tab);
+			}
+		}
+	},
+	methods: {
+		// tabschange
+		tabsChange(i) {
+			// this.current 0=全部 1=评论 2=点赞 3=收藏 4=转发
+			if (this.current !== i) {
+				this.current = i;
+				if (this.current == 0) {
+					this.getList(-1)
+				} else if (this.current == 1) {
+					this.getList(3)
+				} else {
+					this.getList(this.current - 2);
+				}
+
+			}
+		},
+		//type 0=点赞 1=收藏 2=转发 3=评论
+		getList(type) {
+			this.$u.api.getinteractionList(type).then(res => {
+				this.list = res
+			})
+		},
+		//返回上一级
+		router() {
+			uni.switchTab({
+				url: '../../message/msgList/msgList'
+			})
+		},
+		toDetil(id) {
+			this.$u.route({
+				url: '/pages/AlumniCircle/userDetail/userDetail?id=' + id
+			})
+		},
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.scroll {
+	background-color: rgb(246, 247, 250);
+	width: 100%;
+	height: calc(100vh - 0.44rem);
+}
+
+.list-item {
+	padding: 0 0.14rem 0.17rem;
+	background-color: rgb(255, 255, 255);
+	border-radius: 0.1rem;
+	margin-top: 0.1rem;
+}
+
+.list-item:first-child {
+	margin-top: 0;
+}
+
+.top-group {
+	padding: 0.12rem 0 0.085rem;
+}
+
+.bottom-section {
+	margin-top: 10rpx;
+	margin-right: 0.055rem;
+	padding: 0.07rem 0.025rem 0.08rem 0.14rem;
+	color: rgb(54, 54, 54);
+	font-size: 0.12rem;
+	// letter-spacing: 0.012rem;
+	white-space: nowrap;
+	background-color:#F6F8F9;
+	border-radius: 24rpx;
+	// margin-left: 0.5rem;
+	width: 100%;
+}
+
+.image_2 {
+	margin-bottom: 0.025rem;
+	width: 0.4rem;
+	height: 0.4rem;
+	border-radius: 50%;
+}
+
+.right-group {
+	// margin-left: 0.12rem;
+	// margin-top: 0.05rem;
+}
+
+.image_4 {
+	width: 0.35rem;
+	height: 0.35rem;
+}
+
+.text_6 {
+	margin-left: 0.025rem;
+	align-self: center;
+	overflow: hidden;
+	max-width: 84%;
+	text-overflow: ellipsis;
+}
+
+.top-group_1 {
+	color: rgb(2, 2, 2);
+	font-size: 0.15rem;
+	line-height: 0.14rem;
+	letter-spacing: 0.015rem;
+	white-space: nowrap;
+}
+
+.text_4 {
+	margin-left: 0.02rem;
+	margin-top: 0.085rem;
+	color: rgb(177, 179, 182);
+	font-size: 0.12rem;
+	line-height: 0.12rem;
+	letter-spacing: 0.012rem;
+	white-space: nowrap;
+}
+
+.text_1 {
+	// margin: 0.02rem 0;
+	color: rgb(2, 2, 2);
+	font-size: 0.15rem;
+	// line-height: 0.14rem;
+	letter-spacing: 0.015rem;
+	white-space: nowrap;
+}
+
+.right-text-wrapper {
+	// margin-left: 0.015rem;
+	padding: 0.03rem 0 0.04rem;
+	// color: rgb(46, 155, 255);
+	font-size: 0.12rem;
+	// line-height: 0.12rem;
+	// letter-spacing: 0.012rem;
+	white-space: nowrap;
+	// background-color: rgba(46, 155, 255, 0.1);
+	border-radius: 0.09rem;
+	// width: 0.65rem;
+	height: 0.18rem;
+	color: #000;
+	font-size: 24rpx;
+}
+
+.list {
+	padding: 0.14rem 0.14rem 0.14rem 0.15rem;
+}
+
+.view_2 {
+	color: initial;
+	font-size: initial;
+	line-height: initial;
+	letter-spacing: initial;
+	white-space: initial;
+}
+
+.top-group {
+	padding: 0.12rem 0 0.085rem;
+}
+
+.image_2 {
+	margin-bottom: 0.025rem;
+	width: 0.4rem;
+	height: 0.4rem;
+}
+
+.right-group {
+	// margin-left: 0.12rem;
+	// margin-top: 0.05rem;
+}
+
+.section_4 {
+	padding: 0.15rem 0.16rem 0;
+	margin-top: 0.1rem;
+}
+
+.view_13 {
+	padding: initial;
+}
+
+.text_20 {
+	margin-right: initial;
+	padding: initial;
+	align-self: initial;
+	background-color: initial;
+	// margin-left: 0.53rem;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: 80%;
+	font-size: 24rpx;
+	color: rgba(0, 0, 0, 0.9);
+
+}
+
+.text-wrapper_2 {
+	margin-right: 0.05rem;
+	margin-top: 0.1rem;
+	padding: 0.18rem 0 0.2rem;
+	color: rgb(54, 54, 54);
+	font-size: 0.12rem;
+	line-height: 0.12rem;
+	letter-spacing: 0.012rem;
+	white-space: nowrap;
+	background-color: rgb(246, 247, 250);
+	max-width: 84%;
+	min-width: 84%;
+	margin-left: 0.53rem;
+}
+
+.group_4 {
+	padding: 0.1rem 0.52rem 0.1rem;
+	color: rgb(177, 179, 182);
+	font-size: 0.12rem;
+	line-height: 0.12rem;
+	letter-spacing: 0.012rem;
+	white-space: nowrap;
+}
+
+.view_14 {
+	margin-bottom: initial;
+	width: initial;
+	height: initial;
+	flex: 1 1 auto;
+}
+
+.view_15 {
+	margin-left: 0.2rem;
+	margin-top: initial;
+	margin-right: 0.07rem;
+	padding: 0.07rem 0;
+	color: rgb(255, 255, 255);
+	font-size: 0.12rem;
+	line-height: 0.12rem;
+	white-space: nowrap;
+	background-color: rgb(46, 155, 255);
+	border-radius: 0.13rem;
+	width: 0.56rem;
+	height: 0.25rem;
+}
+
+.view_15:active {
+	background: #fff;
+	color: rgb(46, 155, 255);
+	border: 1px solid rgb(46, 155, 255);
+}
+
+.text_21 {
+	margin-left: 0.14rem;
+	margin-right: 0.12rem;
+	max-width: 100%;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.image_11 {
+	width: 0.2rem;
+	height: 0.2rem;
+}
+
+.text_22 {
+	margin: 0.05rem 0 0.04rem 0.09rem;
+}
+
+.image_10 {
+	width: 0.4rem;
+	height: 0.4rem;
+}
+
+.group_2 {
+	margin-left: 0.11rem;
+	margin-bottom: 0.045rem;
+	flex: 1 1 auto;
+}
+
+.group_3 {
+	padding-left: 0.01rem;
+	display: flex;
+	align-items: center;
+}
+
+.text_18 {
+	// margin-top: 0.055rem;
+	color: rgb(177, 179, 182);
+	font-size: 0.12rem;
+	// line-height: 0.12rem;
+	// letter-spacing: 0.012rem;
+	white-space: nowrap;
+	margin-left: 10rpx;
+}
+
+.text_16 {
+	margin-bottom: 0.03rem;
+	color: rgb(2, 2, 2);
+	font-size:28rpx;
+	// line-height: 0.14rem;
+	// letter-spacing: 0.015rem;
+	white-space: nowrap;
+}
+
+.text-wrapper_1 {
+	margin-left: 0.04rem;
+	padding: 0.03rem 0 0.04rem;
+	color: rgb(46, 155, 255);
+	font-size: 0.12rem;
+	line-height: 0.12rem;
+	letter-spacing: 0.012rem;
+	white-space: nowrap;
+	background-color: rgba(46, 155, 255, 0.1);
+	border-radius: 0.09rem;
+	width: 0.65rem;
+	height: 0.18rem;
+}
+</style>
diff --git a/pages/message/msgList/msgList copy.vue b/pages/message/msgList/msgList copy.vue
new file mode 100644
index 0000000..a40640c
--- /dev/null
+++ b/pages/message/msgList/msgList copy.vue	
@@ -0,0 +1,938 @@
+<template>
+	<view>
+		<u-navbar :is-back="false" title="">
+			<view class="slot-wrap">
+				<u-tabs-swiper ref="uTabs" :list="navList" :current="current" :is-scroll="false"
+					:active-item-style="{ color: '#3CB5FB', fontSize: '0.18rem' }"
+					:bar-style="{ background: '#3CB5FB' }" @change="tabsChange"></u-tabs-swiper>
+			</view>
+		</u-navbar>
+		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
+			style="height: calc(100vh - 0.95rem); width: 100%">
+			<swiper-item class="swiper-item" v-for="(item, index) in navList" :key="index"
+				style="height: calc(100vh - 0.95rem); width: 100%">
+				<scroll-view scroll-y="true" style="height: calc(100vh - 0.95rem); width: 100%"
+					@scrolltolower="onreachBottom">
+					<!-- 消息 -->
+					<view class="msg" v-if="index == 0">
+						<view class="flex-col renzheng" v-if="!vuex_user.isAttestationXY&&false">
+							<view class="flex-col section_4">
+								<view class="flex-row section_5">
+									<text class="text_3">待认证，请先完成认证~</text>
+									<text class="text_4" @click="onAuto">去认证 >></text>
+								</view>
+							</view>
+							<view class="flex-col group_3">
+								<view class="flex-col">
+									<image src="/static/common/img/16535374500948048054.png" class="image_1" />
+								</view>
+								<text class="text_5">暂无数据，请尽快认证补充资料~</text>
+							</view>
+						</view>
+						<view class="flex-col group_2">
+							<view class="flex-col list">
+								<navigator url="../adminList/adminList" class="list-item flex-row"
+									style='box-shadow: 0px 0.005rem #eaeaea;' v-if='vuex_user.isAttestationGLY'>
+									<u-avatar class="image_1" :show-sex="vuex_msgList.indexOf('admin')>=0" sex-icon=""
+										size="0.4rem" sex-bg-color="red" mode="circle"
+										src="/static/common/img/adminHeaderImg.png">
+									</u-avatar>
+									<view class="right-section flex-col">
+										<view class="top-group justify-between">
+											<text class="text_2">管理列表</text>
+											<!-- <text class="text_4">8:52</text> -->
+										</view>
+										<text class="text_6" v-if="vuex_msgList.indexOf('admin')>=0">你有新通知</text>
+										<text class="text_6" v-else>暂无新通知</text>
+									</view>
+								</navigator>
+								<navigator v-if='interInfo' url="../interactionList/interactionList"
+									class="list-item flex-row" style='box-shadow: 0px 0.005rem #eaeaea;'>
+									<u-avatar class="image_1" :show-sex="vuex_msgList.indexOf('InteractMessage')>=0"
+										sex-icon="" size="0.4rem" sex-bg-color="red" mode="circle"
+										src="/static/common/img/interactionhiderimg.png"></u-avatar>
+									<view class="right-section flex-col">
+										<view class="top-group justify-between">
+											<text class="text_2">互动消息</text>
+											<view style='display:none'>
+												{{interInfo.interDate?interInfo.interDate = interInfo.interDate.replace(/-/g, "/"):''}}
+											</view>
+											<text
+												v-if='new Date(interInfo.interDate) - 0 + (3600000*24)> new Date()&&new Date(interInfo.interDate).getDate()==new Date().getDate()'
+												class="text_4">{{interInfo.interDate.slice(10,16)}}</text>
+											<text v-else class="text_4">{{ interInfo.interDate.slice(5,10)}}</text>
+											<!-- <text class="text_4">{{interInfo.interDate}}</text> -->
+										</view>
+										<text v-if='interInfo.interType==0'
+											class="text_4 text_15">{{interInfo.interUserName+' 点赞了 '+interInfo.dynamicTitle}}</text>
+										<text v-if='interInfo.interType==1'
+											class="text_4 text_15">{{interInfo.interUserName+' 收藏了 '+interInfo.dynamicTitle}}</text>
+										<text v-if='interInfo.interType==2'
+											class="text_4 text_15">{{interInfo.interUserName+' 转发了 '+interInfo.dynamicTitle}}</text>
+										<text v-if='interInfo.interType==3'
+											class="text_4 text_15">{{interInfo.interUserName+' 评论了 '+interInfo.dynamicTitle}}</text>
+									</view>
+								</navigator>
+								<navigator v-if='sysInfo' url="../sysList/sysList" class="list-item flex-row group_4">
+									<u-avatar class="image_1" :show-sex="vuex_msgList.indexOf('SystemMessage')>=0"
+										sex-icon="" size="0.4rem" sex-bg-color="red" mode="circle"
+										src="/static/common/img/systemHeaderimg.png">
+									</u-avatar>
+									<view class="right-section flex-col view_2">
+										<view class="top-group justify-between view_3">
+											<text class="text_2 text_8">系统消息</text>
+											<view style='display:none'>
+												{{sysInfo.messageDate?sysInfo.messageDate = sysInfo.messageDate.replace(/-/g, "/"):''}}
+											</view>
+											<text
+												v-if='new Date(sysInfo.messageDate) - 0 + (3600000*24)> new Date()&&new Date(sysInfo.messageDate).getDate()==new Date().getDate()'
+												class="text_6 text_16">{{ sysInfo.messageDate.slice(10,16)}}</text>
+											<text v-else class="text_6 text_16">{{
+												sysInfo.messageDate.slice(5,10)}}</text>
+										</view>
+										<text class="text_4 text_15">{{sysInfo.title}} </text>
+									</view>
+								</navigator>
+                <view v-if="!sysInfo" style="margin-top:20vh;display: flex;justify-content: center;align-items: center;flex-direction: column;" >
+                  <image src="/static/common/img/empty.png" class="image" />
+                  <view style="color:grey;margin-top: -5vh;">暂无消息</view>
+                </view>
+								<template v-for="(v, i) in UserMsgList">
+									<view class="list-item flex-row group_5" :key="i"
+										@click="GoChat(v.userId,v.chatType,v.userHead)">
+										<u-avatar v-if='v.chatType==0' class="image_1"
+											:show-sex="vuex_msgList.indexOf(v.userId+',')>=0" sex-icon="" size="0.4rem"
+											sex-bg-color="red" mode="circle" :src="$u.http.config.imgUrl+v.userHead">
+										</u-avatar>
+										<u-avatar v-else class="image_1" :show-sex="vuex_msgList.indexOf('admin,')>=0"
+											sex-icon="" size="0.4rem" sex-bg-color="red" mode="circle"
+											:src="$u.http.config.imgUrl+v.userHead">
+										</u-avatar>
+										<view class="right-section justify-between view_4">
+											<view class="top-group flex-col view_5">
+												<view class="text_2 flex-row view_6">
+													<text class="text_11">{{v.userNetName}}</text>
+													<view class="right-text-wrapper flex-col items-end">
+														<text class="text_13">{{ v.userSchoolName }}</text>
+													</view>
+												</view>
+												<text class="text_4 text_15">{{v.message}}</text>
+											</view>
+											<view style='display:none'>
+												{{v.sendDate?v.sendDate = v.sendDate.replace(/-/g, "/"):''}}</view>
+											<text
+												v-if='new Date(v.sendDate) - 0 + (3600000*24)> new Date()&&new Date(v.sendDate).getDate()==new Date().getDate()'
+												class="text_6 text_16">{{ v.sendDate.slice(10,16)}}</text>
+											<text v-else class="text_6 text_16">{{ v.sendDate.slice(5,10)}}</text>
+										</view>
+									</view>
+								</template>
+							</view>
+						</view>
+
+					</view>
+					<!-- 关注 -->
+					<view class="guanzhu" v-else>
+						<view class="flex-col renzheng" v-if="!vuex_user.isAttestationXY&&false">
+							<view class="flex-col section_4">
+								<view class="flex-row section_5">
+									<text class="text_3">待认证，请先完成认证~</text>
+									<text class="text_4" @click="onAuto">去认证 >></text>
+								</view>
+							</view>
+							<view class="flex-col group_3">
+								<view class="flex-col">
+									<image src="/static/common/img/16535374500948048054.png" class="image_1" />
+								</view>
+								<text class="text_5">暂无数据，请尽快认证补充资料~</text>
+							</view>
+						</view>
+						<view class="flex-col group_2">
+							<view class="flex-col list">
+								<!-- <view class="list-item flex-row group_3">
+									<view class="flex-col items-end text-wrapper text_3">
+										<text class="text_2">浙</text>
+									</view>
+									<view class="bottom-text-wrapper justify-between view_1">
+										<text class="text_5 text_7">学校管理员</text>
+										<view class="center-text-wrapper flex-col items-end">
+											<text class="text_8">浙江大学</text>
+										</view>
+									</view>
+								</view> -->
+								<view class="list-item flex-row group_3" v-for="(item,index) in UserFollowList"
+									:key='index' @click='toDetail(item.carewUserId,item.userRole,item.carewUserHead)'>
+									<u-avatar :src="$u.http.config.imgUrl+item.carewUserHead" class="text_3 image_1"></u-avatar>
+									<view class="bottom-text-wrapper justify-between view_1">
+										<view class="">
+											<text
+												class="text_5 text_7"><text>{{item.carewUserName}}</text><text>{{"("+item.carewName+")"}}</text></text>
+											<view class="center-text-wrapper flex-col items-end">
+												<text class="text_8">{{item.school}}</text>
+											</view>
+										</view>
+										<view v-if='item.carewType==2&&item.carewName!="管理员"'
+											class="right-text-wrapper flex-col items-center">
+											<text class="text_10">互相关注</text>
+										</view>
+										<view v-if='item.carewType==1&&item.carewName!="管理员"'
+											class="right-text-wrapper flex-col items-center view_21">
+											<text class="text_10">已关注</text>
+										</view>
+									</view>
+								</view>
+                <view v-if="!UserFollowList.length" style="margin-top:20vh;display: flex;justify-content: center;align-items: center;flex-direction: column;" >
+                  <image src="/static/common/img/empty.png" class="image" />
+                  <view style="color:grey;margin-top: -5vh;">暂无关注</view>
+                </view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<u-tabbar :list="vuex_tabbar" :class="{phone:vuex_iPhone}"></u-tabbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabbar: "",
+				swiperCurrent: 0,
+				current: 0,
+				UserMsgList: [],
+				UserFollowList: [],
+				navList: [{
+						name: "消息",
+					},
+					{
+						name: "关注",
+					},
+				],
+				interInfo: '',
+				sysInfo: '',
+			};
+		},
+		watch: {
+			current() {
+				this.getList();
+			},
+		},
+		created() {
+      // 和onShow 重复
+			// this.getList()
+		},
+		onLoad() {
+			//接收数据
+			this.$connection.on("ReceiveMessage", (user, message) => {
+				this.getList()
+			});
+			this.$connection.on("InteractMessage", (data, type) => {
+				this.getList()
+			});
+			this.$connection.on("SystemMessage", (title, content, time) => {
+				this.getList()
+			});
+		},
+		onShow() {
+			this.getList()
+
+		},
+		methods: {
+			toDetail(id, role, head) {
+				if (role == 0) {
+					this.$u.route({
+						url: '/pages/AlumniCircle/userDetail/userDetail?id=' + id + '&type=0'
+					})
+				} else {
+					uni.navigateTo({
+						url: "../dialogBox/dialogBox?id=" + id + '&chatType=1&type=0&head=' + head,
+					});
+				}
+			},
+			getList() {
+				if (this.current == 0) {
+					this.charList();
+				} else {
+					this.FollowList();
+				}
+			},
+			onAuto() {
+				this.$u.route({
+					url: "pages/my/ShoolList/ShoolList"
+				})
+			},
+			charList() {
+				const data = {
+					id: this.vuex_user.id,
+					userRole: this.vuex_user.isAttestationGLY ? 1 : 0
+				}
+				this.$u.api.getcharList(data).then(res => {
+					this.UserMsgList = res
+				})
+				this.$u.api.getinteractionList().then(res => {
+					this.interInfo = res[0]
+				})
+				this.$u.api.getSysList().then(res => {
+					this.sysInfo = res[0]
+				})
+			},
+			FollowList() {
+				this.$u.api.getFollowList().then(res => {
+
+					this.UserFollowList = res
+				})
+			},
+			//   去聊天
+			GoChat(id, chatType, head) {
+				uni.navigateTo({
+					url: "../dialogBox/dialogBox?id=" + id + '&chatType=' + chatType + '&type=0&head=' + head,
+				});
+			},
+			// tabs通知swiper切换
+			tabsChange(index) {
+				this.swiperCurrent = index;
+			},
+			// swiper-item左右移动，通知tabs的滑块跟随移动
+			transition(e) {
+				let dx = e.detail.dx;
+				this.$refs.uTabs.setDx(dx);
+			},
+			// 由于swiper的内部机制问速切题，快换swiper不会触发dx的连续变化，需要在结束时重置状态
+			// swiper滑动结束，分别设置tabs和swiper的状态
+			animationfinish(e) {
+				let current = e.detail.current;
+				this.$refs.uTabs.setFinishCurrent(current);
+				this.swiperCurrent = current;
+				this.current = current;
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-avatar__sex {
+		width: 0.1rem !important;
+		height: 0.1rem !important;
+		border: none;
+	}
+
+	.msg {
+		.list-item {
+			padding-left: 0.2rem;
+		}
+
+		.image_1 {
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+			border-radius: 50%;
+		}
+
+		.right-section {
+			margin-left: 0.15rem;
+			padding: 0.14rem 0 0.18rem;
+			flex: 1 1 auto;
+			height: 0.66rem;
+		}
+
+		.top-group {
+			margin-right: 0.1rem;
+		}
+
+		.text_6 {
+			margin-top: 0.09rem;
+			color: rgb(180, 182, 189);
+			font-size: 0.12rem;
+			line-height: 0.12rem;
+			letter-spacing: 0.012rem;
+			white-space: nowrap;
+		}
+
+		.text_2 {
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+
+		.text_4 {
+			margin-bottom: 0.05rem;
+			color: rgb(193, 196, 204);
+			font-size: 0.12rem;
+			line-height: 0.095rem;
+			letter-spacing: 0.012rem;
+			white-space: nowrap;
+		}
+
+		.text_11 {
+			margin-bottom: 0.03rem;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+			max-width: 1rem;
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+
+		.right-text-wrapper {
+			padding: 0.035rem 0.08rem;
+			color: rgb(115, 129, 255);
+			margin-left: 0.1rem;
+			font-size: 0.11rem;
+			line-height: 0.11rem;
+			letter-spacing: 0.011rem;
+			white-space: nowrap;
+			background-color: rgba(115, 129, 255, 0.1);
+			border-radius: 0.09rem;
+			height: 0.18rem;
+		}
+
+		.text_13 {
+			margin-right: 0.03rem;
+		}
+
+		//   .group_2 {
+		//     padding-bottom: 0.15rem;
+		//     flex: 1 1 auto;
+		//     overflow-y: auto;
+		//   }
+
+		.group_4 {
+			padding: 0 0.01rem;
+			padding-left: 0.2rem;
+			box-shadow: 0px 0.005rem #eaeaea;
+		}
+
+		.group_5 {
+			padding-left: 0.2rem;
+			margin-top: 0.015rem;
+			box-shadow: 0px 0.005rem #eaeaea;
+		}
+
+		.group_4:active,
+		.group_5:active {
+			background: #efefef;
+		}
+
+		.group_8 {
+			padding-left: initial;
+		}
+
+		.view_2 {
+			margin-left: 0.15rem;
+			padding: 0.15rem 0 0.14rem;
+			height: 0.67rem;
+		}
+
+		.view_4 {
+			margin-left: 0.16rem;
+			padding: 0.15rem 0 0.14rem;
+			height: 0.67rem;
+		}
+
+		.view_3 {
+			margin-right: initial;
+		}
+
+		.view_5 {
+			margin-right: initial;
+		}
+
+		.text_16 {
+			margin-top: 0.0rem;
+			color: rgb(193, 196, 204);
+			line-height: 0.095rem;
+			margin-right: 0.095rem;
+		}
+
+		.text_28 {
+			margin-top: initial;
+			position: absolute;
+			left: 0;
+			bottom: 0.17rem;
+		}
+
+		.text_8 {
+			line-height: 0.14rem;
+		}
+
+		.text_9 {
+			margin-right: 0.025rem;
+		}
+
+		.view_6 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+		}
+
+		.text_15 {
+			margin-bottom: initial;
+			color: rgb(180, 182, 189);
+			line-height: 1.2;
+			margin-top: 0.08rem;
+			width: 50%;
+			overflow: hidden;
+			display: block;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+
+		.view_19 {
+			margin-left: 0.045rem;
+		}
+	}
+
+	.guanzhu {
+		.list-item {
+			padding: 0.14rem 0 0.1rem;
+			align-self: flex-end;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			width: 3.02rem;
+			position: relative;
+		}
+
+		.text_3 {
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+
+		.bottom-text-wrapper {
+			margin-top: 0.1rem;
+			padding: 0.035rem 0;
+			color: rgb(115, 129, 255);
+			font-size: 0.11rem;
+			line-height: 0.11rem;
+			letter-spacing: 0.011rem;
+			white-space: nowrap;
+			background-color: rgba(115, 129, 255, 0.1);
+			border-radius: 0.09rem;
+		}
+
+		.text_5 {
+			margin-left: 0.1rem;
+			margin-right: 0.03rem;
+		}
+
+		.center-text-wrapper {
+			padding: 0.035rem 0.08rem;
+			color: rgb(115, 129, 255);
+			font-size: 0.11rem;
+			line-height: 0.11rem;
+			letter-spacing: 0.011rem;
+			white-space: nowrap;
+			background-color: rgba(115, 129, 255, 0.1);
+			border-radius: 0.09rem;
+			display: inline-block;
+			margin-top: 0.1rem;
+		}
+
+		.right-text-wrapper {
+			margin-right: 0.06rem;
+			margin-top: 0.03rem;
+			margin-left: 0.06rem;
+			padding: 0.085rem 0.08rem;
+			color: rgb(255, 255, 255);
+			font-size: 0.14rem;
+			line-height: 0.13rem;
+			white-space: nowrap;
+			background-color: rgb(46, 155, 255);
+			border-radius: 0.15rem;
+			width: 0.85rem;
+			height: 0.3rem;
+			position: relative;
+		}
+
+		.text_8 {
+			margin-right: 0.03rem;
+		}
+
+		.text_10 {
+			text-transform: uppercase;
+		}
+
+		.text_12 {
+			margin-left: 0.05rem;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+
+		.text_14 {
+			margin-left: 0.1rem;
+			margin-right: 0.03rem;
+		}
+
+		.group_2 {
+			// padding: 0.11rem 0 4.94rem;
+			// flex: 1 1 auto;
+			// overflow-y: auto;
+			position: relative;
+		}
+
+		.text-wrapper {
+			// margin-left: 0.17rem;
+			padding: 0.11rem 0 0.12rem;
+			color: rgb(255, 255, 255);
+			font-size: 0.18rem;
+			line-height: 0.17rem;
+			letter-spacing: 0.018rem;
+			white-space: nowrap;
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+			width: 0.4rem;
+			height: 0.4rem;
+			margin-top: 0.08rem;
+			background: #6574fc;
+			border-radius: 50%;
+
+			text {
+				display: inline-block;
+				width: 100%;
+				text-align: center;
+			}
+		}
+
+		.list {}
+
+		.text_2 {
+			color: #fff;
+		}
+
+		.group_3 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+			box-shadow: 0px 0.005rem #eaeaea;
+			padding-left: 0.2rem;
+		}
+
+		.group_4 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+			margin-top: 0.015rem;
+		}
+
+		.group_5 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+
+		.group_6 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+
+		.group_7 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+
+		.group_8 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+
+		.group_9 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+
+		.image_1 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			width: 0.4rem;
+			height: 0.4rem;
+			border-radius: 50%;
+			overflow: hidden;
+			margin-top: 0.12rem;
+		}
+
+		.view_1 {
+			margin-top: initial;
+			padding: 0.1rem 0;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.12rem;
+			margin-right: 0.04rem;
+			flex: 1 1 auto;
+			position: relative;
+		}
+
+		.image_2 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+
+		.view_4 {
+			margin-top: initial;
+			padding: 0.14rem 0 0.1rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.12rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		}
+
+		.image_3 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+
+		.view_8 {
+			margin-top: initial;
+			padding: 0.15rem 0 0.14rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.13rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		}
+
+		.image_4 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+
+		.view_12 {
+			margin-top: initial;
+			padding: 0.17rem 0 0.08rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.12rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		}
+
+		.image_5 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+
+		.view_16 {
+			margin-top: initial;
+			padding: 0.15rem 0 0.11rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.16rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			height: 0.67rem;
+		}
+
+		.image_6 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+
+		.view_19 {
+			margin-top: initial;
+			padding: 0.18rem 0 0.18rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.16rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			height: 0.67rem;
+			position: relative;
+
+		}
+
+		.text_7 {
+			margin-left: initial;
+			margin-right: initial;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+			display: block;
+
+			text:nth-child(1) {
+				display: inline-block;
+				white-space: nowrap;
+				max-width: 0.9rem;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				vertical-align: bottom;
+			}
+		}
+
+		.text_26 {
+			margin-left: initial;
+			margin-right: initial;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+
+		.view_20 {
+			left: -0.03rem;
+			bottom: 0.075rem;
+		}
+
+		.view_21 {
+			margin-right: 0.06rem;
+			margin-top: initial;
+			padding: 0.09rem 0 0.06rem;
+			color: rgb(73, 76, 87);
+			background-color: initial;
+			border: solid 0.01rem rgb(185, 185, 185);
+		}
+	}
+
+	.renzheng {
+		padding-bottom: 0rem;
+
+		.section_4 {
+			padding: 0.33rem 0 0.34rem;
+			background-color: rgb(255, 255, 255);
+
+			.section_5 {
+				margin-left: 0.18rem;
+				margin-right: 0.24rem;
+				padding: 0.2rem 0.18rem 0.18rem 0.24rem;
+				background-color: rgb(246, 247, 250);
+				justify-between: space-between;
+
+				.text_3 {
+					color: rgb(160, 162, 172);
+					font-size: 0.15rem;
+					line-height: 0.15rem;
+					letter-spacing: 0.015rem;
+					white-space: nowrap;
+				}
+
+				.text_4 {
+					margin-left: 0.05rem;
+					color: rgb(46, 155, 255);
+					font-size: 0.15rem;
+					line-height: 0.15rem;
+					white-space: nowrap;
+					text-transform: uppercase;
+				}
+			}
+		}
+
+		.group_3 {
+			margin-top: 0.76rem;
+			padding-left: 0.8rem;
+			padding-right: 0.69rem;
+			color: rgb(163, 182, 202);
+			font-size: 0.15rem;
+			line-height: 0.15rem;
+			white-space: nowrap;
+
+			.text_5 {
+				margin-left: 0.02rem;
+				margin-top: 0.13rem;
+			}
+
+			.image_1 {
+				margin-right: 0.14rem;
+				width: 2.12rem;
+				height: 1.89rem;
+			}
+		}
+	}
+</style>
diff --git a/pages/message/msgList/msgList.vue b/pages/message/msgList/msgList.vue
new file mode 100644
index 0000000..f7689f9
--- /dev/null
+++ b/pages/message/msgList/msgList.vue
@@ -0,0 +1,910 @@
+<template>
+	<view>
+		<view class="page-title">消息</view>
+		<view class="slot-wrap">
+			<!-- <u-tabs-swiper ref="uTabs" :list="navList" :current="current" :is-scroll="false"
+					:active-item-style="{ color: '#3CB5FB', fontSize: '0.18rem' }"
+					:bar-style="{ background: '#3CB5FB' }" @change="tabsChange"></u-tabs-swiper> -->
+					
+			<view class="tabs-item" v-for="(item, index) in navList" :key="index" @click="tabsClick(item.type)">
+				<image :src="item.image"></image>
+				<text>{{ item.name }}</text>
+			</view>
+		</view>
+		<!-- <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
+			style="height: calc(100vh - 2.1rem); width: 100%">
+			<swiper-item class="swiper-item" v-for="(item, index) in navList" :key="index"
+				style="height: calc(100vh - 2.1rem); width: 100%"> -->
+				<scroll-view scroll-y="true" style="height: calc(100vh - 2.5rem); width: 100%"
+					@scrolltolower="onreachBottom">
+					<!-- 消息 -->
+					<view class="msg" >
+						<view class="flex-col renzheng" v-if="!vuex_user.isAttestationXY && false">
+							<view class="flex-col section_4">
+								<view class="flex-row section_5">
+									<text class="text_3">待认证，请先完成认证~</text>
+									<text class="text_4" @click="onAuto">去认证 >></text>
+								</view>
+							</view>
+							<view class="flex-col group_3">
+								<view class="flex-col">
+									<image src="/static/common/img/16535374500948048054.png" class="image_1" />
+								</view>
+								<text class="text_5">暂无数据，请尽快认证补充资料~</text>
+							</view>
+						</view>
+						<view class="flex-col group_2">
+							<view class="flex-col list">
+								<navigator url="../adminList/adminList" class="list-item flex-row"
+									style='box-shadow: 0px 0.005rem #eaeaea;' v-if='vuex_user.isAttestationGLY'>
+									<u-avatar class="image_1" :show-sex="vuex_msgList.indexOf('admin') >= 0" sex-icon=""
+										size="0.4rem" sex-bg-color="red" mode="circle"
+										src="/static/common/img/adminHeaderImg.png">
+									</u-avatar>
+									<view class="right-section flex-col">
+										<view class="top-group justify-between">
+											<text class="text_2">管理列表</text>
+											<!-- <text class="text_4">8:52</text> -->
+										</view>
+										<text class="text_6" v-if="vuex_msgList.indexOf('admin') >= 0">你有新通知</text>
+										<text class="text_6" v-else>暂无管理消息</text>
+									</view>
+								</navigator>
+								<!-- <view v-if="!sysInfo"
+									style="margin-top:20vh;display: flex;justify-content: center;align-items: center;flex-direction: column;">
+									<image src="/static/common/img/empty.png" class="image" />
+									<view style="color:grey;margin-top: -5vh;">暂无消息</view>
+								</view> -->
+								<view v-if="UserMsgList.length">
+									<template v-for="(v, i) in UserMsgList" >
+										<view class="list-item flex-row group_5" :key="i"
+											@click="GoChat(v.userId, v.chatType, v.userHead)">
+											<u-avatar v-if='v.chatType == 0' class="image_1"
+												:show-sex="vuex_msgList.indexOf(v.userId + ',') >= 0" sex-icon=""
+												size="0.4rem" sex-bg-color="red" mode="circle"
+												:src="$u.http.config.imgUrl + v.userHead">
+											</u-avatar>
+											<u-avatar v-else class="image_1" :show-sex="vuex_msgList.indexOf('admin,') >= 0"
+												sex-icon="" size="0.4rem" sex-bg-color="red" mode="circle"
+												:src="$u.http.config.imgUrl + v.userHead">
+											</u-avatar>
+											<view class="right-section justify-between view_4">
+												<view class="top-group flex-col view_5">
+													<view class="text_2 flex-row view_6">
+														<text class="text_11">{{ v.userNetName }}</text>
+														<view class="right-text-wrapper flex-col items-end">
+															<text class="text_13">{{ v.userSchoolName }}</text>
+														</view>
+													</view>
+													<text class="text_4 text_15">{{ v.message }}</text>
+												</view>
+												<view style='display:none'>
+													{{ v.sendDate ? v.sendDate = v.sendDate.replace(/-/g, "/") : '' }}
+												</view>
+												<text
+													v-if='new Date(v.sendDate) - 0 + (3600000 * 24) > new Date() && new Date(v.sendDate).getDate() == new Date().getDate()'
+													class="text_6 text_16">{{ v.sendDate.slice(10, 16) }}</text>
+												<text v-else class="text_6 text_16">{{ v.sendDate.slice(5, 10) }}</text>
+											</view>
+										</view>
+									</template>
+								</view>
+								<no-data v-else type="message"></no-data>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			<!-- </swiper-item>
+		</swiper> -->
+		<u-tabbar
+		:list="vuex_tabbar"
+		:class="{ phone: vuex_iPhone }"
+		:active-color="vuex_tabbar_config.activeColor"
+		:inactive-color="vuex_tabbar_config.inactiveColor"
+		></u-tabbar>
+	</view>
+</template>
+
+<script>
+import noData from '@/components/NoData.vue'
+export default {
+	components: {
+    noData
+  },
+	data() {
+		return {
+			tabbar: "",
+			swiperCurrent: 0,
+			current: 0,
+			UserMsgList: [],
+			UserFollowList: [],
+			navList: [{
+				name: "互动消息",
+				image: "/static/common/img/message/interactive.png",
+				type: 0
+			},
+			{
+				name: "系统消息",
+				image: "/static/common/img/message/system.png",
+				type: 1
+			},
+			{
+				name: "新增关注",
+				image: "/static/common/img/message/attention.png",
+				type: 2
+			},
+			],
+			interInfo: '',
+			sysInfo: '',
+		};
+	},
+	watch: {
+		current() {
+			this.getList();
+		},
+	},
+	created() {
+		// 和onShow 重复
+		// this.getList()
+	},
+	onLoad() {
+		//接收数据
+		this.$connection.on("ReceiveMessage", (user, message) => {
+			this.getList()
+		});
+		this.$connection.on("InteractMessage", (data, type) => {
+			this.getList()
+		});
+		this.$connection.on("SystemMessage", (title, content, time) => {
+			this.getList()
+		});
+	},
+	onShow() {
+		this.getList()
+
+	},
+	methods: {
+		tabsClick(type) {
+			switch (type) {
+				case 0:
+				this.$u.route({url:'/pages/message/interactionList/interactionList'})
+					break;
+				case 1:
+				this.$u.route({url:'/pages/message/sysList/sysList'})
+					break;
+				case 2:
+				this.$u.route({url:'/pages/message/attentionList/attentionList'})
+					break;
+
+			}
+		},
+		toDetail(id, role, head) {
+			if (role == 0) {
+				this.$u.route({
+					url: '/pages/AlumniCircle/userDetail/userDetail?id=' + id + '&type=0'
+				})
+			} else {
+				uni.navigateTo({
+					url: "../dialogBox/dialogBox?id=" + id + '&chatType=1&type=0&head=' + head,
+				});
+			}
+		},
+		getList() {
+			if (this.current == 0) {
+				this.charList();
+			} else {
+				this.FollowList();
+			}
+		},
+		onAuto() {
+			this.$u.route({
+				url: "pages/my/ShoolList/ShoolList"
+			})
+		},
+		charList() {
+			const data = {
+				id: this.vuex_user.id,
+				userRole: this.vuex_user.isAttestationGLY ? 1 : 0
+			}
+			this.$u.api.getcharList(data).then(res => {
+				this.UserMsgList = res
+			})
+			this.$u.api.getinteractionList(-1).then(res => {
+				this.interInfo = res[0]
+			})
+			this.$u.api.getSysList().then(res => {
+				this.sysInfo = res[0]
+			})
+		},
+		FollowList() {
+			this.$u.api.getFollowList().then(res => {
+
+				this.UserFollowList = res
+			})
+		},
+		//   去聊天
+		GoChat(id, chatType, head) {
+			uni.navigateTo({
+				url: "../dialogBox/dialogBox?id=" + id + '&chatType=' + chatType + '&type=0&head=' + head,
+			});
+		},
+		// tabs通知swiper切换
+		tabsChange(index) {
+			this.swiperCurrent = index;
+		},
+		// swiper-item左右移动，通知tabs的滑块跟随移动
+		transition(e) {
+			let dx = e.detail.dx;
+			this.$refs.uTabs.setDx(dx);
+		},
+		// 由于swiper的内部机制问速切题，快换swiper不会触发dx的连续变化，需要在结束时重置状态
+		// swiper滑动结束，分别设置tabs和swiper的状态
+		animationfinish(e) {
+			let current = e.detail.current;
+			this.$refs.uTabs.setFinishCurrent(current);
+			this.swiperCurrent = current;
+			this.current = current;
+		},
+		// scroll-view到底部加载更多
+		onreachBottom() { },
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .u-avatar__sex {
+	width: 0.1rem !important;
+	height: 0.1rem !important;
+	border: none;
+}
+
+.msg {
+	.list-item {
+		padding-left: 0.2rem;
+	}
+
+	.image_1 {
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+		border-radius: 50%;
+	}
+
+	.right-section {
+		margin-left: 0.15rem;
+		padding: 0.14rem 0 0.18rem;
+		flex: 1 1 auto;
+		height: 0.66rem;
+	}
+
+	.top-group {
+		margin-right: 0.1rem;
+	}
+
+	.text_6 {
+		margin-top: 0.09rem;
+		color: rgb(180, 182, 189);
+		font-size: 0.12rem;
+		line-height: 0.12rem;
+		letter-spacing: 0.012rem;
+		white-space: nowrap;
+	}
+
+	.text_2 {
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.text_4 {
+		margin-bottom: 0.05rem;
+		color: rgb(193, 196, 204);
+		font-size: 0.12rem;
+		line-height: 0.095rem;
+		letter-spacing: 0.012rem;
+		white-space: nowrap;
+	}
+
+	.text_11 {
+		// margin-bottom: 0.03rem;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 36rpx;
+		// letter-spacing: 0.015rem;
+		white-space: nowrap;
+		max-width: 1rem;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.right-text-wrapper {
+		padding: 0.035rem 0.08rem;
+		color: #3CB5FB;
+		margin-left: 0.1rem;
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		background-color: rgba(60,181,251,0.1);
+		border-radius: 0.09rem;
+		height: 0.18rem;
+	}
+
+	.text_13 {
+		margin-right: 0.03rem;
+	}
+
+	//   .group_2 {
+	//     padding-bottom: 0.15rem;
+	//     flex: 1 1 auto;
+	//     overflow-y: auto;
+	//   }
+
+	.group_4 {
+		padding: 0 0.01rem;
+		padding-left: 0.2rem;
+		box-shadow: 0px 0.005rem #eaeaea;
+	}
+
+	.group_5 {
+		padding-left: 0.2rem;
+		margin-top: 0.015rem;
+		box-shadow: 0px 0.005rem #eaeaea;
+	}
+
+	.group_4:active,
+	.group_5:active {
+		background: #efefef;
+	}
+
+	.group_8 {
+		padding-left: initial;
+	}
+
+	.view_2 {
+		margin-left: 0.15rem;
+		padding: 0.15rem 0 0.14rem;
+		height: 0.67rem;
+	}
+
+	.view_4 {
+		margin-left: 0.16rem;
+		padding: 0.15rem 0 0.14rem;
+		height: 0.67rem;
+	}
+
+	.view_3 {
+		margin-right: initial;
+	}
+
+	.view_5 {
+		margin-right: initial;
+	}
+
+	.text_16 {
+		margin-top: 0.0rem;
+		color: rgb(193, 196, 204);
+		line-height: 0.095rem;
+		margin-right: 0.095rem;
+	}
+
+	.text_28 {
+		margin-top: initial;
+		position: absolute;
+		left: 0;
+		bottom: 0.17rem;
+	}
+
+	.text_8 {
+		line-height: 0.14rem;
+	}
+
+	.text_9 {
+		margin-right: 0.025rem;
+	}
+
+	.view_6 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+	}
+
+	.text_15 {
+		margin-bottom: initial;
+		color: rgb(180, 182, 189);
+		line-height: 1.2;
+		margin-top: 0.08rem;
+		width: 50%;
+		overflow: hidden;
+		display: block;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.view_19 {
+		margin-left: 0.045rem;
+	}
+}
+
+.guanzhu {
+	.list-item {
+		padding: 0.14rem 0 0.1rem;
+		align-self: flex-end;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		width: 3.02rem;
+		position: relative;
+	}
+
+	.text_3 {
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.bottom-text-wrapper {
+		margin-top: 0.1rem;
+		padding: 0.035rem 0;
+		color: rgb(115, 129, 255);
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		background-color: rgba(115, 129, 255, 0.1);
+		border-radius: 0.09rem;
+	}
+
+	.text_5 {
+		margin-left: 0.1rem;
+		margin-right: 0.03rem;
+	}
+
+	.center-text-wrapper {
+		padding: 0.035rem 0.08rem;
+		color: rgb(115, 129, 255);
+		font-size: 0.11rem;
+		line-height: 0.11rem;
+		letter-spacing: 0.011rem;
+		white-space: nowrap;
+		background-color: rgba(115, 129, 255, 0.1);
+		border-radius: 0.09rem;
+		display: inline-block;
+		margin-top: 0.1rem;
+	}
+
+	.right-text-wrapper {
+		margin-right: 0.06rem;
+		margin-top: 0.03rem;
+		margin-left: 0.06rem;
+		padding: 0.085rem 0.08rem;
+		color: rgb(255, 255, 255);
+		font-size: 0.14rem;
+		line-height: 0.13rem;
+		white-space: nowrap;
+		background-color: rgb(46, 155, 255);
+		border-radius: 0.15rem;
+		width: 0.85rem;
+		height: 0.3rem;
+		position: relative;
+	}
+
+	.text_8 {
+		margin-right: 0.03rem;
+	}
+
+	.text_10 {
+		text-transform: uppercase;
+	}
+
+	.text_12 {
+		margin-left: 0.05rem;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.text_14 {
+		margin-left: 0.1rem;
+		margin-right: 0.03rem;
+	}
+
+	.group_2 {
+		// padding: 0.11rem 0 4.94rem;
+		// flex: 1 1 auto;
+		// overflow-y: auto;
+		position: relative;
+	}
+
+	.text-wrapper {
+		// margin-left: 0.17rem;
+		padding: 0.11rem 0 0.12rem;
+		color: rgb(255, 255, 255);
+		font-size: 0.18rem;
+		line-height: 0.17rem;
+		letter-spacing: 0.018rem;
+		white-space: nowrap;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		width: 0.4rem;
+		height: 0.4rem;
+		margin-top: 0.08rem;
+		background: #6574fc;
+		border-radius: 50%;
+
+		text {
+			display: inline-block;
+			width: 100%;
+			text-align: center;
+		}
+	}
+
+	.list {}
+
+	.text_2 {
+		color: #fff;
+	}
+
+	.group_3 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+		box-shadow: 0px 0.005rem #eaeaea;
+		padding-left: 0.2rem;
+	}
+
+	.group_4 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+		margin-top: 0.015rem;
+	}
+
+	.group_5 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_6 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_7 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_8 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.group_9 {
+		padding: initial;
+		align-self: initial;
+		box-shadow: initial;
+		width: initial;
+		position: initial;
+	}
+
+	.image_1 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		width: 0.4rem;
+		height: 0.4rem;
+		border-radius: 50%;
+		overflow: hidden;
+		margin-top: 0.12rem;
+	}
+
+	.view_1 {
+		margin-top: initial;
+		padding: 0.1rem 0;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.12rem;
+		margin-right: 0.04rem;
+		flex: 1 1 auto;
+		position: relative;
+	}
+
+	.image_2 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_4 {
+		margin-top: initial;
+		padding: 0.14rem 0 0.1rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.12rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+	}
+
+	.image_3 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_8 {
+		margin-top: initial;
+		padding: 0.15rem 0 0.14rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.13rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+	}
+
+	.image_4 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_12 {
+		margin-top: initial;
+		padding: 0.17rem 0 0.08rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.12rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+	}
+
+	.image_5 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_16 {
+		margin-top: initial;
+		padding: 0.15rem 0 0.11rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.16rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		height: 0.67rem;
+	}
+
+	.image_6 {
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		align-self: center;
+		width: 0.4rem;
+		height: 0.4rem;
+	}
+
+	.view_19 {
+		margin-top: initial;
+		padding: 0.18rem 0 0.18rem;
+		color: initial;
+		font-size: initial;
+		line-height: initial;
+		letter-spacing: initial;
+		white-space: initial;
+		background-color: initial;
+		border-radius: initial;
+		margin-left: 0.16rem;
+		flex: 1 1 auto;
+		box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		height: 0.67rem;
+		position: relative;
+
+	}
+
+	.text_7 {
+		margin-left: initial;
+		margin-right: initial;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+		display: block;
+
+		text:nth-child(1) {
+			display: inline-block;
+			white-space: nowrap;
+			max-width: 0.9rem;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			vertical-align: bottom;
+		}
+	}
+
+	.text_26 {
+		margin-left: initial;
+		margin-right: initial;
+		color: rgb(2, 2, 2);
+		font-size: 0.15rem;
+		line-height: 0.14rem;
+		letter-spacing: 0.015rem;
+		white-space: nowrap;
+	}
+
+	.view_20 {
+		left: -0.03rem;
+		bottom: 0.075rem;
+	}
+
+	.view_21 {
+		margin-right: 0.06rem;
+		margin-top: initial;
+		padding: 0.09rem 0 0.06rem;
+		color: rgb(73, 76, 87);
+		background-color: initial;
+		border: solid 0.01rem rgb(185, 185, 185);
+	}
+}
+
+.renzheng {
+	padding-bottom: 0rem;
+
+	.section_4 {
+		padding: 0.33rem 0 0.34rem;
+		background-color: rgb(255, 255, 255);
+
+		.section_5 {
+			margin-left: 0.18rem;
+			margin-right: 0.24rem;
+			padding: 0.2rem 0.18rem 0.18rem 0.24rem;
+			background-color: rgb(246, 247, 250);
+			justify-between: space-between;
+
+			.text_3 {
+				color: rgb(160, 162, 172);
+				font-size: 0.15rem;
+				line-height: 0.15rem;
+				letter-spacing: 0.015rem;
+				white-space: nowrap;
+			}
+
+			.text_4 {
+				margin-left: 0.05rem;
+				color: rgb(46, 155, 255);
+				font-size: 0.15rem;
+				line-height: 0.15rem;
+				white-space: nowrap;
+				text-transform: uppercase;
+			}
+		}
+	}
+
+	.group_3 {
+		margin-top: 0.76rem;
+		padding-left: 0.8rem;
+		padding-right: 0.69rem;
+		color: rgb(163, 182, 202);
+		font-size: 0.15rem;
+		line-height: 0.15rem;
+		white-space: nowrap;
+
+		.text_5 {
+			margin-left: 0.02rem;
+			margin-top: 0.13rem;
+		}
+
+		.image_1 {
+			margin-right: 0.14rem;
+			width: 2.12rem;
+			height: 1.89rem;
+		}
+	}
+}
+.page-title{
+	padding: 50rpx ;
+	color: #000;
+	font-size: 36rpx;
+	font-weight: 800;
+	background: #ceedff;  /* fallback for old browsers */
+	background: -webkit-linear-gradient(to top,#f6f7fa,  #ceedff);  /* Chrome 10-25, Safari 5.1-6 */
+	background: linear-gradient(to top,#f6f7fa,  #ceedff); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+
+}
+
+.slot-wrap {
+	// height: 220rpx;
+	display: flex;
+	width: 100%;
+	justify-content: space-between;
+	padding: 0 60rpx;
+	margin-bottom: 40rpx;
+}
+
+.tabs-item {
+	width: 112rpx;
+	height: 168rpx;
+	// padding-top: 50rpx;
+	// margin-bottom: 50rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+
+	image {
+		width: 104rpx;
+		height: 104rpx;
+		margin-bottom: 20rpx;
+	}
+}
+</style>
diff --git a/pages/message/sysList/sysList.vue b/pages/message/sysList/sysList.vue
new file mode 100644
index 0000000..3b14681
--- /dev/null
+++ b/pages/message/sysList/sysList.vue
@@ -0,0 +1,175 @@
+<template>
+  <view>
+    <u-navbar back-text="" title="系统消息"></u-navbar>
+    <scroll-view scroll-y="true" class="scroll">
+      <view class="flex-col list" v-if='list.length'>
+        <view class="list-item flex-col group_1" :key="i" v-for="(item, i) in list">
+          <view class="items-title">
+            <image src="/static/common/img/message/system.png" mode=""></image>
+            <view class="title-time">
+              <text class="title-text">系统消息</text>
+              <text class="text_1">{{ item.messageDate }}</text>
+            </view>
+          </view>
+          <view class="bottom-section flex-col">
+            <text class="text_3">{{ item.title }}</text>
+            <text class="text_5">{{ item.message.split(',未通过原因:')[0] }}</text>
+            <text v-if="item.message.split(',未通过原因:').length >= 2" class="text_6">驳回理由：<text>{{
+              item.message.split(',未通过原因:')[1] }}</text></text>
+          </view>
+        </view>
+      </view>
+      <view v-else style='padding-top:30vh'>
+        <no-data text="暂无系统消息"></no-data>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import noData from '@/components/NoData.vue';
+export default {
+  components: {
+    noData
+  },
+  data() {
+    return {
+      list: []
+    };
+  },
+  onLoad() {
+    this.getList()
+    //接收系统消息
+    this.$connection.on("SystemMessage", (title, content, time) => {
+      if (this.route.indexOf('sysList') >= 0) {
+        this.list.unshift({
+          messageDate: time,
+          title: title,
+          message: content
+        })
+      }
+    });
+  },
+  onShow() {
+    if (this.vuex_msgList) {
+      var msgList = this.vuex_msgList;
+      msgList = msgList.replace('SystemMessage,', '')
+      this.$u.vuex('vuex_msgList', msgList)
+      if (!msgList) {
+        var tab = this.vuex_tabbar;
+        tab[1].isDot = false;
+        this.$u.vuex('vuex_tabbar', tab);
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.$u.api.getSysList().then(res => {
+        this.list = res
+      })
+    },
+    //返回上一级
+    router() {
+      uni.switchTab({
+        url: '../../message/msgList/msgList'
+      })
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.scroll {
+  background-color: rgb(246, 247, 250);
+  width: 100%;
+  height: calc(100vh - 0.44rem);
+}
+
+.list-item {
+  margin-top: 0.1rem;
+  padding: 20rpx;
+  background-color: rgb(255, 255, 255);
+  border-radius: 20rpx;
+}
+
+.items-title {
+  display: flex;
+  padding-bottom: 20rpx;
+  margin-bottom: 20rpx;
+  border-bottom: 2rpx solid #F6F8F9;
+
+  image {
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 50%;
+  }
+
+  .title-time {
+    margin-left: 0.1rem;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    padding: 5rpx 0;
+    // align-items: flex-start;
+  }
+}
+
+.title-text {
+  font-weight: 600;
+  font-size: 28rpx;
+  color: rgba(0, 0, 0, 0.9);
+}
+
+.text_1 {
+  // align-self: center;
+  color: rgb(193, 196, 204);
+  font-size: 0.12rem;
+  line-height: 0.095rem;
+  // letter-spacing: 0.012rem;
+  white-space: nowrap;
+}
+
+.bottom-section {
+  padding-left: 10rpx;
+}
+
+.text_3 {
+  color: rgb(2, 2, 2);
+  font-size: 28rpx;
+  line-height: 0.16rem;
+  // letter-spacing: 0.018rem;
+  white-space: nowrap;
+}
+
+.text_5 {
+  margin-left: 0.015rem;
+  margin-top: 0.1rem;
+  color: #908a8a;
+  font-size: 28rpx;
+  line-height: 1.5;
+  // letter-spacing: 0.01rem;
+  // text-indent: 0.3rem;
+}
+
+.text_6 {
+  margin-top: 0.1rem;
+  font-size: 0.16rem;
+  line-height: 0.16rem;
+  letter-spacing: 0.01rem;
+
+  text {
+    margin-left: 0.015rem;
+    text-indent: 0.3rem;
+    display: block;
+    color: #908a8a;
+    font-size: 0.14rem;
+    margin-top: 0.1rem;
+  }
+}
+
+.list {
+  padding: 0.18rem 0.15rem;
+  flex: 1 1 auto;
+  overflow-y: auto;
+}
+</style>
diff --git a/pages/my/AddEducation/AddEducation.vue b/pages/my/AddEducation/AddEducation.vue
new file mode 100644
index 0000000..a289e30
--- /dev/null
+++ b/pages/my/AddEducation/AddEducation.vue
@@ -0,0 +1,477 @@
+<template>
+  <view class="flex-col page">
+    <u-navbar title="添加教育经历"></u-navbar>
+    <view class="flex-col group_3 userList">
+      <!-- <h3 class="text_3">填写学校信息</h3> -->
+      <view class="flex-col group_4">
+        <view class="justify-between list-item group_5">
+          <text class="text_8 must">学历</text>
+          <view class="item-wrapper">
+            <view class="input-cover" @click="educationalShow = true"></view>
+            <u-input v-model="form.educationStr" placeholder="请选择学历" inputAlign="right"
+              disabled/>
+            <view class="img">
+              <image style="width: 15rpx; height: 25rpx; margin-left: 10rpx" src="/static/common/img/row_right.png" />
+            </view>
+          </view>
+          <u-action-sheet :list="educationalList" v-model="educationalShow" @click="educationalSelect">
+          </u-action-sheet>
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8 must">学校名称</text>
+          <view class="item-wrapper">
+            <view class="input-cover" @click="shoolShow = true"></view>
+          
+            <u-input v-model="shoolName" placeholder="请选择学校" disabled inputAlign="right" />
+            <view class="img">
+              <image style="width: 15rpx; height: 25rpx; margin-left: 10rpx" src="/static/common/img/row_right.png" />
+            </view>
+        </view>
+          <u-select v-model="shoolShow" mode="single-column" title="学校选择" :list="shoolList" @confirm="shoolSelect">
+          </u-select>
+          <!-- :default-value="defaultTime" -->
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8 must">学院</text>
+          <view class="item-wrapper">
+            <view class="input-cover" @click="collegeShow = true"></view>
+            <u-input v-model="form.college" placeholder="请选择学院" disabled
+              inputAlign="right" />
+              <view class="img">
+              <image style="width: 15rpx; height: 25rpx; margin-left: 10rpx" src="/static/common/img/row_right.png" />
+            </view>
+          </view>
+          <u-select v-model="collegeShow" mode="single-column" :list="CollegeList" @confirm="selectCpllege"></u-select>
+          <!-- :default-value="collegeId" -->
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8 must">专业</text>
+          <view class="item-wrapper">
+            <view class="input-cover" @click="majorShow = true"></view>
+          <!-- <u-input v-model="form.major" placeholder="请输入专业" type="text" /> -->
+              <u-input v-model="form.major" placeholder="请选择专业" disabled
+                inputAlign="right" />
+                <view class="img">
+                <image style="width: 15rpx; height: 25rpx; margin-left: 10rpx" src="/static/common/img/row_right.png" />
+              </view>
+            </view>
+          <u-select v-model="majorShow" mode="single-column" :list="MajorList" @confirm="selectMajor"></u-select>
+          <!-- :default-value="majorId" -->
+        </view>
+        <view class="justify-between list-item">
+          <text class="text_8 must">时间</text>
+          <view class="item-wrapper">
+            <view class="input-cover" @click="timeShow = true"></view>
+            <u-input v-model="showTime" placeholder="请选择时间" disabled inputAlign="right" />
+            <view class="img">
+              <image style="width: 15rpx; height: 25rpx; margin-left: 10rpx" src="/static/common/img/row_right.png" />
+            </view>
+          </view>
+          <u-select v-model="timeShow" :default-value="defaultTime" mode="mutil-column" title="在校时间" :list="timeList"
+            @confirm="confirm">
+          </u-select>
+        </view>
+      </view>
+      <view class="btn-box">
+        <u-button shape="circle" class="button text-wrapper_1" type="primary" @click="complete">保存</u-button>
+      </view>
+    </view>
+    <u-top-tips :z-index="999" ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import { Debounce } from "../../../common/utils.js";
+export default {
+  data() {
+    return {
+      step: 1,
+      headerImg: "",
+      shoolName: "",
+      showTime: "",
+      form: {
+        userId: "", //用户id
+        educationStr: "", //学历
+        schoolId: "", //学校
+        college: "", //学院
+        major: "", //专业
+        startYear: "", //开始时间
+        endYear: "", //结束时间
+        collegeId: "", //学院Id
+        majorId: "", //专业Id
+      },
+      background: {
+        backgroundColor: "#fff",
+      },
+      value: "",
+      defaultTime: "",
+      // collegeId:"",
+      // majorId:"",
+      show: false,
+      educationalShow: false,
+      educationalList: [
+        //学历选择列表
+        {
+          text: "大专",
+        },
+        {
+          text: "本科",
+        },
+        {
+          text: "硕士研究生",
+        },
+        {
+          text: "博士研究生",
+        },
+      ],
+      shoolShow: false,
+      collegeShow: false,
+      majorShow: false,
+      shoolList: [], //学校选择
+      CollegeList: [], //学院选择
+      MajorList: [], //专业选择
+      timeShow: false,
+      timeList: [], //时间选择
+    };
+  },
+  onLoad(e) {
+    // 监听从裁剪页发布的事件，获得裁剪结果
+    uni.$on("uAvatarCropper", (path) => {
+      this.headerImg = path;
+      let file = this.common.base64toFile(path, new Date().getTime());
+      if (file.type.indexOf("image") < 0) {
+        // this.$tips("请选择图片", "error");
+        this.$refs.uToast.show({
+          title: '请选择图片',
+          type: "error",
+        });
+        return false;
+      }
+      uni.uploadFile({
+        url: this.$u.http.config.imgUrl + "/app/User/File",
+        file: file,
+        fileType: "image",
+        header: {
+          Authorization: "Bearer " + this.vuex_token,
+        },
+        complete: (res) => {
+          this.form.path = res.data;
+        },
+      });
+    });
+    if (this.vuex_user.id) {
+      this.form.userId = this.vuex_user.id;
+    } else {
+      this.$u.route({
+        url: "/pages/login/login/login",
+      });
+    }
+    this.getShool();
+    var arr1 = [],
+      arr2 = [];
+    var isyear = new Date().getFullYear();
+    for (var i = 1990; i <= isyear + 10; i++) {
+      if (i <= isyear) {
+        arr1.push({
+          value: i,
+          label: i,
+        });
+      }
+      arr2.push({
+        value: i,
+        label: i,
+      });
+    }
+    this.timeList.push(arr1);
+    this.timeList.push(arr2);
+    this.defaultTime = [arr1.length - 1, arr2.length - 7];
+  },
+  methods: {
+    //完成信息填写
+    complete: Debounce(function (e) {
+      var data = this.form;
+      if (data.educationStr == "") {
+        // return this.$tips("请选择学历", "error");
+        return this.$refs.uToast.show({
+          title: '请选择学历',
+          type: "error",
+        });
+      }
+      if (data.schoolId == "") {
+        // return this.$tips("请选择学校", "error");
+        return this.$refs.uToast.show({
+          title: '请选择学校',
+          type: "error",
+        });
+      }
+      if (data.college == "") {
+        // return this.$tips("请填写学院", "error");
+        return this.$refs.uToast.show({
+          title: '请填写学院',
+          type: "error",
+        });
+      }
+      if (data.major == "") {
+        // return this.$tips("请填写专业", "error");
+        return this.$refs.uToast.show({
+          title: '请填写专业',
+          type: "error",
+        });
+      }
+      if (data.startYear == "" && data.endYear == "") {
+        // return this.$tips("请选择在校时间", "error");
+        return this.$refs.uToast.show({
+          title: '请选择在校时间',
+          type: "error",
+        });
+      }
+      if (data.startYear > data.endYear) {
+        // return this.$tips("请选择正确的在校时间", "error");
+        return this.$refs.uToast.show({
+          title: '请选择正确的在校时间',
+          type: "error",
+        });
+      }
+      this.$u.apiList
+        .AddEducation(this.form)
+        .then((res) => {
+          // this.$tips("提交成功","success");
+          this.$refs.uTips.show({
+            title: "提交成功",
+            type: "success",
+          });
+
+          setTimeout(() => {
+            /* uni.switchTab({
+              url: "../my/my",
+            }); */
+            uni.navigateBack({
+                delta: 1, // 返回上一级页面
+              });
+          }, 1000);
+        })
+        .catch((err) => {
+          // this.$tips(err.error,"error");
+          this.$refs.uToast.show({
+            title: err.error,
+            type: "error",
+          });
+
+        });
+    }, 1000),
+    // 获取学校
+    getShool() {
+      this.shoolList = [];
+      this.$u.api.GetAllSchool().then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.shoolList.push({
+            label: res[i].schoolName + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取学院
+    getColleg(id, name) {
+      this.CollegeList = [];
+      const data = {
+        schoolid: id,
+      };
+      this.$u.apiList.GetCollegeList(data).then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.CollegeList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取学院专业
+    getMajor(id) {
+      this.MajorList = [];
+      const data = {
+        schoolid: this.form.schoolId,
+        collegeid: id,
+        // name:name
+      };
+      this.$u.apiList.GetMajorList(data).then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.MajorList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    // 学历选择
+    educationalSelect(index) {
+      this.form.educationStr = this.educationalList[index].text;
+    },
+    // 时间选择
+    confirm(e) {
+      this.showTime = e[0].value + " - " + e[1].value;
+      this.form.startYear = e[0].value + "";
+      this.form.endYear = e[1].value + "";
+    },
+    // 学校选择
+    shoolSelect(e) {
+      this.form.college = "";
+      this.form.collegeId = "";
+      this.form.major = "";
+      this.form.majorId = "";
+      this.shoolName = e[0].label;
+      this.form.schoolId = e[0].value;
+      this.getColleg(this.form.schoolId);
+    },
+    //选择所属院系
+    selectCpllege(e) {
+      this.form.major = "";
+      this.form.majorId = "";
+      this.form.college = e[0].label;
+      this.form.collegeId = e[0].value;
+      this.getMajor(this.form.collegeId);
+    },
+    //选择专业
+    selectMajor(e) {
+      this.form.major = e[0].label;
+
+      this.form.majorId = e[0].value;
+    },
+    //返回上一级
+    router() {
+      uni.switchTab({
+        url: "../../my/my/my",
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.page {
+  background-color: rgb(255, 255, 255);
+  overflow-y: auto;
+  width: 100%;
+  overflow-x: hidden;
+  height: 100%;
+}
+
+.userList {
+  // padding-left: 0.16rem;
+  // padding-top: 0.3rem;
+
+  .text-wrapper_1 {
+    padding: 0.15rem 0 0.14rem;
+    // background-image: linear-gradient(
+    //   90deg,
+    //   #87e6fe 0%,
+    //   #5bc0fe 52%,
+    //   #2e9bff 100%
+    // );
+    box-shadow: 0px 0.03rem 0.09rem rgba(38, 122, 199, 0.34);
+    border-radius: 0.23rem;
+  }
+
+  // 按钮
+  .btn-box {
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    height: 150rpx;
+    border-top: 1px solid #f1f2f6;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: white;
+  }
+
+  .button {
+    width: 80%;
+  }
+
+  .text_3 {
+    align-self: center;
+    color: rgb(51, 51, 51);
+    font-size: 0.18rem;
+    font-family: PingFang;
+    line-height: 0.17rem;
+  }
+
+  .group_4 {
+    // margin-top: 0.44rem;
+
+    .list-item {
+      font-size: 30rpx;
+      padding: 16rpx 24rpx;
+      border-bottom: solid 2rpx #eeeeee;
+
+      .text_8 {
+        color: #000;
+        font-size: 30rpx;
+        font-family: PingFang;
+        line-height: 0.35rem;
+        margin-right: 0.15rem;
+      }
+
+      .text_26 {
+        color: #000;
+        font-size: 0.17rem;
+        font-family: PingFang;
+        line-height: 0.16rem;
+      }
+    }
+
+    .item-wrapper{
+      flex: 1;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+    }
+
+    .input-cover{
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 1;
+    }
+
+    .group_5 {
+      margin-top: 0;
+
+    }
+
+    .img {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 15rpx;
+      // padding-top: 4rpx;
+      margin-left: 5rpx;
+      // padding-right: 30rpx;
+    }
+
+    ::v-deep .u-input__input {
+      font-size: 30rpx;
+      color: #666666
+    }
+  }
+}
+// 必填的样式
+.must {
+  position: relative;
+
+  &::before {
+    content: "*";
+    color: red;
+    position: absolute;
+    top: -10rpx;
+    right: -17rpx;
+    transform: scale(0.8);
+    /* 相对于父元素的左上角定位 */
+  }
+}
+</style>
diff --git a/pages/my/AuditDeatil/AuditDeatil.vue b/pages/my/AuditDeatil/AuditDeatil.vue
new file mode 100644
index 0000000..024778d
--- /dev/null
+++ b/pages/my/AuditDeatil/AuditDeatil.vue
@@ -0,0 +1,533 @@
+<template>
+  <view style="background-color: rgb(246, 247, 250); height: 100%">
+	  <u-navbar  title="审核详情" ></u-navbar>
+	 <view class="flex-col main">
+		 <view class="justify-center headerImg">
+			 <image class="image_1" :src="$u.http.config.imgUrl+form.head" mode=""></image>
+		 </view>
+		<view class="form">
+		  <view class="flex-col group">
+			<view class="flex-col section_2">
+			  <!-- 教职工 -->
+			  <view class="flex-col group_5">
+				<view class="flex-row group_6">
+				  <text class="text_15">学历</text>
+				  <u-input
+					class="input"
+					:custom-style="inputStyle"
+					:border="false"
+					v-model="form.educationStr"
+					placeholder=""
+					disabled
+				  />
+				</view>
+				<view class="group_9 flex-row">
+				  <text class="text_15">学校</text>
+				  <u-input
+					class="input"
+					:custom-style="inputStyle"
+					:border="false"
+					v-model="form.schoolName"
+					placeholder=""
+					disabled
+				  />
+				</view>
+				<view class="justify-between group_7">
+				  <view class="flex-row">
+					<text class="text_15">学院</text>
+					<u-input
+					  class="input"
+					  :custom-style="inputStyle"
+					  :border="false"
+					  placeholder=""
+					  v-model="form.college"
+					  disabled
+					/>
+				  </view>
+				</view>
+				<view class="justify-between group_7">
+				  <view class="flex-row">
+					<text class="text_15">专业</text>
+					<u-input
+					  class="input"
+					  :custom-style="inputStyle"
+					  :type="'text'"
+					  :border="false"
+					  placeholder=""
+					  v-model="form.major"
+					  @click="schoolPost = true"
+					  disabled
+					/>
+				  </view>
+				</view>
+				<view class="justify-between group_13">
+				  <view class="flex-row">
+					<text class="text_15">时间</text>
+					<u-input
+					  class="input"
+					  :custom-style="inputStyle"
+					  :type="'text'"
+					  :border="false"
+					  placeholder=""
+					  v-model="form.time"
+					  disabled
+					/>
+				  </view>
+				</view>
+			  </view>
+			  </view>
+		  </view>
+		</view>
+
+		<view class="file" >
+      <!-- v-if="vuex_user.isAttestationGLY" -->
+		  <view v-if="[0,1].includes(this.vuex_glyType)" class="flex-col section_4">
+			<text class="text_11">申请人证件:</text>
+			<view class="flex-row equal-division">
+			  <view class="flex-col equal-division-item">
+				<view class="flex-col section_5">
+			     <view class="top-section justify-center">
+					<image :src="$u.http.config.imgUrl+form.imgUrl" class="image_6" @click="clickImg"/>
+				  </view>
+				</view>
+			  </view>
+			</view>
+		  </view>
+		  <view class="flex-row group_9 justify-between" v-if="type==0">
+			  <view class="btn1" @click="turnFn">
+				  <text>驳回</text>
+			  </view>
+			  <view class="btn2" @click="onExamine(1)">
+				  <text>通过</text>
+			  </view>
+		  </view>
+		</view>
+	</view>
+  <u-modal
+      ref="uModal"
+      title="驳回理由"
+      v-model="turnShow"
+      @confirm="turnSubmitFn"
+      :show-cancel-button="true"
+    >
+      <view class="dialog">
+        <u-input
+          :custom-style="eachStyle"
+          type="text"
+          maxlength="100"
+          v-model="cancleReason"
+          placeholder="请输入驳回理由"
+        />
+      </view>
+    </u-modal>
+    <!-- 提示 -->
+	<u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // input 样式
+      inputStyle: {
+        lineHeight: "0.5rem",
+        height: "0.5rem",
+        width: "2rem",
+      },
+      eachStyle: {
+        lineHeight: "80rpx",
+        height: "80rpx",
+        width: "400rpx",
+      },
+	  form:{
+
+	  },
+	  type:0,
+    // 驳回理由弹窗
+    turnShow:false,
+    // 驳回理由
+    cancleReason:'',
+    };
+  },
+  onLoad(e) {
+	 this.getAuditDeatil(e.id)
+	 this.type = e.type
+  },
+  created() {
+
+  },
+  methods: {
+	getAuditDeatil(id){
+		this.$u.apiList.AuditDeatil({id:id}).then((res)=>{
+			this.form = res
+			this.form.time = res.startYear + '年' +'————' + res.endYear + '年'
+		})
+	},
+    // 提示
+    tips(title, type, time) {
+      this.$refs.uTips.show({
+        title: title ? title : "",
+        type: type ? type : "success",
+        duration: time ? time + "" : "1000",
+      });
+    },
+	onExamine(type){
+		let ids = []
+		ids[0] = this.form.id
+		const data = {
+			ids:ids,
+			state:type,
+      cancleReason:'',
+		}
+		this.$u.apiList.Audit(data).then((res)=>{
+			this.$refs.uToast.show({
+				title: type==1?'审核成功':'已驳回',
+				type: 'success',
+				// url: 'pages/my/examine/examine'
+			})
+      setTimeout(()=>{
+        uni.redirectTo({
+          url: "/pages/my/examine/examine",
+        });
+      },500)
+		}).catch(e=>{
+      this.$refs.uToast.show({
+				title: e.error,
+				type: 'error',
+			})
+    })
+	},
+  // 驳回
+  turnFn(){
+    this.cancleReason = '';
+    this.turnShow = true;
+  },
+  // 确认驳回
+  turnSubmitFn(){
+    if(!this.cancleReason){
+      this.$refs.uToast.show({
+				title: '请填写驳回理由',
+				type: 'error',
+			})
+      this.turnShow = true;
+      return 
+    }
+    const data = {
+			ids:[this.form.id],
+			state:2,
+      cancleReason:this.cancleReason,
+		}
+		this.$u.apiList.Audit(data).then((res)=>{
+			this.$refs.uToast.show({
+				title:'已驳回',
+				type: 'success',
+				// url: 'pages/my/examine/examine'
+			})
+      setTimeout(()=>{
+        uni.redirectTo({
+          url: "/pages/my/examine/examine",
+        });
+      },500)
+		}).catch(e=>{
+      this.$refs.uToast.show({
+				title: e.error || '审核失败',
+				type: 'error',
+			})
+    })
+  },
+	//图片预览
+	clickImg(){
+		var images = [];
+		let img = this.$u.http.config.imgUrl + this.form.imgUrl;
+		images.push(img);
+		uni.previewImage({  // 图片路径必须是一个数组 => ['']
+			current: 0,
+			 urls: images,
+		});
+	},
+	//返回上一级
+	router(){
+		// this.$u.route({
+		// 	url: 'pages/my/examine/examine'
+		// });
+    uni.redirectTo({
+      url: "/pages/my/examine/examine",
+    })
+	}
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.main{
+	background-color: #ffffff;
+	.headerImg{
+		margin: 0.2rem 0;
+	}
+	.image_1{
+		width: 0.8rem;
+		height: 0.8rem;
+		border-radius: 50%;
+		overflow: hidden;
+	}
+}
+.file {
+  .group_9 {
+	margin-top: 0.2rem;
+    padding: 0.14rem 0.25rem 0;
+    background-color: rgb(246, 247, 250);
+    padding-bottom: 0.2rem;
+	.btn1{
+		text-align: center;
+		width: 1.3rem;
+		margin: 0.14rem 0.07rem 0 0.08rem;
+		padding: 0.12rem 0;
+		color: rgb(255, 255, 255);
+		font-size: 0.15rem;
+		line-height: 0.16rem;
+		letter-spacing: 0.03rem;
+		white-space: nowrap;
+		border-radius: 0.1rem;
+		background-color: #E52D43;
+	}
+	.btn2{
+		text-align: center;
+		width: 1.3rem;
+		margin: 0.14rem 0.07rem 0 0.08rem;
+		padding: 0.12rem 0;
+		color: rgb(255, 255, 255);
+		font-size: 0.15rem;
+		line-height: 0.16rem;
+		letter-spacing: 0.03rem;
+		white-space: nowrap;
+		background-color: rgb(46, 155, 255);
+		border-radius: 0.1rem;
+	}
+    .text_23 {
+      color: rgb(46, 155, 255);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+    }
+    .button {
+	  text-align: center;
+	  width: 1.3rem;
+      margin: 0.14rem 0.07rem 0 0.08rem;
+      padding: 0.12rem 0;
+      color: rgb(255, 255, 255);
+      font-size: 0.15rem;
+      line-height: 0.16rem;
+      letter-spacing: 0.03rem;
+      white-space: nowrap;
+      background-color: rgb(46, 155, 255);
+      border-radius: 0.1rem;
+    }
+    .text_25 {
+      margin-left: 0.025rem;
+      margin-top: 0.21rem;
+      color: rgb(164, 174, 183);
+      font-size: 0.15rem;
+      line-height: 0.14rem;
+      letter-spacing: 0.03rem;
+      white-space: nowrap;
+    }
+    .grid {
+      margin: 0.1rem 0.03rem 0 0.02rem;
+      height: 1.61rem;
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      grid-row-gap: 0.11rem;
+      grid-column-gap: 0.11rem;
+      .grid-item {
+        padding: 0.26rem 0 0.27rem;
+        background-color: rgb(176, 191, 205);
+        border-radius: 0.05rem;
+      }
+      .grid-item_1 {
+        padding: 0.23rem 0 0.29rem;
+        background-color: rgb(176, 191, 205);
+        border-radius: 0.05rem;
+      }
+      .image_14 {
+        width: 0.29rem;
+        height: 0.23rem;
+      }
+    }
+  }
+  .section_4 {
+    margin-top: 0.06rem;
+    padding: 0.17rem 0.17rem 0.07rem 0.17rem;
+    background-color: rgb(255, 255, 255);
+    .text_11 {
+      color: rgb(73, 76, 87);
+      font-size: 0.15rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+    }
+    .equal-division {
+      margin-top: 0.13rem;
+      color: rgb(46, 155, 255);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+      .equal-division-item {
+        flex: 1;
+        // max-width: 48.5%;
+        .text_11 {
+          margin-bottom: 0.13rem;
+        }
+        .section_5 {
+          // padding: 0.17rem 0 0.14rem 0;
+          // border-radius: 0.05rem;
+          border: 10px solid #CCCCCC;
+        }
+        .text_16 {
+          margin-top: 0.055rem;
+          align-self: center;
+        }
+      }
+      .equal-division-item_1 {
+        max-width: 48.5%;
+        margin-left: 0.14rem;
+        flex: 1 1 1.6rem;
+        .text_11 {
+          margin-bottom: 0.13rem;
+        }
+        .section_6 {
+          padding: 0.17rem 0.27rem 0.14rem 0.29rem;
+          border-radius: 0.05rem;
+          border: 1px dotted #66b5ff;
+        }
+        .text_19 {
+          margin-top: 0.05rem;
+          align-self: center;
+        }
+      }
+      .top-section {
+        // padding: 0.12rem 0 0.1rem;
+        border-radius: 0.05rem;
+        // background: #eff7ff;
+        .image_6 {
+          width: 3rem;
+          height: 1rem;
+        }
+        .text_12 {
+          margin-left: 0.075rem;
+          margin-top: 0.015rem;
+        }
+      }
+      .bottom-section {
+        margin-top: 0.1rem;
+        padding: 0.09rem 0.17rem 0.13rem;
+        border-radius: 0.05rem;
+        background: #eff7ff;
+        .image_8 {
+          margin-right: 0.08rem;
+          width: 0.23rem;
+          height: 0.17rem;
+        }
+        .text_14 {
+          margin-top: 0.015rem;
+        }
+      }
+    }
+  }
+}
+.form {
+  .headerImg {
+    padding-bottom: 0.05rem;
+  }
+  .section_2 > view > view {
+    margin-left: 0.21rem;
+    padding: 0 !important;
+    border-bottom: 0.01rem solid #edeeef;
+    position: relative;
+  }
+  .section_2 > view > view .input,
+  .section_2 > view > view text {
+    line-height: 0.5rem;
+  }
+  .section_2 > view > view .input {
+    padding-right: 0.2rem !important;
+  }
+  .section_2 > view > view text {
+	  margin-right:.1rem;
+    min-width: 0.91rem;
+    white-space: nowrap;
+  }
+
+  .section_2 > view > view image {
+    position: absolute;
+    top: 50%;
+    right: 0.14rem;
+    transform: translateY(-50%);
+  }
+
+  .image_3 {
+    width: 0.075rem;
+    height: 0.13rem;
+  }
+  .group {
+    flex: 1 1 auto;
+    overflow-y: auto;
+  }
+  .section_2 {
+    padding: 0.055rem 0 0 0;
+    background-color: rgb(255, 255, 255);
+  }
+
+  .group_16 {
+    margin-top: 0.21rem;
+    padding: 0 0.02rem;
+  }
+  .button_1,
+  .button {
+    padding: 0.13rem 0;
+    color: rgb(255, 255, 255);
+    font-size: 0.15rem;
+    line-height: 0.14rem;
+    letter-spacing: 0.03rem;
+    white-space: nowrap;
+    background-color: rgb(46, 155, 255);
+    border-radius: 0.1rem;
+    width: 3.1rem;
+    margin: 0 auto;
+  }
+  .button_1 {
+    margin-top: 0.1rem;
+    color: rgb(55, 59, 72);
+    background-color: rgb(255, 255, 255);
+    border: solid 0.01rem rgba(160, 162, 172, 0.33);
+    margin-bottom: 0.2rem;
+  }
+
+  .view_1 {
+    margin-left: 0.02rem;
+  }
+
+  .text_15 {
+    color: rgb(55, 59, 72);
+    font-size: 0.15rem;
+    line-height: 0.16rem;
+    white-space: nowrap;
+  }
+  .image_2 {
+    width: 0.6rem;
+    height: 0.6rem;
+    border-radius: 50%;
+    overflow: hidden;
+  }
+  .image_4 {
+    margin-right: 0.15rem;
+    margin-top: 0.28rem;
+  }
+}
+.dialog {
+  // border: 1px solid red;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  margin-top: 50rpx;
+  margin-bottom: 80rpx;
+}
+</style>
diff --git a/pages/my/BackApply/BackApply.vue b/pages/my/BackApply/BackApply.vue
new file mode 100644
index 0000000..9ab080c
--- /dev/null
+++ b/pages/my/BackApply/BackApply.vue
@@ -0,0 +1,799 @@
+<template>
+  <view style="background-color: white; height: 100vh">
+    <u-navbar title="返校预约申请"></u-navbar>
+    <!-- 内容 -->
+    <scroll-view
+      scroll-y="true"
+      style="
+        height: calc(100vh - 240rpx);
+        width: 100%;
+        border-top: 1px solid #edf2fa;
+        background-color: #fff;
+        box-sizing: border-box;
+      "
+    >
+      <!-- 基础信息 -->
+      <view class="base-box">
+        <view class="item-line">
+          <text class="line-label"> 预约人</text>
+          <text class="line-value"> {{ baseMsg.name || "-" }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 学院专业</text>
+          <text class="line-value"> {{ baseMsg.college + "-" + baseMsg.major }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 学历层次</text>
+          <text class="line-value"> {{ baseMsg.educationStr || "-" }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 毕业年份</text>
+          <text class="line-value"> {{ baseMsg.endYear || "-" }} </text>
+        </view>
+      </view>
+      <!-- 表单 -->
+      <view class="form-box">
+        <!-- 返校日期 -->
+        <view class="item-date" @click="dateShowFn">
+          <text class="line-label must"> 返校日期</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            v-model="formData.date"
+            @click.native="dateShowFn"
+            placeholder="请选择"
+            disabled
+          />
+          <view class="img">
+            <image
+              style="width:15rpx; height: 25rpx; margin-left: 20rpx"
+              src="/static/common/img/row_right.png"
+            />
+          </view>
+          <!-- 点击盒子 -->
+          <view class="input-mask"></view>
+        </view>
+        <!-- 提示 -->
+        <view class="item-tip" v-if="weekSet.length">
+          <text class="line-label"> 提示：每周{{ dateTip }}暂停开放返校服务</text>
+        </view>
+        <!-- 车牌号 -->
+        <view class="item-line" style="border: none;">
+          <text class="line-label"> 车牌号</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            v-model="formData.carNumber"
+            placeholder="如果车辆入校请务必填写"
+          />
+        </view>
+        <!-- 联系电话 -->
+        <view class="item-line" style="border: none;">
+          <text class="line-label must"> 联系电话</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="number"
+            input-align="right"
+            :border="false"
+            maxlength="20"
+            v-model="formData.phone"
+            placeholder="请输入"
+          />
+        </view>
+        <!-- 随行人信息 -->
+        <view class="item-line">
+          <text class="line-label"> 随行人信息</text>
+          <text @click="addPersonFn" style="color: #3cb5fb"> 添加随行人 </text>
+        </view>
+        <!-- 动态随行人 -->
+        <view class="item-box">
+          <view class="item-for" v-for="(x, xIndex) in sxList" :key="xIndex">
+            <!-- 左侧内容 -->
+            <view class="for-left">
+              <view class="each">
+                <text class="must"> 随行人{{ xIndex + 1 }}</text>
+                <u-input
+                  :custom-style="eachStyle"
+                  type="text"
+                  input-align="right"
+                  :border="false"
+                  maxlength="20"
+                  v-model="x.name"
+                  placeholder="请输入"
+                />
+              </view>
+              <view class="each">
+                <text class="must"> 手机号</text>
+                <u-input
+                  :custom-style="eachStyle"
+                  type="number"
+                  input-align="right"
+                  :border="false"
+                  maxlength="20"
+                  v-model="x.phone"
+                  placeholder="请输入"
+                />
+              </view>
+            </view>
+            <!-- 右侧删除 -->
+            <view class="del">
+              <!-- <u-icon
+                @click="delFn(xIndex)"
+                name="trash"
+                color="#2799f6"
+                size="45"
+              ></u-icon> -->
+              <image style="width: 32rpx;height: 32rpx;" src="/static/common/img/delete.svg" @click="delFn(xIndex)"></image>
+            </view>
+          </view>
+        </view>
+        <!-- 返校事由 -->
+        <view class="item-line">
+          <text class="line-label must"> 返校事由</text>
+        </view>
+        <view class="item-text">
+          <u-input
+            type="textarea"
+            height="200"
+            :border="false"
+            v-model="formData.retuenSchoolReason"
+            placeholder="请输入"
+          />
+        </view>
+        <!-- 同意区域 -->
+        <view class="item-agree">
+          <view class="agree-left">
+            <u-checkbox-group>
+              <u-checkbox v-model="formData.checked"></u-checkbox>
+            </u-checkbox-group>
+          </view>
+          <view class="agree-right">{{ desc }}</view>
+        </view>
+      </view>
+      <view style="height: 50rpx"></view>
+    </scroll-view>
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button style="width: 80%" shape="circle" type="primary" @click="btnSubmitFn"
+        >提交</u-button
+      >
+    </view>
+    <u-top-tips ref="uTips" :navbar-height="50"></u-top-tips>
+    <!-- 选择日期范围 -->
+    <!-- date 单个日期范围  range 多个日期范围 min-date="" -->
+    <u-calendarWeek
+      max-year="2030"
+      min-year="2020"
+      max-date="2030"
+      :min-date="minDate"
+      :max-date="maxDate"
+      v-model="dateShow"
+      :filterWeek="weekSet"
+      :filterDate="filterDate"
+      mode="range"
+      @change="dateChangeFn"
+    ></u-calendarWeek>
+    <u-toast ref="uToast" />
+
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // 表单
+      formData: {
+        carNumber: "", // 车牌号
+        phone: "", // 联系电话
+        checked: false, //是否同意
+        retuenSchoolReason: "", //返校事由
+        date: "", //返校日期
+      },
+      // 日期的值
+      dateList: [],
+      // 随行人
+      sxList: [
+        {
+          name: "",
+          phone: "",
+        },
+      ],
+      // 选择日期
+      dateShow: false,
+      //
+      inputStyle: {
+        lineHeight: "90rpx",
+        height: "90rpx",
+        width: "400rpx",
+      },
+      eachStyle: {
+        lineHeight: "80rpx",
+        height: "80rpx",
+        width: "400rpx",
+      },
+      desc:
+        "本人承诺进校期间,遵守国家相关规律法规和校园管理相关规定，服从工作人员的指挥和管理",
+      // 基础信息
+      baseMsg: {
+        id: "",
+        name: "", //姓名
+        schoolName: "",
+        schoolLogo: "",
+        startYear: "", //入学年份
+        college: "", //学院
+        educationStr: "", //学历层次
+        major: "", //专业
+        endYear: "", //毕业年份
+      },
+      // 星期设置
+      weekSet: [],
+      // 已预约的日期 这里需要两个格式 2025-2-19 2025/2/19
+      filterDate:[],
+      // 选择日期提示
+      dateTip: "",
+      // 最小日期
+      minDate: "",
+      // 最大日期
+      maxDate: "",
+    };
+  },
+async  onLoad(e) {
+   await this.getSchoolFn();
+    // 获取返校设置
+    this.getSetFn();
+    // 获取已预约的日期
+    this.getFilterDate();
+  },
+  created() {},
+  methods: {
+   async getFilterDate(){
+      const req = {
+        // userId: this.vuex_user.id,
+        educationId: this.baseMsg.id,
+      }
+      // return
+      const res = await this.$u.apiList.GetDateTimeReturnApi(req);
+      console.log(res,'res--获取已预约日期')
+      // 截取一下
+      const result = res.map(x=>x.retuenSchoolTime.slice(0,10))
+      // 保存一份不去0的
+      this.filterDateSource = [...result];
+      // 去0  [2025-2-18]
+      const arr1 = result.map(x=>x.replace(/(?<=-)0/g, ''))
+      // 在生成一个 [2025/02/18]
+      const arr2 = arr1.map(x=>x.replaceAll('-','/'))
+      // 已预约的日期 
+      this.filterDate = [...arr1,...arr2];
+    },
+    arrayToString(arr) {
+      let result = "";
+      const map = new Map([
+        [0, "周日"],
+        [1, "周一"],
+        [2, "周二"],
+        [3, "周三"],
+        [4, "周四"],
+        [5, "周五"],
+        [6, "周六"],
+      ]);
+      arr.forEach((x) => {
+        if (map.has(x)) {
+          result += map.get(x) + "、";
+        }
+      });
+      return arr.length ? result.slice(0, result.length - 1) : result;
+    },
+    //获取返校设置
+    async getSetFn() {
+      const req = {
+        schoolId: this.baseMsg.schoolId,
+      }
+      const res = await this.$u.apiList.SelectInfoSetApi(req);
+      console.log(res, "res--");
+      let AllArr = [0, 1, 2, 3, 4, 5, 6];
+      // 星期设置
+      if (res.isDayOfWeek) {
+        let result = res.dayOfWeek.split(",").map((x) => Number(x));
+        this.weekSet = AllArr.filter((x) => {
+          return !result.includes(x);
+        });
+        // 处理tip提示
+        this.dateTip = this.arrayToString(this.weekSet);
+      }
+      // 限制选择日期
+      // 在用户需要提前几天申请预约
+      if (res.isBefore) {
+        const date = new Date();
+        date.setDate(date.getDate() + res.beforeDay);
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, "0");
+        const day = String(date.getDate()).padStart(2, "0");
+        this.minDate = `${year}-${month}-${day}`;
+      } else {
+        // 默认最小日期是今天
+        const date = new Date();
+        date.setDate(date.getDate());
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, "0");
+        const day = String(date.getDate()).padStart(2, "0");
+        this.minDate = `${year}-${month}-${day}`;
+      }
+      // 用户最大可选日期  默认180天
+      const dateRes = new Date();
+      // 在用户需要提前几天申请预约
+      let maxDay = res.isDayOfWeek ? res.returnSchoolDays : 180
+      dateRes.setDate(dateRes.getDate() + maxDay);
+      const year1 = dateRes.getFullYear();
+      const month1 = String(dateRes.getMonth() + 1).padStart(2, "0");
+      const day1 = String(dateRes.getDate()).padStart(2, "0");
+      this.maxDate = `${year1}-${month1}-${day1}`;
+    },
+    async getSchoolFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyEducations(req);
+      console.log(res, "res--");
+      const findRow = res.find((x) => x.isSelected === true);
+      if (!findRow) {
+        /* uni.showToast({
+          title: "未查询到当前教育经历",
+          icon: "none",
+        }); */
+        this.$refs.uToast.show({
+          title: "未查询到当前教育经历",
+          type: "error",
+        });
+
+        return;
+      }
+      Object.assign(this.baseMsg, findRow);
+      this.baseMsg.name = this.vuex_user.name;
+    },
+    // 添加随行人
+    addPersonFn() {
+      this.sxList.push({
+        name: "",
+        phone: "",
+      });
+    },
+    // 删除随行人
+    delFn(index) {
+      uni.showModal({
+        // title: "提示",
+        content: `确定删除随行人${index + 1}？`,
+        success: (res) => {
+          if (res.confirm) {
+            this.sxList.splice(index, 1);
+          }
+          if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    // 选择日期
+    dateShowFn() {
+      this.dateShow = true;
+    },
+    // 日期change
+    dateChangeFn(e) {
+      console.log(e, "e--");
+      this.currentList = this.getDatesArray(e.startDate, e.endDate);
+      console.log(JSON.parse(JSON.stringify(this.currentList)),'this.currentList--1');
+      // 判断是否包含不可选中日期
+      let flag = this.currentList.some(function(x){
+        // 包含禁用的日期
+        if (this.disArr.includes(new Date(x).getDay())) {
+          return true;
+        }
+        // 包含已预约的日期
+        if(this.selectArr.includes(x)){
+          return true;
+        }
+        return false;
+      },{
+        disArr:this.weekSet, // 禁用的星期
+        selectArr:this.filterDateSource // 已预约的日期
+      })
+      // 过滤一下禁用的星期
+      // this.currentList = this.currentList.filter((x) => {
+      //   // 当天的星期
+      //   const dateWeek = new Date(x).getDay();
+      //   // 包含禁用的星期过滤掉
+      //   if (this.weekSet.includes(dateWeek)) {
+      //     return false;
+      //   }
+      //   return true;
+      // });
+      // 过滤掉已预约的日期
+      // this.currentList = this.currentList.filter((x) => {
+      //   if(this.filterDateSource.includes(x)){
+      //     return false;
+      //   }else{
+      //     return true;
+      //   }
+      // });
+      if(flag){
+        /* uni.showToast({
+          icon:'none',
+          title: `当前返校时间包含不可预约的日期，请重新选择！`,
+          duration: 2000,
+        }); */
+        this.$refs.uToast.show({
+          title: `当前返校时间包含不可预约的日期，请重新选择！`,
+          type: "error",
+        });
+        this.dateShow = true;
+        return
+      }
+      // 显示的值
+      this.formData.date = e.startDate + " ~ " + e.endDate;
+      console.log(JSON.parse(JSON.stringify(this.currentList)),'this.currentList--2');
+      // 处理成后端要的格式
+      this.dateList = this.currentList.map((x) => {
+        return {
+          time: x,
+        };
+      });
+      console.log(JSON.parse(JSON.stringify(this.dateList)),'this.dateList');
+    },
+    // 校验表单信息
+    validate() {
+      // 校验手机号的正则表达式
+      const phoneReg = /^[1][3-9][0-9]{9}$/;
+      return new Promise((resolve, reject) => {
+        // 校验返校日期
+        if (!this.formData.date) {
+          // this.$tips("返校日期不能为空", "error");
+          this.$refs.uToast.show({
+            title: "返校日期不能为空",
+            type: "error",
+          });
+          return reject(false);
+        }
+        // 校验联系电话
+        if (!this.formData.phone) {
+          // this.$tips("联系电话不能为空", "error");
+          this.$refs.uToast.show({
+            title: "联系电话不能为空",
+            type: "error",
+          });
+          return reject(false);
+        }
+        if (!phoneReg.test(this.formData.phone)) {
+          // this.$tips("联系电话格式不正确，请输入有效的手机号", "error");
+          this.$refs.uToast.show({
+            title: "联系电话格式不正确，请输入有效的手机号",
+            type: "error",
+          });
+
+          return reject(false);
+        }
+        // 校验随行人信息
+        if (this.sxList.length) {
+          for (let i = 0; i < this.sxList.length; i++) {
+            const item = this.sxList[i];
+            // 校验随行人名称
+            if (!item.name) {
+              // this.$tips(`随行人${i + 1}的名称不能为空`, "error");
+              this.$refs.uToast.show({
+                title: `随行人${i + 1}的名称不能为空`,
+                type: "error",
+              });
+              return reject(false);
+            }
+            // 校验随行人手机号
+            if (!item.phone) {
+              // this.$tips(`随行人${i + 1}的手机号不能为空`, "error");
+              this.$refs.uToast.show({
+                title: `随行人${i + 1}的手机号不能为空`,
+                type: "error",
+              });
+              return reject(false);
+            }
+            if (!phoneReg.test(item.phone)) {
+              // this.$tips(`随行人${i + 1}的手机号格式不正确，请输入有效的手机号`, "error");
+              this.$refs.uToast.show({
+                title: `随行人${i + 1}的手机号格式不正确，请输入有效的手机号`,
+                type: "error",
+              });
+              return reject(false);
+            }
+          }
+        }
+        // 校验返校事由
+        if (!this.formData.retuenSchoolReason) {
+          // this.$tips("返校事由不能为空", "error");
+          this.$refs.uToast.show({
+            title: "返校事由不能为空",
+            type: "error",
+          });
+          return reject(false);
+        }
+        resolve(true);
+      });
+    },
+    // 日期转换数组
+    getDatesArray(startDate, endDate) {
+      // 将输入的字符串转换为 Date 对象
+      const start = new Date(startDate);
+      const end = new Date(endDate);
+
+      // 创建一个用于存储结果的数组
+      let datesArray = [];
+
+      // 复制开始日期，以免修改原始对象
+      let currentDate = new Date(start);
+
+      // 使用循环从开始日期遍历到结束日期
+      while (currentDate <= end) {
+        // 将当前日期添加到数组中
+        // 使用 toISOString 方法去掉 T 后面的时间部分并去掉最后的 Z 和小数秒
+        datesArray.push(new Date(currentDate).toISOString().split("T")[0]);
+
+        // 增加一天
+        currentDate.setDate(currentDate.getDate() + 1);
+      }
+
+      return datesArray;
+    },
+    // 我要预约
+    async btnSubmitFn() {
+      const result = await this.validate().catch((e) => e);
+      console.log(result, "result");
+      if (!result) {
+        return;
+      }
+      // 校验是否勾选了同意
+      if (!this.formData.checked) {
+        return uni.showModal({
+          // title: "提示",
+          content: this.desc,
+          success: (res) => {
+            if (res.confirm) {
+              // 默认帮用户勾选上  提交
+              this.formData.checked = true;
+              this.submit();
+            }
+            if (res.cancel) {
+              // console.log('用户点击取消');
+            }
+          },
+        });
+      }
+      this.submit();
+    },
+    // 提交的函数
+    async submit() {
+      // this.$tips("开发中", "success");
+      const req = {
+        userId: this.vuex_user.id,
+        educationId: this.baseMsg.id,
+        carNumber: this.formData.carNumber, //车牌号
+        phone: String(this.formData.phone), //联系电话
+        retuenSchoolReason: this.formData.retuenSchoolReason, //返校事由
+        // 随行人
+        TogetherPersonDtoList: this.sxList.map((x, xIndex) => {
+          x.index = xIndex;
+          x.phone = String(x.phone);
+          return x;
+        }),
+        // 日期
+        TimeList: this.dateList,
+      };
+      const res = await this.$u.apiList.AddReturnSchoolApi(req).catch(e=>e);
+      console.log(res, "res---");
+      if (res?.succeed === false) {
+        /* uni.showToast({
+          icon:'none',
+          title: res.error || "提交失败",
+          duration: 2000,
+        }); */
+        this.$refs.uToast.show({
+          title: res.error || "提交失败",
+          type: "error",
+        });
+        return;
+      }
+      /* uni.showToast({
+        title: "提交成功",
+        duration: 2000,
+      }); */
+      this.$refs.uToast.show({
+        title: "提交成功",
+        type: "success",
+      });
+      setTimeout(() => {
+        // 返回上一页
+        /* this.$u.route({
+          url: "pages/my/BackSchool/BackSchool",
+        }); */
+        uni.navigateBack({
+          delta: 1
+        });
+      }, 1000);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 必填的样式
+.must {
+  position: relative;
+  &::before {
+    content: "*";
+    color: red;
+    position: absolute;
+    top: -10rpx;
+    right: -17rpx;
+    transform: scale(0.8);
+    /* 相对于父元素的左上角定位 */
+  }
+}
+.body-box {
+  max-height: calc(100vh - 250rpx);
+  overflow-y: auto;
+  border: 1px solid red;
+}
+// 基础信息
+.base-box {
+  background-color: white;
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+    .line-value {
+      // font-weight: 700;
+      color: #969696;
+    }
+  }
+}
+// 表单
+.form-box {
+  margin-top: 20rpx;
+  background-color: white;
+  // 返校日期
+  .item-date {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    position: relative;
+    .input-mask {
+      position: absolute;
+      width: 100%;
+      height: 90rpx;
+      // background-color: red;
+    }
+    .img {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 30rpx;
+      // padding-right: 30rpx;
+    }
+  }
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+  }
+  // 提示
+  .item-tip {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    padding-bottom: 10rpx;
+    font-size: 22rpx;
+    // line-height: 90rpx;
+    // height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: red;
+    }
+  }
+
+  // 随行人样式
+
+      .item-for {
+      background-color: #f7f6f9;
+      padding-left: 30rpx;
+      display: flex;
+      width: 100%;
+      border-bottom: 1px solid #e1e1e1 ;
+
+      .for-left {
+        // border: 1px solid blue;
+        width: calc(100% - 50rpx);
+        .each {
+          flex: 1;
+          display: flex;
+          justify-content: space-between;
+          line-height: 80rpx;
+          height: 80rpx;
+          padding-right: 30rpx;
+        }
+      }
+      .del {
+        // border: 1px solid red;
+        width: 40rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      &:last-of-type{
+      border-bottom: none;
+    }
+    }
+
+  // 文本框
+  .item-text {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+  }
+  // 同意样式
+  .item-agree {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    display: flex;
+    padding-bottom: 20rpx;
+    padding-top: 20rpx;
+    border-top: 1px solid #f1f2f6;
+    // margin-bottom: 50rpx;
+    // flex-wrap: wrap;
+    .agree-left {
+      width: 50rpx;
+    }
+    .agree-right {
+      color: black;
+      flex: 1;
+    }
+  }
+}
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/pages/my/BackCode/BackCode.vue b/pages/my/BackCode/BackCode.vue
new file mode 100644
index 0000000..4a8d6ed
--- /dev/null
+++ b/pages/my/BackCode/BackCode.vue
@@ -0,0 +1,359 @@
+<template>
+  <view style="background-color: white; height: 100vh">
+    <u-navbar title="核验二维码"></u-navbar>
+    <!-- 基础信息 -->
+    <view class="base-box">
+      <!-- 左侧 -->
+      <view class="img-box">
+        <u-avatar
+          :src="$u.http.config.imgUrl + vuex_user.head"
+          class="avatar-box"
+        ></u-avatar>
+      </view>
+      <!-- 右侧 -->
+      <view class="msg-box">
+        <view>
+          <text class="msg-name"> {{ baseMsg.name }} </text>
+          <text class="status">{{ baseMsg.startYear }}届</text>
+        </view>
+        <view class="msg-desc"
+          >{{ baseMsg.college }}-{{ baseMsg.major }}-{{
+            "(" + baseMsg.educationStr + ")"
+          }}</view
+        >
+      </view>
+    </view>
+    <!-- 阴影行 -->
+    <view style="height: 20rpx; background-color: #f7f7f7"></view>
+    <!-- 二维码 -->
+    <view class="code-box">
+      <view class="code-school">
+        <u-avatar
+          :src="$u.http.config.imgUrl + baseMsg.logo.slice(1)"
+          class="avatar"
+          size="mini"
+        ></u-avatar>
+        <view class="school-name" @click="testFn"> {{ baseMsg.school }} </view>
+      </view>
+      <view class="code-time">预约时间：{{ formData.retuenSchoolTime }}</view>
+      <view class="uq-code">
+        <!-- 二维码组件 -->
+        <uqrcode ref="uqrcode" canvas-id="qrcode" :value="jumpURL" :options="options">
+          <template v-slot:loading>
+            <text style="color: #2979ff">loading...</text>
+          </template>
+        </uqrcode>
+      </view>
+    </view>
+    <!--  -->
+    <!-- <view @click="goPageFn">跳转成功页</view> -->
+    <u-top-tips ref="uTips" :navbar-height="50"></u-top-tips>
+    <u-toast ref="uToast" />
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button style="width: 80%" shape="circle" type="primary" @click="cancelFn"
+        >取消预约</u-button
+      ></view
+    >
+  </view>
+</template>
+
+<script>
+import { Debounce } from "../../../common/utils.js";
+export default {
+  data() {
+    return {
+      // 表单
+      formData: {
+        // code: "浙A88888", // 车牌号
+        // phone: "22", // 联系电话
+        // checked: false, //是否同意
+        // remark: "上学上学-", //返校事由
+        // date: "2025/09/18 12:68:45", //返校日期
+        // otherDate: "2025/09/18 12:68:45", //提交时间
+        // status: "已核验",
+        // hyDate: "2025/09/18 12:68:45", //核验时间
+        // desc: "驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由", //驳回理由
+
+        userName: "李彪",
+        college: "计算机信息工程学院",
+        major: "计算机科学与技术",
+        endYear: "2029",
+        carNumber: "", // 车牌号
+        phone: "", // 联系电话
+        checked: false, //是否同意
+        retuenSchoolReason: "-", //返校事由
+        retuenSchoolTime: "", //返校日期
+        hyDate: "2025/09/18 12:68:45", //核验时间
+        createTime: "2025-01-07 11:07:20", //提交时间
+        auditRemark: null, //驳回理由
+      },
+      // 随行人
+      sxList: [
+        {
+          name: "",
+          phone: "",
+        },
+      ],
+      // 选择日期
+      dateShow: false,
+      //
+      inputStyle: {
+        lineHeight: "90rpx",
+        height: "90rpx",
+        width: "400rpx",
+      },
+      eachStyle: {
+        lineHeight: "80rpx",
+        height: "80rpx",
+        width: "400rpx",
+      },
+      options: {
+        // margin: 10,
+      },
+      queryParams: {
+        id: "",
+      },
+      // 扫描网址
+      jumpURL: "http://192.168.1.8:8080/pages/my/BackSuccess/BackSuccess?id=",
+      // 基础信息
+      baseMsg: {
+        id: "",
+        name: "", //姓名
+        schoolName: "",
+        logo: "",
+        startYear: "", //入学年份
+        college: "", //学院
+        educationStr: "", //学历层次
+        major: "", //专业
+        endYear: "", //毕业年份
+      },
+      // 二维码信息
+      codeMsg: {
+        id: "",
+        returnSchoolPrebookId: "",
+        retuenSchoolTime: "",
+        isVerified: false,
+        verifyQRCode: "", //二维码
+        verifyTime: null,
+      },
+      interval: null, // 保存定时器的引用
+    };
+  },
+  onLoad(e) {
+    console.log(e, "e--");
+    Object.assign(this.queryParams, e);
+    this.jumpURL =
+      window.location.origin +
+      "/#/pages/my/BackCodeLook/BackCodeLook?id=" +
+      this.queryParams.id;
+    console.log(this.jumpURL, "this.jumpURL----------");
+  },
+  onHide() {
+    // 在组件销毁前清除定时器以防止内存泄漏
+    if (this.interval) {
+      clearInterval(this.interval);
+    }
+  },
+  created() {
+    this.getCodeFn();
+    this.getSchoolFn();
+    this.getDetailFn();
+    // 然后每隔1秒获取一次数据
+    // this.interval = setInterval(this.getCodeFn, 2000);
+  },
+  beforeDestroy() {
+    // 在组件销毁前清除定时器以防止内存泄漏
+    if (this.interval) {
+      clearInterval(this.interval);
+    }
+  },
+  methods: {
+    testFn() {
+      console.log(this.$refs.uqrcode, "this.$refs.uqrcode");
+    },
+    // 取消预约
+    async cancelFn() {
+      uni.showModal({
+        // title: "提示",
+        content: `确定取消本次预约？`,
+        success: async (res) => {
+          if (res.confirm) {
+            const req = {
+              id: this.queryParams.id,
+              // educationId: this.baseMsg.id,
+            };
+            const res = await this.$u.apiList.DelReturnSchoolInfoApi(req).catch((e) => e);
+            console.log(res, "res----");
+            if (res?.succeed === false) {
+              /* uni.showToast({
+                icon: "error",
+                title: res.error || "取消失败",
+                duration: 2000,
+              }); */
+              this.$refs.uToast.show({
+                title: res.error || "取消失败",
+                type: "error",
+              });
+              return;
+            }
+            /* uni.showToast({
+              title: "取消预约成功!",
+              duration: 2000,
+            }); */
+            this.$refs.uToast.show({
+              title: "取消预约成功!",
+              type: "success",
+            });
+            setTimeout(() => {
+              // 返回上一页
+              /* this.$u.route({
+                url: "pages/my/BackSchool/BackSchool",
+              }); */
+              uni.navigateBack({
+                delta: 1
+              });
+            }, 1000);
+          }
+          if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    async getSchoolFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyEducations(req);
+      console.log(res, "res--");
+      const findRow = res.find((x) => x.isSelected === true);
+      if (!findRow) {
+        /* uni.showToast({
+          title: "未查询到当前教育经历",
+          icon: "none",
+        }); */
+        this.$refs.uToast.show({
+          title: "未查询到当前教育经历",
+          type: "error",
+        });
+        return;
+      }
+      Object.assign(this.baseMsg, findRow);
+      this.baseMsg.name = this.vuex_user.name;
+    },
+    // 获取详情
+    async getDetailFn() {
+      const req = {
+        id: this.queryParams.id,
+      };
+      const result = await this.$u.apiList.SelectReturnSchoolInfoApi(req);
+      console.log(result, "result-");
+      //
+      if (result.isVerified) {
+        // 跳转到返回成功界面
+        return;
+      }
+      Object.assign(this.formData, result);
+      this.formData.retuenSchoolTime = this.formData.retuenSchoolTime
+        .replaceAll("0:00:00", "")
+        .replaceAll("00:00:00", "");
+    },
+    // 获取二维码
+    async getCodeFn() {
+      const req = {
+        id: this.queryParams.id,
+      };
+      const res = await this.$u.apiList.SaveReturnSchoolVerifyApi(req);
+      console.log(res, "res--二维码结果");
+      Object.assign(this.codeMsg, res);
+    },
+    submitFn() {},
+    goPageFn() {
+      this.$u.route({
+        url: `pages/my/BackSuccess/BackSuccess?id=${6666}&name=${777}`,
+        // params: {
+        //   row: JSON.stringify(data),
+        // },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 基础信息
+.base-box {
+  background-color: white;
+  // border: 1px solid red;
+  display: flex;
+  padding-top: 40rpx;
+  padding-bottom: 40rpx;
+  // 左侧头像
+  .img-box {
+    // border: 1px solid red;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+  }
+  // 右侧
+  .msg-box {
+    // border: 1px solid blue;
+    flex: 1;
+    .msg-name {
+      font-size: 32rpx;
+      color: black;
+    }
+    .status {
+      margin-left: 15rpx;
+      background-color: #ecf1ff;
+      color: #2d7ad6;
+      padding-left: 15rpx;
+      padding-right: 15rpx;
+      border-radius: 15rpx;
+    }
+    .msg-desc {
+      color: #909090;
+      margin-top: 10rpx;
+    }
+  }
+}
+// 二维码盒子
+.code-box {
+  .code-school {
+    display: flex;
+    align-items: center;
+    padding-left: 30rpx;
+    padding-top: 10rpx;
+    .avatar {
+      width: 60rpx;
+    }
+    .school-name {
+      margin-left: 10rpx;
+      color: black;
+    }
+  }
+  .code-time {
+    text-align: center;
+    color: black;
+    margin-top: 20rpx;
+    font-size: 30rpx;
+    font-weight: 700;
+  }
+  .uq-code {
+    // border: 1px solid red;
+    display: flex;
+    justify-content: center;
+    margin-top: 40rpx;
+  }
+}
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/pages/my/BackCodeLook/BackCodeLook.vue b/pages/my/BackCodeLook/BackCodeLook.vue
new file mode 100644
index 0000000..e2e2d9c
--- /dev/null
+++ b/pages/my/BackCodeLook/BackCodeLook.vue
@@ -0,0 +1,675 @@
+<template>
+  <view style="background-color: white; height: 100vh">
+    <u-navbar :is-back="false" title="二维码核验"></u-navbar>
+    <!-- 内容 -->
+    <scroll-view
+      scroll-y="true"
+      style="
+        height: calc(100vh - 240rpx);
+        width: 100%;
+        border-top: 1px solid #edf2fa;
+        background-color: #f1f2f6;
+        box-sizing: border-box;
+      "
+    >
+      <!-- 基础信息 -->
+      <view class="base-box">
+        <view class="item-line">
+          <text class="line-label"> 返校人员</text>
+          <text class="line-value"> {{ formData.userName || "-" }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 学院专业</text>
+          <text class="line-value"> {{ formData.college + "-" + formData.major }} </text>
+        </view>
+        <view class="item-line" v-if="false">
+          <text class="line-label"> 学历层次</text>
+          <text class="line-value"> {{ baseMsg.educationStr || "-" }} </text>
+        </view>
+        <view class="item-line" v-if="false">
+          <text class="line-label"> 毕业年份</text>
+          <text class="line-value"> {{ baseMsg.endYear || "-" }} </text>
+        </view>
+      </view>
+      <!-- 表单 -->
+      <view class="form-box">
+        <!-- 返校日期 -->
+        <view class="item-date">
+          <text class="line-label"> 返校日期</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            :value="formData.retuenSchoolTime"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 提示 -->
+        <view class="item-tip" v-if="weekSet.length">
+          <text class="line-label"> 提示：每周{{ dateTip }}暂停开放返校服务</text>
+        </view>
+        <!-- 车牌号 -->
+        <view class="item-line">
+          <text class="line-label"> 车牌号</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.carNumber || '-'"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 联系电话 -->
+        <view class="item-line">
+          <text class="line-label"> 联系电话</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="20"
+            :value="formData.phone"
+            placeholder=""
+          />
+        </view>
+        <!-- 随行人信息 -->
+        <view class="item-line" v-if="sxList.length">
+          <text class="line-label"> 随行人信息</text>
+        </view>
+        <!-- 动态随行人 -->
+        <view class="item-for" v-for="(x, xIndex) in sxList" :key="xIndex">
+          <!-- 左侧内容 -->
+          <view class="for-left">
+            <view class="each">
+              <text> 随行人{{ xIndex + 1 }}</text>
+              <u-input
+                :custom-style="eachStyle"
+                type="text"
+                input-align="right"
+                :border="false"
+                maxlength="20"
+                :value="x.name"
+                placeholder="-"
+                disabled
+              />
+            </view>
+            <view class="each">
+              <text> 手机号</text>
+              <u-input
+                :custom-style="eachStyle"
+                type="text"
+                input-align="right"
+                :border="false"
+                maxlength="20"
+                :value="x.phone"
+                placeholder="-"
+                disabled
+              />
+            </view>
+          </view>
+        </view>
+        <!-- 返校事由 -->
+        <template v-if="false">
+          <view class="item-line">
+            <text class="line-label"> 返校事由</text>
+          </view>
+          <view class="item-text">
+            <u-input
+              type="textarea"
+              height="200"
+              :border="false"
+              :value="formData.retuenSchoolReason || '-'"
+              placeholder=""
+              disabled
+            />
+          </view>
+        </template>
+      </view>
+      <!-- 其余信息 -->
+      <view class="other-box" v-if="false">
+        <!-- 提交时间 -->
+        <view class="item-line">
+          <text class="line-label"> 提交时间</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.createTime"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 核验状态 -->
+        <view class="item-line">
+          <text class="line-label"> 核验状态</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.prebookStateZN"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 核验时间 -->
+        <view class="item-line" v-if="['已核验'].includes(formData.prebookStateZN)">
+          <text class="line-label"> 核验时间</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.hyDate"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 驳回理由 -->
+        <template v-if="['已驳回'].includes(formData.prebookStateZN)">
+          <view class="item-line">
+            <text class="line-label"> 驳回理由</text>
+          </view>
+          <view class="item-text">
+            <u-input
+              type="textarea"
+              height="200"
+              :border="false"
+              :value="formData.auditRemark || '-'"
+              placeholder=""
+              disabled
+            />
+          </view>
+        </template>
+      </view>
+      <view style="height: 50rpx"></view>
+    </scroll-view>
+    <!-- 核验弹窗 -->
+    <u-modal
+      ref="uModal"
+      title="核验口令"
+      v-model="validaShow"
+      @confirm="submitFn"
+      :async-close="true"
+      :show-cancel-button="true"
+    >
+      <view class="dialog">
+        <u-input
+          :custom-style="eachStyle"
+          type="text"
+          maxlength="20"
+          v-model="command"
+          placeholder="请输入核验口令"
+        />
+      </view>
+    </u-modal>
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button style="width: 80%" shape="square" type="primary" @click="validaFn"
+        >核验</u-button
+      >
+    </view>
+    <u-top-tips ref="uTips" :navbar-height="50"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import { AuditStateEnumMap, PrebookStateEnumMap } from "@/enums/index.js";
+export default {
+  data() {
+    return {
+      // 表单
+      formData: {
+        userName: "",
+        college: "",
+        major: "",
+        endYear: "",
+        carNumber: "", // 车牌号
+        phone: "", // 联系电话
+        checked: false, //是否同意
+        retuenSchoolReason: "-", //返校事由
+        retuenSchoolTime: "", //返校日期
+        hyDate: "", //核验时间
+        createTime: "", //提交时间
+        auditRemark: null, //驳回理由
+
+        id: "",
+        retuenSchoolCount: 3,
+        prebookState: 0,
+        prebookStateZN: "", //状态
+        verifyCount: 0,
+        auditState: 0,
+        auditStateZN: "",
+        auditTime: null,
+
+        schoolId:'',
+      },
+      // 随行人
+      sxList: [
+        {
+          name: "",
+          phone: "",
+        },
+      ],
+      // 选择日期
+      dateShow: false,
+      //
+      inputStyle: {
+        lineHeight: "90rpx",
+        height: "90rpx",
+        width: "400rpx",
+      },
+      eachStyle: {
+        lineHeight: "80rpx",
+        height: "80rpx",
+        width: "400rpx",
+      },
+      queryParams: {
+        id: "",
+      },
+      // 基础信息
+      baseMsg: {
+        id: "",
+        name: "", //姓名
+        schoolName: "",
+        schoolLogo: "",
+        startYear: "", //入学年份
+        college: "", //学院
+        educationStr: "", //学历层次
+        major: "", //专业
+        endYear: "", //毕业年份
+      },
+      // 选择日期提示
+      dateTip: "",
+      // 禁用的星期
+      weekSet: [],
+      // 是否查看二维码
+      isVerify: false,
+      // 核验弹窗
+      validaShow: false,
+      // 口令
+      command: "",
+    };
+  },
+  onLoad(e) {
+    console.log(e, "e--");
+    Object.assign(this.queryParams, e);
+  },
+ async onShow() {
+    await this.getDetailFn();
+    // 获取返校设置
+    this.getSetFn();
+  },
+  methods: {
+    //获取返校设置
+    async getSetFn() {
+      const req = {
+        schoolId: this.formData.schoolId,
+      }
+      const res = await this.$u.apiList.SelectInfoSetNoTokenApi(req);
+      console.log(res, "res--");
+      let AllArr = [0, 1, 2, 3, 4, 5, 6];
+      // 星期设置
+      if (res.isDayOfWeek) {
+        let result = res.dayOfWeek.split(",").map((x) => Number(x));
+        this.weekSet = AllArr.filter((x) => {
+          return !result.includes(x);
+        });
+        console.log(this.weekSet, "weekSet--");
+        // 处理tip提示
+        this.dateTip = this.arrayToString(this.weekSet);
+      }
+    },
+    // 核验
+    validaFn() {
+      // 未到核验时间不可核验
+      const startTime = this.formData.retuenSchoolTime.slice(0, 10);
+      if (new Date(startTime) > new Date()) {
+        /* uni.showToast({
+          icon: "none",
+          title: "未到核验时间不可核验",
+          duration: 2000,
+        }); */
+        this.$refs.uToast.show({
+          title: "未到核验时间不可核验",
+          type: "error",
+        });
+        return;
+      }
+      // 判断是否是禁用日期
+      const today = new Date();
+      const todayIndex = today.getDay(); // 获取当前日期的星期几索引
+      if (this.weekSet.includes(todayIndex)) {
+        /* uni.showToast({
+          icon: "none",
+          title: this.dateTip + "暂停开放返校服务,不可核验",
+          duration: 2000,
+        }); */
+        this.$refs.uToast.show({
+          title: this.dateTip + "暂停开放返校服务,不可核验",
+          type: "error",
+        });
+        return;
+      }
+
+      this.validaShow = true;
+      // 默认给一个值
+      let year = new Date().getFullYear();
+      let month =
+        new Date().getMonth() < 10
+          ? `0${new Date().getMonth() + 1}`
+          : new Date().getMonth() + 1;
+      let day =
+        new Date().getDate() < 10 ? `0${new Date().getDate()}` : new Date().getDate();
+      // this.command = year + month + day;
+    },
+    // 确认核验
+    async submitFn() {
+      let year = new Date().getFullYear();
+      let month =
+        new Date().getMonth() < 10
+          ? `0${new Date().getMonth() + 1}`
+          : new Date().getMonth() + 1;
+      let day =
+        new Date().getDate() < 10 ? `0${new Date().getDate()}` : new Date().getDate();
+
+      let currentDate = year + month + day;
+      console.log(currentDate, "currentDate--");
+      if (!this.command) {
+        /* uni.showToast({
+          icon: "none",
+          title: "请输入核验口令",
+        }); */
+        this.$refs.uToast.show({
+          title: "请输入核验口令",
+          type: "error",
+        });
+        this.$refs.uModal.clearLoading();
+        return;
+      }
+      if (this.command !== currentDate) {
+        /* uni.showToast({
+          icon: "none",
+          title: "核验口令不正确!",
+        }); */
+        this.$refs.uToast.show({
+          title: "核验口令不正确!",
+          type: "error",
+        });
+        this.$refs.uModal.clearLoading();
+        return;
+      }
+      const req = {
+        id: this.queryParams.id,
+        command: this.command,
+        schoolId: this.formData.schoolId,
+      };
+      const res = await this.$u.apiList.SaveReturnSchoolInfoNoTokenApi(req);
+      console.log(res, "res----");
+      this.$refs.uModal.clearLoading();
+      /* uni.showToast({
+        title: "核验成功",
+        duration: 2000,
+      }); */
+      this.$refs.uToast.show({
+        title: "核验成功",
+        type: "success",
+      });
+      this.validaShow = false;
+      setTimeout(() => {
+        // 跳转成功界面
+        // this.$u.route({
+        //   url: "pages/my/BackSuccess/BackSuccess",
+        // });
+        uni.redirectTo({
+          url: "/pages/my/BackSuccess/BackSuccess",
+        });
+      }, 1000);
+    },
+    arrayToString(arr) {
+      let result = "";
+      const map = new Map([
+        [0, "周日"],
+        [1, "周一"],
+        [2, "周二"],
+        [3, "周三"],
+        [4, "周四"],
+        [5, "周五"],
+        [6, "周六"],
+      ]);
+      arr.forEach((x) => {
+        if (map.has(x)) {
+          result += map.get(x) + "、";
+        }
+      });
+      return arr.length ? result.slice(0, result.length - 1) : result;
+    },
+
+    // 获取教育经历
+    async getSchoolFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyEducations(req);
+      console.log(res, "res--");
+      const findRow = res.find((x) => x.isSelected === true);
+      if (!findRow) {
+        /* uni.showToast({
+          title: "未查询到当前教育经历",
+          icon: "none",
+        }); */
+        this.$refs.uToast.show({
+          title: "未查询到当前教育经历",
+          type: "error",
+        });
+        return;
+      }
+      Object.assign(this.baseMsg, findRow);
+      this.baseMsg.name = this.vuex_user.name;
+    },
+    // 获取详情
+    async getDetailFn() {
+      const req = {
+        id: this.queryParams.id,
+      };
+      const res = await this.$u.apiList.SelectReturnSchoolInfoNotokenApi(req);
+      console.log(res, "res-");
+      // 回填基础信息
+      Object.assign(this.formData, res);
+      this.formData.prebookStateZN = PrebookStateEnumMap.get(res.prebookState);
+      this.formData.auditStateZN = AuditStateEnumMap.get(res.auditState);
+      this.formData.retuenSchoolTime = res.retuenSchoolTime
+        .replaceAll("0:00:00", "")
+        .replaceAll("00:00:00", "");
+      console.log(JSON.parse(JSON.stringify(this.formData)));
+      // 回填随行人
+      this.sxList = res.returnSchoolPrebookTogetherPerson.sort((a, b) => {
+        return a.index - b.index;
+      });
+    },
+  },
+  watch: {
+    validaShow(val) {
+      console.log(val, "val--");
+      console.log(val === false, "val === false--");
+      if (val === false) {
+        console.log("清空了");
+        this.command = "";
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.body-box {
+  max-height: calc(100vh - 250rpx);
+  overflow-y: auto;
+  border: 1px solid red;
+}
+// 基础信息
+.base-box {
+  background-color: white;
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+    .line-value {
+      // font-weight: 700;
+      color: #969696;
+    }
+  }
+}
+// 表单
+.form-box {
+  margin-top: 20rpx;
+  background-color: white;
+  // 返校日期
+  .item-date {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    position: relative;
+    // border-bottom: 1px solid #f1f2f6;
+    .input-mask {
+      position: absolute;
+      width: 100%;
+      height: 90rpx;
+      // background-color: red;
+    }
+    .img {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 50rpx;
+      // padding-right: 30rpx;
+    }
+  }
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+  }
+  // 提示
+  .item-tip {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    padding-bottom: 10rpx;
+    font-size: 22rpx;
+    // line-height: 90rpx;
+    // height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: red;
+    }
+  }
+  // 随行人样式
+  .item-for {
+    background-color: #f7f6f9;
+    padding-left: 30rpx;
+    display: flex;
+    width: 100%;
+    border-bottom: 1px solid #7b7c8033;
+    .for-left {
+      // border: 1px solid blue;
+      width: calc(100%);
+      .each {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        line-height: 80rpx;
+        height: 80rpx;
+        padding-right: 30rpx;
+      }
+    }
+  }
+  // 文本框
+  .item-text {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+  }
+}
+// 其余信息
+.other-box {
+  margin-top: 20rpx;
+  background-color: white;
+  // 文本框
+  .item-text {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+  }
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+  }
+}
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.dialog {
+  // border: 1px solid red;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  margin-top: 50rpx;
+  margin-bottom: 80rpx;
+}
+</style>
diff --git a/pages/my/BackDetail/BackDetail.vue b/pages/my/BackDetail/BackDetail.vue
new file mode 100644
index 0000000..97aec5e
--- /dev/null
+++ b/pages/my/BackDetail/BackDetail.vue
@@ -0,0 +1,741 @@
+<template>
+  <view style="background-color: white; height: 100vh">
+    <u-navbar title="返校预约申请" :custom-back="goPageFn"></u-navbar>
+    <!-- 内容 -->
+    <scroll-view
+      scroll-y="true"
+      style="
+        height: calc(100vh - 240rpx);
+        width: 100%;
+        border-top: 1px solid #edf2fa;
+        background-color: #f1f2f6;
+        box-sizing: border-box;
+      "
+    >
+      <!-- 基础信息 -->
+      <view class="base-box">
+        <view class="item-line">
+          <text class="line-label"> 预约人</text>
+          <text class="line-value"> {{ formData.userName || "-" }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 学院专业</text>
+          <text class="line-value"> {{ baseMsg.college + "-" + baseMsg.major }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 学历层次</text>
+          <text class="line-value"> {{ baseMsg.educationStr || "-" }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 毕业年份</text>
+          <text class="line-value"> {{ baseMsg.endYear || "-" }} </text>
+        </view>
+      </view>
+      <!-- 表单 -->
+      <view class="form-box">
+        <!-- 返校日期 -->
+        <view class="item-date">
+          <text class="line-label"> 返校日期</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            :value="formData.retuenSchoolTime"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 提示 -->
+        <view class="item-tip" v-if="weekSet.length">
+          <text class="line-label"> 提示：每周{{ dateTip }}暂停开放返校服务</text>
+        </view>
+        <!-- 车牌号 -->
+        <view class="item-line">
+          <text class="line-label"> 车牌号</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.carNumber || '-'"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 联系电话 -->
+        <view class="item-line">
+          <text class="line-label"> 联系电话</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="20"
+            :value="formData.phone"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 随行人信息 -->
+        <view class="item-line" v-if="sxList.length">
+          <text class="line-label"> 随行人信息</text>
+        </view>
+        <!-- 动态随行人 -->
+        <view class="item-for" v-for="(x, xIndex) in sxList" :key="xIndex">
+          <!-- 左侧内容 -->
+          <view class="for-left">
+            <view class="each">
+              <text> 随行人{{ xIndex + 1 }}</text>
+              <u-input
+                :custom-style="eachStyle"
+                type="text"
+                input-align="right"
+                :border="false"
+                maxlength="20"
+                :value="x.name"
+                placeholder="-"
+                disabled
+              />
+            </view>
+            <view class="each">
+              <text> 手机号</text>
+              <u-input
+                :custom-style="eachStyle"
+                type="text"
+                input-align="right"
+                :border="false"
+                maxlength="20"
+                :value="x.phone"
+                placeholder="-"
+                disabled
+              />
+            </view>
+          </view>
+        </view>
+        <!-- 返校事由 -->
+        <view class="item-line" style="border-bottom: none;">
+          <text class="line-label"> 返校事由</text>
+        </view>
+        <view class="item-text">
+          <u-input
+          :custom-style="{color:'#969696'}"
+            type="textarea"
+            height="200"
+            :border="false"
+            :value="formData.retuenSchoolReason || '-'"
+            placeholder=""
+            disabled
+          />
+        </view>
+      </view>
+      <!-- 其余信息 -->
+      <view class="other-box">
+        <!-- 提交时间 -->
+        <view class="item-line">
+          <text class="line-label"> 提交时间</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.createTime"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 核验状态 -->
+        <view class="item-line">
+          <text class="line-label"> 核验状态</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.prebookStateZN"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 核验时间 -->
+        <view class="item-line" v-if="['已核验'].includes(formData.prebookStateZN)">
+          <text class="line-label"> 核验时间</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.returnSchoolPrebookVerify[0].verifyTime"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 取消时间  --- 待对接 -->
+        <view class="item-line" v-if="['已取消'].includes(formData.prebookStateZN)">
+          <text class="line-label"> 取消时间</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.cancelTime"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 审核时间 -->
+        <!-- v-if="['已驳回', '已核验', '未返校'].includes(formData.prebookStateZN)" -->
+        <view
+          class="item-line"
+          v-if="formData.auditTime"
+        >
+          <text class="line-label"> 审核时间</text>
+          <u-input
+            :custom-style="inputStyle"
+            type="text"
+            input-align="right"
+            :border="false"
+            maxlength="10"
+            :value="formData.auditTime"
+            placeholder=""
+            disabled
+          />
+        </view>
+        <!-- 驳回理由 -->
+        <template v-if="['已驳回'].includes(formData.prebookStateZN)">
+          <view class="item-line">
+            <text class="line-label"> 驳回理由</text>
+          </view>
+          <view class="item-text">
+            <u-input
+              type="textarea"
+              height="200"
+              :border="false"
+              :value="formData.auditRemark || '-'"
+              placeholder=""
+              disabled
+            />
+          </view>
+        </template>
+      </view>
+      <view style="height: 50rpx;background: #fff;"></view>
+    </scroll-view>
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button
+        v-if="['待审核'].includes(queryParams.status)"
+        style="width: 80%"
+        shape="circle"
+        type="primary"
+        @click="cancelFn"
+        >取消预约</u-button
+      >
+      <template v-if="['待核验'].includes(queryParams.status)">
+        <u-button
+          v-if="['管理员未开启核验功能'].includes(formData.prebookStateZN) && this.formData.isFlag === false"
+          style="width: 80%"
+          shape="circle"
+          type="primary"
+          @click="cancelFn"
+        >
+         取消预约
+        </u-button>
+        <u-button
+        v-if="['管理员未开启核验功能'].includes(formData.prebookStateZN)  && this.formData.isFlag === true"
+          style="width: 80%"
+          shape="circle"
+          type="primary"
+          @click="submitFn"
+        >
+        确认返校
+        </u-button>
+      </template>
+      <template v-if="['已结束'].includes(queryParams.status)">
+        <u-button
+          v-if="['已取消'].includes(formData.prebookStateZN)"
+          style="width: 80%; background-color: #9ea1b9; color: white"
+          disabled
+          shape="circle"
+        >
+          已取消
+        </u-button>
+        <u-button
+          v-if="['已驳回'].includes(formData.prebookStateZN)"
+          style="width: 80%; background-color: #9ea1b9; color: white"
+          disabled
+          shape="circle"
+        >
+          已驳回
+        </u-button>
+        <u-button
+          v-if="['已核验'].includes(formData.prebookStateZN)"
+          style="width: 80%; background-color: #9ea1b9; color: white"
+          disabled
+          shape="circle"
+        >
+          已核验
+        </u-button>
+        <u-button
+          v-if="['未返校','管理员未开启核验功能'].includes(formData.prebookStateZN)"
+          style="width: 80%; background-color: #9ea1b9; color: white"
+          disabled
+          shape="circle"
+        >
+          未返校
+        </u-button>
+      </template>
+    </view>
+    <u-top-tips ref="uTips" :navbar-height="50"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import { AuditStateEnumMap, PrebookStateEnumMap } from "@/enums/index.js";
+export default {
+  data() {
+    return {
+      // 表单
+      formData: {
+        userName: "李彪",
+        college: "计算机信息工程学院",
+        major: "计算机科学与技术",
+        endYear: "2029",
+        carNumber: "", // 车牌号
+        phone: "", // 联系电话
+        checked: false, //是否同意
+        retuenSchoolReason: "-", //返校事由
+        retuenSchoolTime: "", //返校日期
+        auditTime: "", //审核时间
+        createTime: "", //提交时间
+        auditRemark: null, //驳回理由
+
+        id: "",
+        retuenSchoolCount: 3,
+        prebookState: 0,
+        prebookStateZN: "", //状态
+        verifyCount: 0,
+        auditState: 0,
+        auditStateZN: "",
+
+        isFlag:false,//区分是否在核验时间内
+      },
+      // 随行人
+      sxList: [
+        {
+          name: "",
+          phone: "",
+        },
+      ],
+      // 选择日期
+      dateShow: false,
+      //
+      inputStyle: {
+        lineHeight: "90rpx",
+        height: "90rpx",
+        width: "400rpx",
+        color:"#969696"
+      },
+      eachStyle: {
+        lineHeight: "80rpx",
+        height: "80rpx",
+        width: "400rpx",
+        color:"#969696"
+      },
+      queryParams: {
+        id: "",
+      },
+      // 基础信息
+      baseMsg: {
+        id: "",
+        name: "", //姓名
+        schoolName: "",
+        schoolLogo: "",
+        startYear: "", //入学年份
+        college: "", //学院
+        educationStr: "", //学历层次
+        major: "", //专业
+        endYear: "", //毕业年份
+      },
+      // 选择日期提示
+      dateTip: "",
+      weekSet: [],
+      // 是否查看二维码
+      isVerify: false,
+    };
+  },
+  onLoad(e) {
+    console.log(e, "e--");
+    Object.assign(this.queryParams, e);
+  },
+  async created() {
+   await this.getSchoolFn();
+    await this.getSetFn();
+    this.getDetailFn();
+  },
+  methods: {
+    goPageFn(){
+      // 返回上一页
+      /* this.$u.route({
+        url: "pages/my/BackSchool/BackSchool",
+      }); */
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+    arrayToString(arr) {
+      let result = "";
+      const map = new Map([
+        [0, "周日"],
+        [1, "周一"],
+        [2, "周二"],
+        [3, "周三"],
+        [4, "周四"],
+        [5, "周五"],
+        [6, "周六"],
+      ]);
+      arr.forEach((x) => {
+        if (map.has(x)) {
+          result += map.get(x) + "、";
+        }
+      });
+      return arr.length ? result.slice(0, result.length - 1) : result;
+    },
+    //获取返校设置
+    async getSetFn() {
+      const req = {
+        schoolId: this.baseMsg.schoolId,
+      }
+      const res = await this.$u.apiList.SelectInfoSetApi(req);
+      console.log(res, "res--");
+      let AllArr = [0, 1, 2, 3, 4, 5, 6];
+      // 星期设置
+      if (res.isDayOfWeek) {
+        // 星期设置
+        let result = res.dayOfWeek.split(",").map((x) => Number(x));
+        this.weekSet = AllArr.filter((x) => {
+          return !result.includes(x);
+        });
+        // 处理tip提示
+        this.dateTip = this.arrayToString(this.weekSet);
+      }
+      // 是否查看二维码
+      this.isVerify = res.isVerify;
+    },
+    // 获取教育经历
+    async getSchoolFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyEducations(req);
+      console.log(res, "res--");
+      const findRow = res.find((x) => x.isSelected === true);
+      if (!findRow) {
+        /* uni.showToast({
+          title: "未查询到当前教育经历",
+          icon: "none",
+        }); */
+        this.$refs.uToast.show({
+          title: "未查询到当前教育经历",
+          type: "error",
+        });
+        return;
+      }
+      Object.assign(this.baseMsg, findRow);
+      this.baseMsg.name = this.vuex_user.name;
+    },
+    // 取消预约
+    async cancelFn() {
+      uni.showModal({
+        // title: "提示",
+        content: `确定取消本次预约？`,
+        success: async (res) => {
+          if (res.confirm) {
+            const req = {
+              id: this.queryParams.id,
+              // educationId: this.baseMsg.id,
+            };
+            const res = await this.$u.apiList.DelReturnSchoolInfoApi(req).catch(e=>e);
+            console.log(res, "res----");
+            if(res?.succeed === false){
+                /* uni.showToast({
+                  icon:'error',
+                  title: res.error || '取消失败',
+                  duration: 2000,
+                }); */
+              this.$refs.uToast.show({
+                title: res.error || "取消失败",
+                type: "error",
+              });
+              return 
+            }
+           /*  uni.showToast({
+              title: "取消预约成功",
+              duration: 2000,
+            }); */
+            this.$refs.uToast.show({
+              title: "取消预约成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              // 返回上一页
+              /* this.$u.route({
+                url: "pages/my/BackSchool/BackSchool",
+              }); */
+              uni.navigateBack({
+                delta: 1
+              });
+            }, 1000);
+          }
+          if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    // 确认返校
+    async submitFn(){
+      uni.showModal({
+        // title: "提示",
+        content: `是否确认返校？确认后您的预约状态将变更为 “已返校”`,
+        success: async (res) => {
+          let year = new Date().getFullYear();
+          let month =
+            new Date().getMonth() < 10
+              ? `0${new Date().getMonth() + 1}`
+              : new Date().getMonth() + 1;
+          let day =
+            new Date().getDate() < 10 ? `0${new Date().getDate()}` : new Date().getDate();
+
+          let currentDate = year + month + day;
+          if (res.confirm) {
+            const req = {
+              id: this.queryParams.id,
+              command: currentDate,
+              schoolId: this.baseMsg.schoolId,
+            };
+            const res = await this.$u.apiList.SaveReturnSchoolInfoApi(req).catch(e=>e);
+            console.log(res, "res----");
+            if(res?.succeed === false){
+                /* uni.showToast({
+                  icon:'error',
+                  title: res.error || '确认失败',
+                  duration: 2000,
+                }); */
+              this.$refs.uToast.show({
+                title: res.error || "确认失败",
+                type: "error",
+              });
+              return 
+            }
+            /* uni.showToast({
+              title: "确认成功",
+              duration: 2000,
+            }); */
+            this.$refs.uToast.show({
+              title: "确认成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              // 返回上一页
+              /* this.$u.route({
+                url: "pages/my/BackSchool/BackSchool",
+              }); */
+              uni.navigateBack({
+                delta: 1
+              });
+            }, 1000);
+          }
+          if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    // 获取详情
+    async getDetailFn() {
+      const req = {
+        id: this.queryParams.id,
+      };
+      const res = await this.$u.apiList.SelectReturnSchoolInfoApi(req);
+      console.log(res, "res-");
+      // 回填基础信息
+      Object.assign(this.formData, res);
+      this.formData.prebookStateZN = PrebookStateEnumMap.get(res.prebookState);
+      // 如果未开启二维码,待核验变成 管理员未开启核验功能
+      if (this.isVerify === false && ["待核验"].includes(this.formData.prebookStateZN)) {
+        this.formData.prebookStateZN = "管理员未开启核验功能";
+      }
+      this.formData.auditStateZN = AuditStateEnumMap.get(res.auditState);
+      this.formData.retuenSchoolTime = res.retuenSchoolTime
+        .replaceAll("0:00:00", "")
+        .replaceAll("00:00:00", "");
+      console.log(JSON.parse(JSON.stringify(this.formData)),'this.formData-');
+      // 回填随行人
+      this.sxList = res.returnSchoolPrebookTogetherPerson.sort((a, b) => {
+        return a.index - b.index;
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.body-box {
+  max-height: calc(100vh - 250rpx);
+  overflow-y: auto;
+  border: 1px solid red;
+}
+// 基础信息
+.base-box {
+  background-color: white;
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+  }
+}
+.line-value {
+  // font-weight: 700;
+  color: #969696;
+}
+// 表单
+.form-box {
+  margin-top: 20rpx;
+  background-color: white;
+  // 返校日期
+  .item-date {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    position: relative;
+    .input-mask {
+      position: absolute;
+      width: 100%;
+      height: 90rpx;
+      // background-color: red;
+    }
+    .img {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 50rpx;
+      // padding-right: 30rpx;
+    }
+  }
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+  }
+  // 提示
+  .item-tip {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    padding-bottom: 10rpx;
+    font-size: 22rpx;
+    // line-height: 90rpx;
+    // height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: red;
+    }
+  }
+  // 随行人样式
+  .item-for {
+    background-color: #f7f6f9;
+    padding-left: 30rpx;
+    display: flex;
+    width: 100%;
+    border-bottom: 1px solid #7b7c8033;
+    .for-left {
+      // border: 1px solid blue;
+      width: calc(100%);
+      .each {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        line-height: 80rpx;
+        height: 80rpx;
+        padding-right: 30rpx;
+      }
+    }
+  }
+  // 文本框
+  .item-text {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+  }
+}
+// 其余信息
+.other-box {
+  margin-top: 20rpx;
+  background-color: white;
+  // 文本框
+  .item-text {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+  }
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1px solid #f1f2f6;
+    .line-label {
+      // font-size: 30rpx;
+      color: black;
+    }
+  }
+}
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/pages/my/BackSchool/BackSchool.vue b/pages/my/BackSchool/BackSchool.vue
new file mode 100644
index 0000000..eef11ff
--- /dev/null
+++ b/pages/my/BackSchool/BackSchool.vue
@@ -0,0 +1,387 @@
+<template>
+  <view style="background-color: white; height: 100vh">
+    <u-navbar title="返校预约" :custom-back="goPageFn"></u-navbar>
+    <!-- tabs -->
+    <u-tabs-swiper
+      ref="uTabs"
+      :list="tabList"
+      :current="current"
+      :is-scroll="false"
+      :active-item-style="{ color: '#3CB5FB'}"
+      :bar-style="{ background: '#3CB5FB' }"
+      @change="tabsChange"
+    ></u-tabs-swiper>
+    <!-- 滚动区域 -->
+    <scroll-view
+      scroll-y="true"
+      style="
+        height: calc(100vh - 320rpx);
+        width: 100%;
+        border-top: 1px solid #edf2fa;
+        background-color: #f1f2f6;
+        box-sizing: border-box;
+      "
+      @scrolltolower="onreachBottom"
+    >
+      <view
+        class="item"
+        v-for="(x, y) in schoolList"
+        @click="detailFn(x)"
+        :key="y"
+      >
+        <view class="item-line">
+          <text class="line-label"> 预约人：</text>
+          <text class="line-value"> {{ x.userName }} </text>
+          <!-- 待审核 -->
+          <text v-if="current === 0" class="line-status yellow">待审核</text>
+          <!-- 待核验 -->
+          <template v-if="current === 1">
+            <text class="line-status blue">待核验</text>
+          </template>
+          <!-- 已结束 -->
+          <template v-if="current === 2">
+            <text
+              v-if="['已核验'].includes(x.prebookStateZN)"
+              class="line-status green"
+              >已返校</text
+            >
+            <text
+              v-if="['未返校', '待核验'].includes(x.prebookStateZN)"
+              class="line-status red"
+              >未返校</text
+            >
+            <text
+              v-if="['已驳回'].includes(x.prebookStateZN)"
+              class="line-status red"
+              >已驳回</text
+            >
+            <text
+              v-if="['已取消'].includes(x.prebookStateZN)"
+              class="line-status red"
+              >已取消</text
+            >
+          </template>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 预约时间：</text>
+          <text class="line-value"> {{ x.retuenSchoolTime || "-" }} </text>
+        </view>
+        <view class="item-line">
+          <text class="line-label"> 车牌号：</text>
+          <text class="line-value"> {{ x.carNumber || "-" }} </text>
+        </view>
+        <view class="item-time">
+          <text class="line-label"> 提交时间：</text>
+          <text class="line-value"> {{ x.createTime || "-" }} </text>
+        </view>
+      </view>
+      <no-data v-if="!schoolList.length"></no-data>
+    </scroll-view>
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button
+        style="width: 90%"
+        shape="circle"
+        type="primary"
+        @click="applyFn"
+        >我要预约</u-button
+      >
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import { Debounce } from "../../../common/utils.js";
+import { AuditStateEnumMap, PrebookStateEnumMap } from "@/enums/index.js";
+import NoData from "@/components/NoData.vue";
+export default {
+  components: { NoData },
+  data() {
+    return {
+      tabList: [
+        {
+          name: "待审核",
+        },
+        {
+          name: "待核验",
+        },
+        {
+          name: "已结束",
+        },
+      ],
+      current: 0,
+      // 预约列表
+      schoolList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      total: 0,
+      // 星期设置
+      weekSet: [],
+      // 学校基础信息
+      baseMsg: {
+        id: "",
+        name: "", //姓名
+        schoolName: "",
+        schoolLogo: "",
+        startYear: "", //入学年份
+        college: "", //学院
+        educationStr: "", //学历层次
+        major: "", //专业
+        endYear: "", //毕业年份
+      },
+    };
+  },
+  async onLoad(e) {
+    // console.log(AuditStateEnum, "AuditStateEnum--");
+    // 获取用户当前学校
+    await this.getSchoolFn();
+    // 获取列表
+    this.getListFn();
+    // 获取设置
+    this.getSetFn();
+  },
+  created() {},
+  methods: {
+    // 获取用户当前学校
+    async getSchoolFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyEducations(req);
+      console.log(res, "res--");
+      const findRow = res.find((x) => x.isSelected === true);
+      if (!findRow) {
+        /* uni.showToast({
+          title: "未查询到当前教育经历",
+          icon: "none",
+        }); */
+        this.$refs.uToast.show({
+          title: "未查询到当前教育经历",
+          type: "error",
+        });
+        return;
+      }
+      console.log(findRow, "findRow--当前学校");
+      Object.assign(this.baseMsg, findRow);
+    },
+    //获取返校设置
+    async getSetFn() {
+      const req = {
+        schoolId: this.baseMsg.schoolId,
+      };
+      const res = await this.$u.apiList.SelectInfoSetApi(req);
+      console.log(res, "res--");
+      // 星期设置
+      this.weekSet = res.dayOfWeek.split(",").map((x) => Number(x));
+      // 是否查看二维码
+      this.isVerify = res.isVerify;
+    },
+    // 触底函数
+    onreachBottom() {
+      console.log("触底了");
+      let num = this.pageIndex * this.pageSize;
+      if (num >= this.total) return;
+      this.pageIndex++;
+      this.getListFn();
+    },
+    // 获取列表
+    async getListFn() {
+      const req = {
+        id: this.vuex_user.id,
+        type: this.current,
+        pageIndex: this.pageIndex,
+        pageSize: this.pageSize,
+        educationId: this.baseMsg.id,
+      };
+      let res = null;
+      // 待审核
+      if ([0].includes(this.current)) {
+        res = await this.$u.apiList.SelectReturnSchoolList_dshApi(req);
+      }
+      // 待核验，已结束
+      if ([1, 2].includes(this.current)) {
+        res = await this.$u.apiList.SelectReturnSchoolList_typeApi(req);
+      }
+      console.log(res, "res--");
+      this.total = res.item2;
+      if (res.item1.length) {
+        this.schoolList = [...this.schoolList, ...res.item1];
+        //
+        this.schoolList.forEach((x) => {
+          x.prebookStateZN = PrebookStateEnumMap.get(x.prebookState);
+          x.auditStateZN = AuditStateEnumMap.get(x.auditState);
+          // x.retuenSchoolTime = x.retuenSchoolTime.slice(0, 9);
+        });
+        console.log(
+          JSON.parse(JSON.stringify(this.schoolList)),
+          "this.schoolList"
+        );
+      }
+    },
+    goPageFn() {
+      /* uni.switchTab({
+        url: "/pages/my/my/my",
+      }); */
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+    // tabschange
+    tabsChange(i) {
+      console.log(i, "i----");
+      if (this.current !== i) {
+        this.current = i;
+        this.schoolList = [];
+        this.pageIndex = 1;
+        this.getListFn();
+      }
+    },
+    // 我要预约
+    applyFn() {
+      if (!this.weekSet.length) {
+        /* uni.showToast({
+          title: "当前暂停开放返校服务",
+          icon: "none",
+        }); */
+        this.$refs.uToast.show({
+          title: "当前暂停开放返校服务",
+          type: "error",
+        });
+        return;
+      }
+      this.$u.route({
+        url: "pages/my/BackApply/BackApply",
+      });
+    },
+    // 查看详情
+    detailFn(row) {
+      console.log(row, "row----");
+      // 待审核
+      if ([0].includes(this.current)) {
+        this.$u.route({
+          url: `pages/my/BackDetail/BackDetail?id=${row.id}&status=待审核`,
+        });
+      }
+      // 待核验
+      if ([1].includes(this.current)) {
+        // 开启二维码
+        if (this.isVerify) {
+          // 核验二维码
+          this.$u.route({
+            url: `pages/my/BackCode/BackCode?id=${row.id}&status=待核验`,
+          });
+          return;
+        }
+        // 未开启二维码
+        this.$u.route({
+          url: `pages/my/BackDetail/BackDetail?id=${row.id}&status=待核验`,
+        });
+      }
+      // 已结束
+      if ([2].includes(this.current)) {
+        this.$u.route({
+          url: `pages/my/BackDetail/BackDetail?id=${row.id}&status=已结束`,
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.item {
+  width: calc(100% - 64rpx);
+  margin: 32rpx 32rpx 0;
+  // height: 80rpx;
+  text-align: center;
+  // border-bottom: 1px solid blue;
+  // margin-top: 20rpx;
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+  background: #FFFFFF;
+border-radius: 24rpx;
+border: 2rpx solid #F7F6F9;
+  // 时间
+  .item-time {
+    text-align: left;
+    padding-left: 30rpx;
+    font-size: 30rpx;
+    line-height: 40rpx;
+    margin-bottom: 20rpx;
+    font-size: 28rpx;
+    color: #969696;
+    .line-value {
+      // font-weight: 700;
+      color: black;
+    }
+  }
+  // 单行样式
+  .item-line {
+    text-align: left;
+    padding-left: 30rpx;
+    font-size: 30rpx;
+    // line-height: 40rpx;
+    margin-bottom: 20rpx;
+    display: flex;
+    align-items: center;
+    .line-label {
+      // font-size: 30rpx;
+      color: #969696;
+    }
+    .line-value {
+      // font-weight: 700;
+      color: black;
+    }
+    // 状态
+    .line-status {
+      // padding-left: 20rpx;
+      // padding-right: 20rpx;
+      margin-left: 20rpx;
+      font-size: 24rpx;
+      display: inline-block;
+      box-sizing: border-box;
+      width: 104rpx;
+      height: 48rpx;
+      line-height: 48rpx;
+      text-align: center;
+      border-radius: 6rpx;
+    }
+    // 待审核
+    .yellow {
+      color: #efa643;
+      background-color: #fef6e7;
+    }
+    // 待核验
+    .blue {
+      color: #278eeb;
+      background-color: #e7f3ff;
+    }
+    // 已核验
+    .green {
+      color: #74b57f;
+      background-color: #ecfbf4;
+    }
+    // 未返校 已驳回 已取消
+    .red {
+      color: #d2564c;
+      background-color: #ffeeed;
+    }
+  }
+}
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f1f2f6;
+}
+::v-deep .u-tabs-scorll-flex .u-tabs-item {
+		transition: all 0.1s;
+		font-size: 28rpx !important;
+	}
+</style>
diff --git a/pages/my/BackSuccess/BackSuccess.vue b/pages/my/BackSuccess/BackSuccess.vue
new file mode 100644
index 0000000..4779592
--- /dev/null
+++ b/pages/my/BackSuccess/BackSuccess.vue
@@ -0,0 +1,80 @@
+<template>
+  <view style="background-color: white; height: 100vh">
+    <u-navbar :is-back="false" title="核验" :custom-back="goPageFn"></u-navbar>
+    <view class="icon-box">
+      <view class="center-box">
+        <u-icon name="checkbox-mark" color="white" class="icon" size="100"></u-icon>
+      </view>
+    </view>
+    <view style="text-align: center; margin-top: 100rpx; font-size: 40rpx"
+      >核验成功！</view
+    >
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      name: "666",
+    };
+  },
+  onLoad(e) {
+    console.log(e, "e--");
+  },
+  created() {},
+  methods: {
+    goPageFn() {
+      /* uni.redirectTo({
+        url: "/pages/my/BackSchool/BackSchool",
+      }); */
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+    submitFn() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 基础信息
+
+.icon-box {
+  // border-radius: 50%;
+  // border: 1px solid red;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 300rpx;
+  .center-box {
+    // border: 1px solid blue;
+    width: 150rpx;
+    height: 150rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    overflow: hidden;
+    background-color: #16bf32;
+    .icon {
+      background-color: #16bf32;
+    }
+    box-shadow: 0 0 0 20px #b9d8b7; /* 初始阴影样式 */
+    animation: shadowBreathe 2s ease-in-out infinite; /* 应用动画 */
+  }
+}
+@keyframes shadowBreathe {
+  0%,
+  100% {
+    box-shadow: 0 0 0 0 #c5e7c3; /* 阴影在起始和结束时较淡 */
+  }
+  // 25%,
+  // 75% {
+  //   box-shadow: 0 0 0 20px #e1fddf; /* 阴影在中间点时更明显 */
+  // }
+  50% {
+    box-shadow: 0 0 0 25px #e1fddf; /* 阴影在中间点时更明显 */
+  }
+}
+</style>
diff --git a/pages/my/Feedback/Feedback.vue b/pages/my/Feedback/Feedback.vue
new file mode 100644
index 0000000..d9e2867
--- /dev/null
+++ b/pages/my/Feedback/Feedback.vue
@@ -0,0 +1,309 @@
+<template>
+  <view>
+    <u-navbar title="意见反馈"></u-navbar>
+    <view class="flex-col page">
+      <view class="flex-col group">
+        <view class="flex-col items-center text-wrapper">
+          <u-input v-model='contactPhone' class="text_1" placeholder="请输入联系电话" type="text"/>
+        </view>
+        <view class="flex-col items-start section_3">
+          <view class="group_1">
+            <u-input v-model='content' :custom-style="textareaStyle" maxlength="500" placeholder="请输入反馈内容" type="textarea"
+                     @blur="inputBlur" @click="shuru"/>
+          </view>
+          <view class="uping">
+            <u-upload ref="uUpload" :action="$u.http.config.baseUrl + action" :header='header'
+                      @on-success="onSuccess" @on-remove="onRemove"></u-upload>
+          </view>
+        </view>
+      </view>
+      <view class="flex-col items-center text-wrapper_4" @click="onbuttonClick">
+        <text class="text_18">提 交</text>
+      </view>
+    </view>
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast"/>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      textareaStyle: {
+        width: "80%",
+      },
+      fileList: [],
+      contactPhone: '',
+      content: '',
+      emojiData: [],
+      emoji: false,
+      emojicurrent: 0,
+      header: {
+        Authorization: ""
+      },
+      action: '/app/User/File',
+      imgData: [],
+      schoolId: "",
+      sysSignStr: [],
+      num: "",
+      tabs: [],
+      arr1: [],
+      type: "",
+    };
+  },
+  onLoad(e) {
+    this.header.Authorization = "Bearer " + this.vuex_token;
+    this.getSchool();
+  },
+  methods: {
+    // 获取学校
+    async getSchool() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyEducations(req);
+      this.schoolId = res.filter(function (x) {
+        return x.isSelected === true
+      })[0].schoolId
+    },
+    // 提示
+    tips(title, type, time) {
+      this.$refs.uToast.show({
+        title: title ? title : "",
+        type: type ? type : "success",
+        duration: time ? time + "" : "1000",
+      });
+    },
+
+    onbuttonClick() {
+      var reg = new RegExp("^[1][3,4,5,7,8,9][0-9]{9}$", "g"); //手机号
+      if (this.contactPhone === "" || !reg.test(this.contactPhone)) {
+        this.tips("请输入正确的手机号码", "error");
+        return
+      }
+      if (this.content === "") {
+        this.tips('请输入反馈内容', 'error')
+        return
+      }
+      // let files = this.$refs.uUpload.lists[0];
+      let file = this.imgData.join(',')
+      if (!file) {
+        this.tips("请上传图片", "error");
+        return false
+      }
+      const data = {
+        userId: this.vuex_user.id,
+        schoolId: this.schoolId,
+        content: this.content,
+        contactPhone: this.contactPhone,
+        image: file
+      }
+      console.info("🚀 ~ file:Feedback method:onbuttonClick line:101 -----", data)
+
+      // return
+      this.onSubmitFeedback(data)
+    },
+    //提交反馈
+    onSubmitFeedback(data) {
+      this.$u.apiList.SubmitFeedback(data).then((res) => {
+        this.$refs.uToast.show({
+          title: '提交成功',
+          type: 'success',
+        })
+        setTimeout(() => {
+          this.$u.route({
+            url: 'pages/my/mySeting/mySeting'
+          })
+          // uni.switchTab({
+          //   url: "../../../pages/my/my/my"
+          // });
+        }, 1000)
+      })
+    },
+
+    onSuccess(res) {
+
+      this.imgData.push(res.data)
+    },
+    onRemove(index, lists) {
+      let imgs = []
+      lists.forEach(item => {
+        imgs.push(item.response.data)
+      })
+      this.imgData = imgs
+    },
+    inputBlur() {
+      ;
+    },
+    shuru() {
+      ;
+    },
+    //返回上一级
+    router() {
+      this.$u.route({
+        url: 'pages/my/mySeting/mySeting'
+      })
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.emojishow {
+  height: 3rem !important;
+}
+
+.slider {
+  background: #fff;
+  width: 7.75rem;
+  height: 0rem;
+  transition: all 0.3s;
+  box-shadow: 0 0 4px #999;
+  position: fixed;
+  bottom: 0;
+
+  .slider-emoji {
+    overflow-y: scroll;
+    width: 100vw !important;
+  }
+
+  &-emoji {
+    width: 6.75rem;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
+
+    &-icon {
+      font-size: 0.265rem;
+      display: inline-block;
+      width: 11%;
+      text-align: center;
+      padding: 0.02rem 0;
+      border-radius: 0.1rem;
+      //   border-bottom: 1px solid #ccc;
+    }
+
+    &-icon:active {
+      background: #ccc;
+    }
+  }
+}
+
+.page {
+  padding-bottom: 0.5rem;
+  background-color: rgb(246, 247, 250);
+  overflow-y: auto;
+  width: 100%;
+  overflow-x: hidden;
+  height: 100%;
+
+  .group {
+    padding-top: 0.015rem;
+
+    .text-wrapper {
+      padding: 0.1rem 0rem 0.1rem;
+      background-color: rgb(255, 255, 255);
+      box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+
+      .text_1 {
+        color: rgb(2, 2, 2);
+        font-size: 0.15rem;
+        font-family: Adobe Heiti Std;
+        line-height: 0.24rem;
+        width: 88%;
+        margin: 0 auto;
+      }
+    }
+
+    .section_3 {
+      margin-top: 0.015rem;
+      padding: 0.13rem 0 0.24rem;
+      background-color: rgb(255, 255, 255);
+      box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+
+      .group_1 {
+        width: 88%;
+        margin: 0 auto;
+      }
+
+      .uping {
+        width: 90%;
+        margin: 0 auto;
+      }
+    }
+
+    .section_4 {
+      margin-top: 0.01rem;
+      padding: 0.12rem 0.28rem 0.14rem 0.35rem;
+      background-color: rgb(255, 255, 255);
+      box-shadow: 0.00018rem 0.005rem rgba(0, 0, 0, 0.03);
+
+      .image_2 {
+        margin-top: 0.02rem;
+        width: 0.23rem;
+        height: 0.18rem;
+      }
+
+      .image_3 {
+        width: 0.22rem;
+        height: 0.22rem;
+      }
+
+      .group_2 {
+        margin-top: 0.01rem;
+
+        .group_4 {
+          margin-left: 0.3rem;
+          margin-bottom: 0.02rem;
+
+          .image_4 {
+            flex-shrink: 0;
+            width: 0.14rem;
+            height: 0.21rem;
+          }
+
+          .text_11 {
+            margin-left: 0.06rem;
+            align-self: center;
+            color: rgb(160, 162, 172);
+            font-size: 0.15rem;
+            font-family: PingFang;
+            line-height: 0.14rem;
+          }
+        }
+
+        .text_9 {
+          color: rgb(80, 80, 81);
+          font-size: 0.24rem;
+          font-family: PingFang;
+          line-height: 0.24rem;
+        }
+
+        .text_10 {
+          margin-top: 0.03rem;
+          color: rgb(160, 162, 172);
+          font-size: 0.15rem;
+          font-family: PingFang;
+          line-height: 0.14rem;
+        }
+      }
+    }
+  }
+
+  .text-wrapper_4 {
+    margin: 0.31rem 0.24rem 0 0.23rem;
+    padding: 0.1rem 0 0.14rem;
+    // background-color: rgb(46, 155, 255);
+    background-color: #3cb4fb;
+    border-radius: 0.3rem;
+
+    .text_18 {
+      color: rgb(255, 255, 255);
+      font-size: 32rpx;
+      font-family: PingFang;
+      line-height: 0.16rem;
+    }
+  }
+}
+</style>
diff --git a/pages/my/ReleaseList/ReleaseList.vue b/pages/my/ReleaseList/ReleaseList.vue
new file mode 100644
index 0000000..d7606d5
--- /dev/null
+++ b/pages/my/ReleaseList/ReleaseList.vue
@@ -0,0 +1,477 @@
+<template>
+	<view>
+		  <u-navbar  :title="titleList[type]" ></u-navbar>
+		<view class="list">
+			<scroll-view
+			  scroll-y="true"
+			  style="height: calc(100vh - 0.5rem); width: 100%"
+			  @scrolltolower="onreachBottom"
+			>
+			<information v-if="releaseList.length" @onDelCollet="onDelCollet" @onStar="onStar" @onSign="onSign" @onDelete="onDelete"  :list="releaseList" :type="type" :isDel="isDel"  :bottom="true" route="3" :flag='flag' :schoolId='this.schoolId' :borderRadius="true"></information>
+      <view v-if="!releaseList.length" style="margin-top:20vh;">
+      <!-- <u-empty  text="暂无数据111" mode="list"></u-empty> -->
+      <no-data  ></no-data>
+      </view>
+			</scroll-view>
+			<u-toast ref="uToast" />
+		<!-- 	<view class="xyList">
+			  <view class="flex-col list">
+			    <view
+			      class="flex-col list-item_1"
+			      :key="i"
+			      v-for="(item, i) in releaseList"
+			    >
+			      <view class="flex-row group_11">
+			        <image
+			          src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16486275577001633329.png"
+			          class="image_9"
+			        />
+			        <view class="flex-col items-start group_23">
+			          <text class="text_10">{{item.schoolName}}</text>
+			          <text class="text_11">{{item.time}}</text>
+			        </view>
+			      </view>
+			      <text class="text_12"
+			        >{{item.title}}</text
+			      >
+			      <text class="text_13">
+			       {{item.content}}
+			      </text>
+			      <view class="equal-division flex-col">
+			        <view class="flex-row">
+			          <image
+			            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16486275577025201928.png"
+			            class="image_10"
+			          />
+			          <image
+			            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16486275577046447275.png"
+			            class="image_10 image_13"
+			          />
+			          <image
+			            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/624409975b22cf00110eafb0/16486275577048644458.png"
+			            class="image_10 image_15"
+			          />
+			        </view>
+			        <view class="flex-row tool">
+			          <view class="flex-row group_8">
+			            <image
+			              src="/static/common/img/16486275583591942621.png"
+			              class="image_12"
+			            />
+			            <text class="text_17">686</text>
+			          </view>
+			          <view class="flex-row group_9">
+			            <image
+			              src="/static/common/img/16486275582930866915.png"
+			              class="image_14"
+			            />
+			            <text class="text_18">996</text>
+			          </view>
+			          <view class="justify-between group_10">
+			            <image
+			              src="/static/common/img/16486275583636337201.png"
+			              class="image_16"
+			            />
+			            <text class="text_19">100</text>
+			          </view>
+			        </view>
+			      </view>
+			    </view>
+			  </view>
+			</view> -->
+		</view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import information from "../../../components/Information.vue";
+import NoData from '@/components/NoData.vue';
+	
+	export default {
+		data() {
+		  return {
+			  releaseList:[],
+			  pageSize:10,
+			  pageIndex:1,
+			  schoolId:"",
+			  type:0,
+			  total1:0,
+			  total2:0,
+			  total3:0,
+			  isNolink:false,
+			  flag:'',
+			  isDel:false,
+        titleList:['学校资讯','我的发布','我的收藏']
+		  }
+		},
+		components: {
+		  information: information,
+NoData,
+		},
+		onLoad(e){
+			// setTimeout(()=>{
+				if(e.type == 1 ){
+					this.type = 1
+					this.isDel = true
+					// this.myPublishs()
+				}else if(e.type == 2){
+					this.flag = 'Collection'
+					this.isNolink = true
+					this.type = 2
+					// this.myCollection()
+					uni.setNavigationBarTitle({
+						title:'我的收藏'
+					})
+				}else{
+					this.type = 0
+					this.isDel = true
+					// this.mySchoolZx()
+					uni.setNavigationBarTitle({
+						title:'学校资讯'
+					})
+				}
+			// },100)
+
+
+		},
+		onShow(){
+			this.releaseList=[]
+			this.getschoolId()
+
+		},
+		methods:{
+			//获取学校id
+			getschoolId(){
+				this.$u.apiList.GetUserSchool().then(res=>{
+          console.log(res,'res--')
+          // 学生时
+          if([0,2].includes(this.vuex_user.userType)){
+            this.schoolId = res.items.schoolId
+          }
+          // 教师时
+          if(this.vuex_user.userType === 1){
+            this.schoolId = res.jzgItems.schoolId
+          }
+					// this.schoolId = res.items.schoolId
+					// this.schoolId = res.selectSchoolId
+
+					if(this.type==1){
+						this.myPublishs()
+					}else if(this.type==2){
+						this.myCollection()
+					}else{
+						this.mySchoolZx()
+					}
+				})
+			},
+			 //我的发布
+			 myPublishs(){
+			 	const data = {
+			 		userId:this.vuex_user.id,
+			 		schoolId:this.schoolId,
+			 		pageIndex:this.pageIndex,
+			 		pageSize:this.pageSize
+			 	}
+			 	this.$u.apiList.Publishs(data).then((res)=>{
+					this.total1 = res.total
+					if(this.releaseList.length==0){
+						this.releaseList = res.items
+					}else if(this.releaseList.length>0){
+						this.releaseList=this.releaseList.concat(res.items)
+					}
+
+			 	})
+			 },
+			 //我的收藏
+			 myCollection(){
+				const data = {
+					userId:this.vuex_user.id,
+					schoolId:this.schoolId,
+					pageIndex:this.pageIndex,
+					pageSize:this.pageSize
+				}
+				this.$u.apiList.Collection(data).then((res)=>{
+					this.total2 = res.length
+					if(this.releaseList.length==0){
+						this.releaseList = res
+					}else if(this.releaseList.length>0){
+						this.releaseList = this.releaseList.concat(res)
+					}
+				})
+			 },
+			 //学校资讯
+			 mySchoolZx(){
+				const data = {
+					PageIndex:this.pageIndex,
+					PageSize:this.pageSize
+				}
+				this.$u.api.MyAlumnRange(data).then((res)=>{
+					this.total3 = res.total
+					if(this.releaseList.length==0){
+						this.releaseList = res.items
+					}else if(this.releaseList.length<res.total){
+						this.releaseList=this.releaseList.concat(res.items)
+					}else{
+
+					}
+				})
+			 },
+			 onStar(val){
+			 	const data = {
+			 		id : val.id,
+			 		type:val.type
+			 	}
+			 	this.$u.apiList.LikeCollect(data)
+			 	.then((res)=>{
+			 			if(val.isCllect){
+			 				val.isCllect = false
+			 				val.collectCount -= 1
+			 				this.$refs.uToast.show({
+			 					title: '取消收藏成功',
+			 					type: 'success',
+			 				})
+			 			}else{
+			 				val.isCllect = true
+			 				val.collectCount += 1
+			 				this.$refs.uToast.show({
+			 					title: '收藏成功',
+			 					type: 'success',
+			 				})
+			 			}
+			 	})
+			 	.catch((err)=>{
+			 		this.$refs.uToast.show({
+			 			title: '收藏失败',
+			 			type: 'error',
+			 		})
+			 	})
+			 },
+			 onSign(v){
+				// return
+				uni.setStorage({
+					key: 'Tag',
+					data: v+',1',
+					success: function () {
+						;
+					}
+				});
+				uni.switchTab({
+					url:'../../AlumniCircle/alumnus/alumnus',
+					params:{current:1,v:v}
+				})
+			 },
+			 onreachBottom(){
+				 let num = this.pageIndex * this.pageSize
+				 if(this.total1 > num){
+					 this.pageIndex++;
+					 this.myPublishs()
+				 }else if(this.total2 > num){
+					 this.pageIndex++;
+					 this.myCollection()
+				 }else if(this.total3 > num){
+					 this.pageIndex++;
+					 this.mySchoolZx()
+				 }
+			 },
+			 //删除我的发布
+			 onDelete(val){
+				 const data={
+					 type:1,
+					 id :val.id
+				 }
+				 if(this.type==0){
+					 data.type = 3
+				 }
+				 uni.showModal({
+				 	// title: '提示',
+				 	content: '确定删除此内容？',
+				 	success: (res) => {
+				 		if (res.confirm) {
+				 			this.$u.apiList.DelateArticle(data).then(res=>{
+								console.log('res======',res);
+								
+				 				this.$refs.uToast.show({
+				 					title: '删除成功',
+				 					type: 'success',
+				 				})
+				 				this.releaseList = this.releaseList.filter(i=>{
+				 					return val.id!=i.id
+				 				})
+								//  this.myPublishs()
+				 			})
+				 			.catch(err=>{
+								console.log(err,'11111111111');
+								
+				 				this.$refs.uToast.show({
+				 					title: '删除失败',
+				 					type: 'error',
+				 				})
+				 			})
+				 		} else if (res.cancel) {
+				 			// console.log('用户点击取消');
+				 		}
+				 	}
+				 });
+
+			 },
+			 //删除收藏
+			 onDelCollet(val){
+				const data = {
+					userId:this.vuex_user.id,
+					collectId:val
+				}
+				uni.showModal({
+					// title: '提示',
+					content: '确定删除收藏？',
+					success: (res) => {
+						if (res.confirm) {
+							this.$u.apiList.CancleCollect(data).then(res=>{
+								this.releaseList = this.releaseList.filter(i=>{
+									return i.collectId != val
+								})
+								this.$refs.uToast.show({
+									title: '删除成功',
+									type: 'success',
+								})
+							})
+							.catch(err=>{
+								this.$refs.uToast.show({
+									title: '删除失败',
+									type: 'error',
+								})
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
+
+			 },
+			 //返回上一级
+			 router(){
+			 	 uni.switchTab({
+			 	 	url: '../../my/my/my'
+			 	 });
+			 }
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.xyList {
+	  .list {
+	    margin-top: 0.055rem;
+	    padding-bottom: 0.06rem;
+	    .list-item_1 {
+	      padding: 0.19rem 0 0.07rem;
+	      background-color: rgb(255, 255, 255);
+	      margin-bottom: 0.1rem;
+	      .group_11 {
+	        padding: 0 0.16rem;
+	        .image_9 {
+	          margin-bottom: 0.015rem;
+	          width: 0.3rem;
+	          height: 0.3rem;
+	        }
+	        .group_23 {
+	          margin-left: 0.065rem;
+	          margin-top: 0.02rem;
+	          flex: 1 1 auto;
+	          .text_10 {
+	            color: rgb(2, 2, 2);
+	            font-size: 0.14rem;
+	            line-height: 0.13rem;
+	          }
+	          .text_11 {
+	            margin-top: 0.055rem;
+	            color: rgb(184, 184, 184);
+	            font-size: 0.12rem;
+	            line-height: 0.12rem;
+	          }
+	        }
+	      }
+	      .text_12 {
+	        margin-top: 0.17rem;
+	        align-self: center;
+	        color: rgb(55, 59, 72);
+	        font-size: 0.18rem;
+	        line-height: 0.17rem;
+	      }
+	      .text_13 {
+	        margin: 0.12rem 0.15rem 0 0.17rem;
+	        color: rgb(73, 76, 87);
+	        font-size: 0.15rem;
+	        line-height: 0.24rem;
+	      }
+	      .equal-division {
+	        margin-top: 0.035rem;
+	        padding: 0.05rem 0.15rem;
+	        .tool {
+	          margin-top: 0.3rem;
+	          .group_8 {
+	            padding-left: 0.26rem;
+	            padding-right: 0.24rem;
+	            flex: 1 1 1.11rem;
+	            .image_12 {
+	              width: 0.22rem;
+	              height: 0.21rem;
+	            }
+	            .text_17 {
+	              margin-left: 0.08rem;
+	              align-self: center;
+	              color: rgb(180, 182, 189);
+	              font-size: 0.14rem;
+	              line-height: 0.11rem;
+	            }
+	          }
+	          .group_9 {
+	            margin-left: 0.055rem;
+	            padding: 0 0.24rem;
+	            flex: 1 1 1.11rem;
+	            .image_14 {
+	              width: 0.18rem;
+	              height: 0.2rem;
+	            }
+	            .text_18 {
+	              margin-left: 0.08rem;
+	              align-self: center;
+	              color: rgb(180, 182, 189);
+	              font-size: 0.14rem;
+	              line-height: 0.11rem;
+	            }
+	          }
+	          .group_10 {
+	            margin-left: 0.05rem;
+	            padding: 0 0.23rem;
+	            flex: 1 1 1.11rem;
+	            width: 1.12rem;
+	            .image_16 {
+	              margin-left: 0.07rem;
+	              width: 0.2rem;
+	              height: 0.2rem;
+	            }
+	            .text_19 {
+	              align-self: center;
+	              color: rgb(180, 182, 189);
+	              font-size: 0.14rem;
+	              line-height: 0.11rem;
+	            }
+	          }
+	        }
+	        .image_10 {
+	          flex: 1 1 1.11rem;
+	          width: 1.11rem;
+	          height: 1.11rem;
+	        }
+	        .image_13 {
+	          margin-left: 0.055rem;
+	        }
+	        .image_15 {
+	          margin-left: 0.05rem;
+	        }
+	      }
+	    }
+	  }
+	}
+</style>
diff --git a/pages/my/ShoolList/ShoolList.vue b/pages/my/ShoolList/ShoolList.vue
new file mode 100644
index 0000000..82974cc
--- /dev/null
+++ b/pages/my/ShoolList/ShoolList.vue
@@ -0,0 +1,348 @@
+<template>
+	<view @tap='btnShow = false'>
+		<u-navbar title="教育经历" :custom-back="router"></u-navbar>
+		<view class="list">
+			<view :class="{'item-selsect': item.isSelected}" class="flex-col list-item" v-for="(item, index) in schoolList" :key="index" @click="currentidx(item,index)">
+				<view class="flex-col section_2">
+					<view class="justify-between section_3 view_8">
+						<view class="flex-row">
+							<image :src="$u.http.config.imgUrl + item.logo.slice(1)" class="image_2" />
+							<text class="text_1 text_23">{{ item.school }}</text>
+						</view>
+						<u-button v-if="item.certifyStatus == 1" disabled class="text-wrapper" type="success" plain
+							size='mini' shape='circle'>已认证</u-button>
+						<u-button v-if="item.certifyStatus == 2" disabled class="text-wrapper" type="error" plain
+							size='mini' shape='circle'>审核中</u-button>
+						<u-button v-if="item.certifyStatus == 0" class="text-wrapper" type="primary" size='mini'
+							shape='circle' ripple @click='toAuthentication(item)'>去认证</u-button>
+						<!-- <navigator url='#' class="flex-col items-center text-wrapper view_9"><text class="text_3 text_24">去认证</text></navigator> -->
+					</view>
+					<view class="group_3">
+						<text class="text_5">学历：</text>
+						<text class="text_7">{{ item.educationStr }}</text>
+					</view>
+					<view class="group_3">
+						<text class="text_5">学院：</text>
+						<text class="text_7">{{ item.college }}</text>
+					</view>
+					<view class="group_3">
+						<text class="text_5">专业：</text>
+						<text class="text_7">{{ item.major }}</text>
+					</view>
+					<view class="group_3">
+						<text class="text_5">时间：</text>
+						<text class="text_7">{{ item.startYear }}-{{ item.endYear }}</text>
+					</view>
+					<view class="flex-row justify-end" style="margin-right: 0.2rem; position: relative;"
+						v-if="item.certifyStatus == 0 && schoolList.length > 1" @tap.stop='isindex = index; btnShow = !btnShow'>
+						<u-icon name="more-dot-fill" color="#ccc" size="28"></u-icon>
+						<view class="btns" v-show='isindex == index && btnShow'>
+							<view class="item" @tap="onDelete(item)">删除</view>
+						</view>
+					</view>
+				</view>
+				<!-- <text class="text_21">已有10000名校友加入</text> -->
+			</view>
+		</view>
+		<view class="btn-box">
+			<u-button type="primary" shape="circle" @click="addEducation" style="width: 80%;">添加教育经历</u-button>
+		</view>
+		<u-toast ref="uToast" />
+		<u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			isindex: -1,
+			btnShow: false,
+			schoolList: [], //教育经历列表
+		};
+	},
+	onLoad() {
+		// this.onSchoolData()
+	},
+	onShow() {
+		this.onSchoolData()
+	},
+	methods: {
+		toAuthentication(item) {
+			this.$u.route({
+				url: 'pages/my/shoolAuthentication/shoolAuthentication',
+				params: {
+					educationId: item.id
+				},
+			})
+		},
+		onSchoolData() {
+			const data = {
+				userId: this.vuex_user.id,
+			}
+			this.$u.apiList.MyEducations(data).then((res) => {
+				this.schoolList = res
+			})
+		},
+		//删除
+		async onDelete(item) {
+			const req = {
+				userId: this.vuex_user.id,
+			}
+			const res = await this.$u.apiList.MyPage(req)
+			const edcationList = res.edcationList
+			console.log(JSON.parse(JSON.stringify(edcationList)), 'res')
+			if (!edcationList.length) {
+				// this.$tips( "至少保留一条教育经历","error");
+				this.$refs.uToast.show({
+					title: "至少保留一条教育经历",
+					type: "error",
+				});
+				return
+			}
+			const findRow = edcationList.find(x => x.isSelected === true);
+			console.log(findRow, 'findRow')
+			if (findRow.id === item.id) {
+				// this.$tips( "不可删除当前选中院校","error");
+				this.$refs.uToast.show({
+					title: "不可删除当前选中院校",
+					type: "error",
+				});
+				return
+			}
+			this.$u.apiList.DeleteEducation({
+				id: item.id
+			}).then(res => {
+				// this.$tips( "删除成功","success");
+				this.$refs.uToast.show({
+					title: '删除成功',
+					type: 'success',
+				})
+				this.onSchoolData()
+			})
+		},
+		//返回上一级
+		router() {
+			uni.switchTab({
+				url: '../../my/my/my'
+			});
+		},
+		//添加教育经历
+		addEducation() {
+			this.$u.route({
+				url: "pages/my/AddEducation/AddEducation",
+			});
+		},
+		// 选择学校
+		async teacherIdx(item) {
+			console.log(item, "item--");
+			if (item.isSelected) {
+				this.$refs.uToast.show({
+					title: "已选择该学校",
+					type: "warning",
+				});
+				// this.$tips( "已选择该学校","warning");
+				return;
+			}
+			const req = {
+				userId: this.vuex_user.id,
+				educationId: item.id,
+			};
+			const res = await this.$u.apiList.SelectJZGApi(req);
+			console.log(res, "res--选择学校");
+			this.$u.vuex("vuex_token", res.token);
+			this.$u.vuex("vuex_glyType", res.glyType);
+			this.glyType = res.glyType;
+			this.$refs.uToast.show({
+				title: "绑定学校成功",
+				type: "success",
+			});
+			
+			// this.$tips( "绑定学校成功","success");
+			this.$u.vuex("vuex_user", res.user);
+		},
+		//选择教育经历
+		currentidx(item, index) {
+			if (item.isSelected) {
+				this.$refs.uToast.show({
+				title: '已选择该学校',
+				type: 'warning',
+				})
+				return
+			}
+			const data = {
+				userId: this.vuex_user.id,
+				educationId: item.id
+			}
+			this.getShoolId(data, index)
+			},
+			getShoolId(data, index, type) {
+				this.$u.apiList.SelectEducation(data).then((res) => {
+					console.info("🚀 ~ file:my method: line:496 -----",res )
+
+					// this.curIdx = index
+					// this.schoolId = res.schoolId
+					console.log('%c%s', 'color:red', res.glyType,'res.glyType');
+					// 更新 vuex_token
+					this.$u.vuex('vuex_token', res.token)
+					this.$u.vuex('vuex_glyType', res.glyType)
+					this.glyType = res.glyType
+					this.$u.vuex('vuex_user', res.user)
+					if (!type) {
+					this.$refs.uToast.show({
+						title: '绑定学校成功',
+						type: 'success',
+					})
+					this.$u.api.getUser()
+					this.onSchoolData()
+					}
+				}).catch((err) => {
+					console.log(err,'err-------')
+						this.$refs.uToast.show({
+						title: err.error,
+						type: 'error',
+						})
+				})
+				},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.btns {
+	background-color: #fff;
+	box-shadow: 0 0 0.05rem #ccc;
+	border-radius: 0.05rem;
+	position: absolute;
+	bottom: 150%;
+
+	.item {
+		line-height: 2;
+		padding: 0 0.1rem;
+	}
+}
+.item-selsect{
+		border-color: #2e9bff!important;
+	}
+
+.list {
+	padding: 0.18rem 0.15rem 1rem;
+
+	.list-item {
+		margin-bottom: 0.18rem;
+		border: 2rpx solid #fff;
+		border-radius: 0.1rem;
+	}
+	
+
+	.section_2 {
+		padding-bottom: 0.2rem;
+		background-color: #ffffff;
+		border-radius: 0.1rem;
+	}
+
+	.text_21 {
+		margin-left: 0.03rem;
+		margin-top: 0.085rem;
+		align-self: flex-start;
+		color: #a0a2ac;
+		font-size: 0.14rem;
+		font-family: PingFang;
+		line-height: 0.14rem;
+	}
+
+	.section_3 {
+		padding: 0.05rem 0.15rem 0.05rem 0.23rem;
+		background-color: #ffffff;
+		box-shadow: 0.0002rem 0.005rem #1d262e14;
+		border-radius: 0.1rem 0.1rem 0px 0px;
+		z-index: 1;
+	}
+
+	.group_3 {
+		margin-left: 0.26rem;
+		margin-top: 0.15rem;
+		align-self: flex-start;
+		line-height: 0.14rem;
+	}
+
+	.text-wrapper {
+		margin: 0.025rem 0;
+		width: 0.75rem;
+		height: 0.25rem;
+	}
+
+	.text_5 {
+		color: #373b48;
+		font-size: 0.15rem;
+		font-family: PingFang;
+		line-height: 0.14rem;
+	}
+
+	.text_7 {
+		color: #373b48;
+		font-size: 0.15rem;
+		font-family: PingFang;
+		line-height: 0.14rem;
+	}
+
+	.image_2 {
+		flex-shrink: 0;
+		width: 0.3rem;
+		height: 0.3rem;
+	}
+
+	.text_1 {
+		margin-left: 0.07rem;
+		align-self: center;
+		color: #373b48;
+		font-size: 0.15rem;
+		font-family: PingFang;
+		line-height: 0.14rem;
+		width: 360rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.text_3 {
+		color: #15c349;
+		font-size: 0.13rem;
+		font-family: PingFang;
+		line-height: 0.13rem;
+	}
+
+	.view_8 {
+		padding: 0.05rem 0.14rem 0.05rem 0.23rem;
+	}
+
+	.view_9 {
+		padding: 0.06rem 0 0.065rem;
+		background-color: #2e9bff;
+		box-sizing: border-box;
+	}
+
+	.text_23 {
+		margin-left: 0.075rem;
+		line-height: 0.16rem;
+	}
+
+	.text_24 {
+		color: #ffffff;
+	}
+}
+
+// 按钮
+.btn-box {
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	height: 150rpx;
+	border-top: 1px solid #f1f2f6;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: white;
+	z-index: 666;
+}
+</style>
diff --git a/pages/my/TeacherList/TeacherList.vue b/pages/my/TeacherList/TeacherList.vue
new file mode 100644
index 0000000..60efcae
--- /dev/null
+++ b/pages/my/TeacherList/TeacherList.vue
@@ -0,0 +1,317 @@
+<template>
+  <view @tap="btnShow = false">
+    <u-navbar title="任职院校" :custom-back="router"></u-navbar>
+    <view class="list">
+      <view :class="{'item-selsect': item.isSelected}" class="flex-col list-item" v-for="(item, index) in schoolList" :key="index" @click="teacherIdx(item)">
+        <view class="flex-col section_2">
+          <view class="justify-between section_3 view_8">
+            <view class="flex-row">
+              <image :src="$u.http.config.imgUrl + item.logo.slice(1)" class="image_2" />
+              <text class="text_1 text_23">{{ item.school }}</text>
+            </view>
+            <u-button
+              v-if="item.certifyStatus == 0"
+              disabled
+              class="text-wrapper"
+              type="success"
+              plain
+              size="mini"
+              shape="circle"
+              >待审核</u-button
+            >
+            <u-button
+              v-if="item.certifyStatus == 2"
+              disabled
+              class="text-wrapper"
+              type="error"
+              plain
+              size="mini"
+              shape="circle"
+              >不通过</u-button
+            >
+            <!--  @click="toAuthentication(item)" -->
+            <u-button
+              v-if="item.certifyStatus == 1"
+              class="text-wrapper"
+              type="primary"
+              size="mini"
+              shape="circle"
+              ripple
+              >通过</u-button
+            >
+            <!-- <navigator url='#' class="flex-col items-center text-wrapper view_9"><text class="text_3 text_24">去认证</text></navigator> -->
+          </view>
+          <view class="group_3">
+            <text class="text_5">教师</text>
+            <text class="text_7"></text>
+          </view>
+          <!-- <view class="group_3">
+            <text class="text_5">学历：</text>
+            <text class="text_7">{{ item.educationStr }}</text>
+          </view>
+          <view class="group_3">
+            <text class="text_5">学院：</text>
+            <text class="text_7">{{ item.college }}</text>
+          </view>
+          <view class="group_3">
+            <text class="text_5">专业：</text>
+            <text class="text_7">{{ item.major }}</text>
+          </view>
+          <view class="group_3">
+            <text class="text_5">时间：</text>
+            <text class="text_7">{{ item.startYear }}-{{ item.endYear }}</text>
+          </view> -->
+          <view
+            class="flex-row justify-end"
+            style="margin-right: 0.2rem; position: relative"
+            v-if="item.certifyStatus === 2 && schoolList.length > 1"
+            @tap.stop="
+              isindex = index;
+              btnShow = !btnShow;
+            "
+          >
+            <u-icon name="more-dot-fill" color="#ccc" size="28"></u-icon>
+            <view class="btns" v-show="isindex == index && btnShow">
+              <view class="item" @tap="onDelete(item)">删除</view>
+            </view>
+          </view>
+        </view>
+        <!-- <text class="text_21">已有10000名校友加入</text> -->
+      </view>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      isindex: -1,
+      btnShow: false,
+      schoolList: [], //教育经历列表
+    };
+  },
+  onLoad() {
+    // this.onSchoolData()
+  },
+  onShow() {
+    this.onSchoolData();
+  },
+  methods: {
+    toAuthentication(item) {
+      this.$u.route({
+        url: "pages/my/shoolAuthentication/shoolAuthentication",
+        params: {
+          educationId: item.id,
+        },
+      });
+    },
+    onSchoolData() {
+      const data = {
+        userId: this.vuex_user.id,
+      };
+      this.$u.apiList.MyPage(data).then((res) => {
+        // console.log(JSON.parse(JSON.stringify(res)), "res");
+        this.schoolList = res.edcationList;
+      });
+      return;
+      this.$u.apiList.MyEducations(data).then((res) => {
+        this.schoolList = res;
+      });
+    },
+    //删除
+   async onDelete(item) {
+      console.log(item,'item--');
+      const req = {
+          userId: this.vuex_user.id,
+        }   
+        const res = await this.$u.apiList.MyPage(req)
+        const edcationList  = res.edcationList
+        console.log(JSON.parse(JSON.stringify(edcationList)),'res')
+        if(!edcationList.length){
+          this.$refs.uToast.show({
+            title: "至少保留一条教育经历",
+            type: "error",
+          });
+          return 
+        }
+        const findRow = edcationList.find(x=>x.isSelected === true);
+        console.log(findRow,'findRow')
+        if(findRow.id === item.id){
+          this.$refs.uToast.show({
+            title: "不可删除当前选中院校",
+            type: "error",
+          });
+          return 
+        }
+      // return
+      this.$u.apiList
+        .DeleteJZGApi({
+          id: item.id,
+        })
+        .then((res) => {
+          this.$refs.uToast.show({
+            title: "删除成功",
+            type: "success",
+          });
+          this.onSchoolData();
+        });
+    },
+    // 选择学校
+		async teacherIdx(item) {
+			console.log(item, "item--");
+			if (item.isSelected) {
+				this.$refs.uToast.show({
+					title: "已选择该学校",
+					type: "warning",
+				});
+				// this.$tips( "已选择该学校","warning");
+				return;
+			}
+			const req = {
+				userId: this.vuex_user.id,
+				educationId: item.id,
+			};
+			const res = await this.$u.apiList.SelectJZGApi(req);
+			console.log(res, "res--选择学校");
+			this.$u.vuex("vuex_token", res.token);
+			this.$u.vuex("vuex_glyType", res.glyType);
+			this.glyType = res.glyType;
+			this.$refs.uToast.show({
+				title: "绑定学校成功",
+				type: "success",
+			});
+      this.onSchoolData();
+			
+			// this.$tips( "绑定学校成功","success");
+			this.$u.vuex("vuex_user", res.user);
+		},
+    //返回上一级
+    router() {
+      uni.switchTab({
+        url: "../../my/my/my",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.btns {
+  background-color: #fff;
+  box-shadow: 0 0 0.05rem #ccc;
+  border-radius: 0.05rem;
+  position: absolute;
+  bottom: 150%;
+
+  .item {
+    line-height: 2;
+    padding: 0 0.1rem;
+  }
+}
+
+.item-selsect{
+		border-color: #2e9bff!important;
+	}
+.list {
+  padding: 0.18rem 0.15rem 0;
+
+  .list-item {
+    margin-bottom: 0.18rem;
+    border: 2rpx solid #fff;
+		border-radius: 0.1rem;
+  }
+
+  .section_2 {
+    padding-bottom: 0.2rem;
+    background-color: #ffffff;
+    border-radius: 0.1rem;
+  }
+
+  .text_21 {
+    margin-left: 0.03rem;
+    margin-top: 0.085rem;
+    align-self: flex-start;
+    color: #a0a2ac;
+    font-size: 0.14rem;
+    font-family: PingFang;
+    line-height: 0.14rem;
+  }
+
+  .section_3 {
+    padding: 0.05rem 0.15rem 0.05rem 0.23rem;
+    background-color: #ffffff;
+    box-shadow: 0.0002rem 0.005rem #1d262e14;
+    border-radius: 0.1rem 0.1rem 0px 0px;
+  }
+
+  .group_3 {
+    margin-left: 0.26rem;
+    margin-top: 0.15rem;
+    align-self: flex-start;
+    line-height: 0.14rem;
+  }
+
+  .text-wrapper {
+    margin: 0.025rem 0;
+    width: 0.75rem;
+    height: 0.25rem;
+  }
+
+  .text_5 {
+    color: #373b48;
+    font-size: 0.15rem;
+    font-family: PingFang;
+    line-height: 0.14rem;
+  }
+
+  .text_7 {
+    color: #373b48;
+    font-size: 0.15rem;
+    font-family: PingFang;
+    line-height: 0.14rem;
+  }
+
+  .image_2 {
+    flex-shrink: 0;
+    width: 0.3rem;
+    height: 0.3rem;
+  }
+
+  .text_1 {
+    margin-left: 0.07rem;
+    align-self: center;
+    color: #373b48;
+    font-size: 0.15rem;
+    font-family: PingFang;
+    line-height: 0.14rem;
+  }
+
+  .text_3 {
+    color: #15c349;
+    font-size: 0.13rem;
+    font-family: PingFang;
+    line-height: 0.13rem;
+  }
+
+  .view_8 {
+    padding: 0.05rem 0.14rem 0.05rem 0.23rem;
+  }
+
+  .view_9 {
+    padding: 0.06rem 0 0.065rem;
+    background-color: #2e9bff;
+    box-sizing: border-box;
+  }
+
+  .text_23 {
+    margin-left: 0.075rem;
+    line-height: 0.16rem;
+  }
+
+  .text_24 {
+    color: #ffffff;
+  }
+}
+</style>
diff --git a/pages/my/authentication/authentication.vue b/pages/my/authentication/authentication.vue
new file mode 100644
index 0000000..5705d3c
--- /dev/null
+++ b/pages/my/authentication/authentication.vue
@@ -0,0 +1,276 @@
+<template>
+  <view style="background-color: rgb(246, 247, 250); height: 100%">
+	  <u-navbar  title="官方认证" ></u-navbar>
+    <view class="flex-col group">
+      <view class="flex-col list">
+        <view
+          class="list-item flex-col"
+          :key="i"
+          v-for="(item, i) in list"
+          @click="toAuthentication(i)"
+        >
+          <text class="text_1">{{ item.name }}</text>
+          <view class="center-group justify-between">
+            <text class="text_3">{{ item.title }}</text>
+            <image :src="item.imgUrl" class="image_2" />
+          </view>
+          <view class="bottom-section"> </view> </view
+      ></view>
+    </view>
+    <!-- 修改密码 -->
+    <u-mask :show="Alert">
+      <view class="Alert">
+        <view class="form">
+          <text class="text">正在进行资质审核，请耐性等待~</text>
+          <view class="btns">
+            <u-button class="btn" @click="Alert = false" type="primary"
+              >确认</u-button
+            >
+          </view>
+        </view>
+      </view>
+    </u-mask>
+	  <u-top-tips :z-index="999" ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+	  schoolId:'',
+      Alert: false,
+	  isZXS:false,
+      list: [
+        {
+          name: "企业认证",
+          title: "针对企业公司或其他经济组织的认证",
+          imgUrl: require("../../../static/common/img/enterprise.png"),
+        },
+        {
+          name: "管理员认证",
+          title: "针对学校工作管理人员和学生管理人员的认证",
+          imgUrl: require("../../../static/common/img/admin.png"),
+        },
+		// {
+		//   name: "教职工认证",
+		//   title: "针对在校教职工与其他在校工作人员认证",
+		//   imgUrl: require("../../../static/common/img/Faculty.png"),
+		// },
+      ],
+    };
+  },
+  onLoad() {
+	  this.getschoolId()
+  },
+  methods: {
+    getschoolId(){
+	  	this.$u.apiList.GetUserSchool().then(res=>{
+      console.log(res,'res-----')  
+      // 学生时
+      if([0,2].includes(this.vuex_user.userType)){
+        this.schoolId = res.items.schoolId
+      }
+      // 教师时
+      if(this.vuex_user.userType === 1){
+        this.schoolId = res.jzgItems.schoolId
+      }
+      // this.schoolId = res.items.schoolId
+			this.isZXS = res.isAttestationZXS
+	  	})
+    },
+    toAuthentication(id) {
+    console.log(id,'id---')
+		if(id == 0 || id == 2){
+			if(this.isZXS&&id==2){
+				// this.$tips("在校生无法认证教职工!", "warning");
+        this.$refs.uToast.show({
+						title: '在校生无法认证教职工!',
+						type: "warning",
+					});
+
+			}else{
+				if(id==0){
+					// if(this.vuex_user.isAttestationJZG){
+					// 	this.$tips("已认证教职工,无法再认证企业！", "warning");
+					// }else{
+						this.getUserApproval(id)
+					// }
+          
+				}else if(id==2){
+					if(this.vuex_user.isAttestationQY){
+						// this.$tips("已认证企业,无法再认证教职工！", "warning");
+            this.$refs.uToast.show({
+              title: '已认证企业,无法再认证教职工！',
+              type: "warning",
+            });
+					}else{
+						this.getUserApproval(id)
+					}
+				}else{
+					this.getUserApproval(id)
+				}
+			}
+		}
+    if(id === 1){
+      if([0,1].includes(this.vuex_glyType)){
+        // this.$tips('已经是管理员无需认证', "warning");
+        this.$refs.uToast.show({
+						title: '已经是管理员无需认证',
+						type: "error",
+					});
+        return 
+      }
+			this.getUserApproval(id)
+		}
+    },
+	//验证该学校是否已经认证
+	getUserApproval(id){
+		const data = {
+			schoolId:this.schoolId,
+			type:id
+		}
+		this.$u.apiList.GetUserApproval(data).then((res)=>{
+			this.$u.route({
+			  url: "/pages/my/certificationDetails/certificationDetails",
+			  params: { id: id },
+			});
+		})
+		.catch((err)=>{
+			// this.$tips(err.error, "warning");
+      this.$refs.uToast.show({
+						title: err.error,
+						type: "error",
+					});
+		})
+	},
+	//返回上一级
+	router(){
+		this.$u.route({
+			url: 'pages/my/mySeting/mySeting'
+		});
+	}
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.Alert {
+  .form {
+    width: 80%;
+    background-color: #ffffff;
+    border-radius: 0.14rem;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 0.3rem;
+    .text {
+      line-height: 0.3rem;
+      color: #494c57;
+      display: inline-block;
+      padding: 0.4rem 0;
+      font-size: 0.16rem;
+    }
+    .input {
+      background-color: #f6f7fa;
+      border-radius: 0.07rem;
+      font-size: 0.22rem;
+      color: #b4b6bd;
+      margin-bottom: 0.2rem;
+      padding: 0.05rem 0.1rem;
+    }
+    .codeInput {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 0.2rem;
+      ::v-deep .u-input {
+        background-color: #f6f7fa;
+        border-radius: 0.07rem;
+        font-size: 0.22rem;
+        color: #b4b6bd;
+        padding: 0.05rem 0.1rem !important;
+      }
+      .codeBtn {
+        width: 0.5rem;
+        height: 0.5rem;
+        background-color: #eaf5ff;
+        border-radius: 0.07rem;
+        font-size: 0.26rem;
+        line-height: 0.23rem;
+        color: #2e9bff;
+        margin-left: 0.12rem;
+      }
+    }
+    .btns {
+      display: flex;
+      justify-content: space-between;
+      .btn {
+        width: 40%;
+      }
+    }
+  }
+}
+
+.group {
+  padding: 0.17rem 0 0.76rem;
+  flex: 1 1 auto;
+  overflow-y: auto;
+  .list {
+    padding-left: 0.21rem;
+    padding-right: 0.19rem;
+    .list-item {
+      padding: 0.27rem 0.17rem 0.21rem;
+      border-radius: 0.05rem;
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+      &:not(:first-of-type) {
+        margin-top: 0.13rem;
+      }
+      .text_1 {
+        color: rgb(255, 255, 255);
+        font-size: 0.24rem;
+        font-weight: 700;
+        line-height: 0.23rem;
+        white-space: nowrap;
+      }
+      .center-group {
+        margin-top: 0.14rem;
+        padding: 0 0.015rem;
+        color: rgb(255, 255, 255);
+        font-size: 0.12rem;
+        font-weight: 700;
+        line-height: 0.12rem;
+        white-space: nowrap;
+        .text_3 {
+          opacity: 0.49;
+        }
+        .image_2 {
+          margin-right: 0.1rem;
+          margin-top: 0.06rem;
+          width: 0.37rem;
+          height: 0.45rem;
+        }
+      }
+      .bottom-section {
+        margin-left: 0.015rem;
+        margin-top: 0.23rem;
+        background-color: rgb(255, 255, 255);
+        border-radius: 0.02rem;
+        width: 0.27rem;
+        height: 0.04rem;
+      }
+    }
+    .list-item:nth-child(3n-2) {
+      background-image: url("~@/static/common/img/enterpriseBj.png");
+    }
+    .list-item:nth-child(3n-1) {
+      background-image: url("~@/static/common/img/FacultyBj.png");
+    }
+    .list-item:nth-child(3n) {
+      background-image: url("~@/static/common/img/adminBj.png");
+    }
+  }
+}
+</style>
diff --git a/pages/my/certificationDetails/certificationDetails.vue b/pages/my/certificationDetails/certificationDetails.vue
new file mode 100644
index 0000000..e303deb
--- /dev/null
+++ b/pages/my/certificationDetails/certificationDetails.vue
@@ -0,0 +1,1244 @@
+<template>
+  <view style="background-color: rgb(246, 247, 250); height: 100%">
+    <u-navbar :title="title"></u-navbar>
+    <view class="form">
+      <view class="flex-col group">
+        <view class="flex-col section_2">
+          <!-- 教职工 -->
+          <view class="flex-col group-box" v-if="roleId === '2'">
+            <view class="flex-row group-box-item">
+              <text class="text_15">申请人姓名</text>
+              <u-input
+                class="input"
+                :custom-style="inputStyle"
+                :type="'text'"
+                :border="false"
+                v-model="form.name"
+                placeholder="请输入"
+                disabled
+                inputAlign="right"
+              />
+            </view>
+            <view class="flex-row group-box-item">
+              <text class="text_15">联系方式</text>
+              <u-input
+                class="input"
+                :custom-style="inputStyle"
+                :type="'number'"
+                :border="false"
+                v-model="form.phone"
+                placeholder="请输入"
+                disabled
+                inputAlign="right"
+              />
+            </view>
+            <!-- 任职学校 -->
+            <view class="justify-between group_7" @click="shoolShow = true">
+              <view class="flex-row group-box-item">
+                <text class="text_15">任职学校</text>
+                <view v-if="shoolName">{{ shoolName }}</view>
+                <view v-else style="color: #cbcacd">请选择任职学校</view>
+              </view>
+              <image
+                class="image_3 image_5"
+                src="/static/common/img/row_right.png"
+              />
+            </view>
+            <view class="justify-between group_7" @click="schoolPost = true">
+              <view class="flex-row u-col-center">
+                <text class="text_15">校内职务</text>
+                <view v-if="form.schoolJob">{{ form.schoolJob }}</view>
+                <view v-else style="color: #cbcacd">请选择校内职务</view>
+              </view>
+              <image
+                class="image_3 image_5"
+                src="/static/common/img/row_right.png"
+              />
+            </view>
+            <view
+              v-if="isDisabled"
+              class="justify-between group_13"
+              @click="college = true"
+            >
+              <view class="flex-row u-col-center">
+                <text class="text_15">所属院系</text>
+                <view v-if="form.faculty">{{ form.faculty }}</view>
+                <view v-else style="color: #cbcacd">请选择所属院系</view>
+              </view>
+              <image
+                class="image_3 image_8"
+                src="/static/common/img/row_right.png"
+              />
+            </view>
+
+            <view
+              v-if="isDisabled"
+              class="justify-between group_13"
+              style="border: none"
+              @click="job = true"
+            >
+              <view class="flex-row u-col-center">
+                <text class="text_15">具体职位</text>
+                <view v-if="form.job">{{ form.job }}</view>
+                <view v-else style="color: #cbcacd">请选择具体职位</view>
+              </view>
+              <image
+                class="image_3 image_8"
+                src="/static/common/img/row_right.png"
+              />
+            </view>
+          </view>
+          <!-- 企业 -->
+          <view class="flex-col group-box" v-if="roleId === '0'">
+            <view class="flex-row group-box-item">
+              <text class="text_15">企业名称</text>
+              <u-input
+                class="input"
+                :custom-style="inputStyle"
+                :type="'text'"
+                :border="false"
+                v-model="form.businessName"
+                placeholder="请输入"
+                inputAlign="right"
+              />
+            </view>
+            <view class="flex-row group-box-item">
+              <text class="text_15">企业地址</text>
+              <view class="item-wrapper">
+                <view class="input-cover" @click="address = true"></view>
+                <u-input
+                  class="input"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  :border="false"
+                  placeholder="请选择"
+                  v-model="form.businessAddress"
+                  inputAlign="right"
+                  disabled
+                />
+              </view>
+            </view>
+
+            <view class="flex-row group-box-item">
+              <view class="flex-row">
+                <text class="text_15">企业申请人姓名</text>
+                <u-input
+                  class="input"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  :border="false"
+                  v-model="form.businessUser"
+                  disabled
+                  inputAlign="right"
+                />
+              </view>
+            </view>
+            <view class="group-box-item flex-row">
+              <text class="text_15">联系方式</text>
+              <u-input
+                class="input"
+                :custom-style="inputStyle"
+                :type="'number'"
+                :border="false"
+                v-model="form.phone"
+                placeholder="请输入"
+                disabled
+                inputAlign="right"
+              />
+            </view>
+            <view class="flex-row group-box-item" style="border: none">
+              <view class="flex-row">
+                <text class="text_15">申请人职务</text>
+                <u-input
+                  class="input"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  :border="false"
+                  placeholder="请输入"
+                  v-model="form.job"
+                  inputAlign="right"
+                />
+              </view>
+            </view>
+          </view>
+          <!-- 管理员 -->
+          <view class="flex-col group-box" v-if="roleId === '1'">
+            <view class="flex-row group-box-item">
+              <text class="text_15">申请人姓名</text>
+              <u-input
+                class="input"
+                :custom-style="inputStyle"
+                :type="'text'"
+                :border="false"
+                v-model="form.name"
+                placeholder="请输入"
+                disabled
+                inputAlign="right"
+              />
+            </view>
+            <view class="group-box-item flex-row">
+              <text class="text_15">联系方式</text>
+              <u-input
+                class="input"
+                :custom-style="inputStyle"
+                :type="'number'"
+                :border="false"
+                v-model="form.phone"
+                placeholder="请输入"
+                disabled
+                inputAlign="right"
+              />
+            </view>
+            <view class="justify-between group-box-item">
+              <!-- {{form.schoolName}} -->
+              <view class="flex-row">
+                <text class="text_15">学校</text>
+                <u-input
+                  class="input"
+                  :custom-style="inputStyle"
+                  :type="'text'"
+                  :border="false"
+                  v-model="shoolName"
+                  placeholder="请输入"
+                  disabled
+                  inputAlign="right"
+                />
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="file">
+      <view class="flex-col section_4">
+        <text class="text_11">申请人身份证</text>
+        <text class="text_tip">请规范上传身份正面，方便快速通过审核</text>
+        <view class="equal-division">
+          <view class="flex-col equal-division-item">
+            <u-upload
+              max-count="1"
+              :header="header"
+              :action="action"
+              @on-success="onSuccess"
+              index="0"
+              ref="uUpload1"
+              width="640"
+              height="396"
+            >
+              <template #addBtn>
+                <image :src="idcardPositive" mode="widthFix"></image>
+              </template>
+            </u-upload>
+          </view>
+          <view class="flex-col equal-division-item">
+            <u-upload
+              max-count="1"
+              :header="header"
+              :action="action"
+              @on-success="onSuccess"
+              index="1"
+              ref="uUpload2"
+              width="640"
+              height="396"
+            >
+              <template #addBtn>
+                <image :src="idcardBack" mode="widthFix"></image>
+              </template>
+            </u-upload>
+          </view>
+        </view>
+      </view>
+      <view class="flex-col section_4">
+        <text class="text_11">个人工作证</text>
+        <view class="equal-division">
+          <view class="flex-col equal-division-item">
+            <u-upload
+              max-count="1"
+              :header="header"
+              :action="action"
+              @on-success="onSuccess"
+              index="2"
+              ref="uUpload3"
+              width="640"
+              height="396"
+            >
+              <template #addBtn>
+                <image :src="workCard" mode="widthFix"></image>
+              </template>
+            </u-upload>
+          </view>
+          <view class="flex-col " v-if="roleId == 0">
+            <text class="text_11">企业营业执照</text>
+            <view class="equal-division">
+              <view class="flex-col equal-division-item">
+                <u-upload
+                  max-count="1"
+                  :header="header"
+                  :action="action"
+                  @on-success="onSuccess"
+                  index="3"
+                  ref="uUpload4"
+                  width="640"
+                  height="396"
+                >
+                <template #addBtn>
+                  <image :src="enterprisesImg" mode="widthFix"></image>
+                </template>
+              </u-upload>
+            </view>
+          </view>
+          </view>
+        </view>
+      </view>
+      <view class="flex-col group_9">
+        <text class="text_23">*所有上传信息仅供身份的认证</text>
+        <u-button
+          class="button"
+          type="primary"
+          :disabled="!state"
+          :plain="!state"
+          @click="save"
+          :throttle-time="1000"
+          >{{ state ? "提交认证" : "提交中" }}</u-button
+        >
+        <!-- <view class="flex-col items-center button" @click="save">
+					<text>提交认证</text>
+				</view> -->
+        <text class="text_25">示例</text>
+        <view class="grid">
+          <view class="grid-item flex-col items-center">
+            <image src="/static/common/img/身份证正面.png" class="image_14" />
+            <text style="color: #fff">身份证正面</text>
+          </view>
+          <view class="flex-col items-center grid-item">
+            <image src="/static/common/img/身份证反面.png" class="image_14" />
+            <text style="color: #fff">身份证反面</text>
+          </view>
+          <view class="grid-item flex-col items-center">
+            <image src="/static/common/img/个人工作证.png" class="image_14" />
+            <text style="color: #fff">个人工作证</text>
+          </view>
+          <view class="grid-item flex-col items-center" v-if="roleId == 0">
+            <image src="/static/common/img/企业营业执照.png" class="image_14" />
+            <text style="color: #fff">企业营业执照</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 地址 -->
+    <u-picker
+      mode="region"
+      v-model="address"
+      :area-code="addressId"
+      @confirm="selectAddress"
+    ></u-picker>
+    <!-- 性别 -->
+    <u-select
+      v-model="sex"
+      mode="single-column"
+      :default-value="sexId"
+      :list="sexList"
+      @confirm="selectSex"
+    >
+    </u-select>
+    <!--校内职务-->
+    <u-select
+      v-model="schoolPost"
+      mode="single-column"
+      :default-value="schoolPostId"
+      :list="schoolPostList"
+      @confirm="selectScpost"
+    ></u-select>
+    <!--所属院系-->
+    <u-select
+      v-model="college"
+      mode="single-column"
+      :default-value="collegeId"
+      :list="CollegeList"
+      @confirm="selectCpllege"
+    ></u-select>
+    <!--具体职位-->
+    <u-select
+      v-model="job"
+      mode="single-column"
+      :default-value="jobId"
+      :list="jobList"
+      @confirm="selectJob"
+    >
+    </u-select>
+    <!-- 学校 -->
+    <u-select
+      v-model="shoolShow"
+      :default-value="shoolId"
+      mode="single-column"
+      title="学校选择"
+      :list="shoolList"
+      @confirm="shoolSelect"
+    >
+    </u-select>
+    <!-- 出生日期 -->
+    <u-picker
+      mode="time"
+      v-model="birthdays"
+      :end-year="EndYear"
+      :default-time="birthdaysId"
+      @confirm="selectBirthdays"
+    ></u-picker>
+    <!-- 籍贯 -->
+    <u-picker
+      mode="region"
+      v-model="NativePlace"
+      :area-code="NativePlaceId"
+      @confirm="selectNativePlace"
+    >
+    </u-picker>
+    <!-- 工作领域 -->
+    <u-select
+      v-model="WorkArea"
+      mode="single-column"
+      :default-value="WorkAreaId"
+      :list="WorkAreaList"
+      @confirm="selectWorkArea"
+    ></u-select>
+    <!-- 提示 -->
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import { Debounce } from "../../../common/utils.js";
+import idcardPositive from "@/static/common/img/上传身份证正面.png";
+import idcardBack from "@/static/common/img/上传身份证反面.png";
+import workCard from "@/static/common/img/上传个人工作证.png";
+import enterprisesImg from "@/static/common/img/上传营业执照.png" 
+export default {
+  data() {
+    return {
+      state: true,
+      title: "教职工认证",
+      action: "/app/User/File",
+      // input 样式
+      inputStyle: {
+        lineHeight: "0.5rem",
+        height: "0.5rem",
+        width: "1.8rem",
+      },
+      shoolName: "",
+      sex: false, //性别选择框的显示/隐藏
+      shoolShow: false, //学校选择框的显示/隐藏
+      schoolPost: false, //校内职务选择框的显示/隐藏
+      sexList: [
+        //性别选择框内容
+        {
+          label: "男",
+          value: "0",
+        },
+        {
+          label: "女",
+          value: "1",
+        },
+      ],
+      schoolPostList: [
+        //校内职务选择框内容
+        {
+          label: "教师",
+          value: "0",
+        },
+        {
+          label: "行政管理",
+          value: "1",
+        },
+        {
+          label: "后勤",
+          value: "2",
+        },
+      ],
+      jobList: [
+        //具体职务
+        {
+          label: "助教",
+          value: "0",
+        },
+        {
+          label: "讲师",
+          value: "1",
+        },
+        {
+          label: "副教授",
+          value: "2",
+        },
+        {
+          label: "教授",
+          value: "3",
+        },
+      ],
+      header: {
+        Authorization: "",
+      },
+      shoolList: [], //学校选择
+      CollegeList: [], //院系选择,
+      sexId: [0], //记录选择的性别进行数据复现
+      shoolId: [0], //默认选择学校
+      schoolPostId: [0], //默认选择的校内职务
+      jobId: [0], //默认选择具体职务
+      collegeId: [0], //默认选择所属院系
+      address: false, //现居地址选择框的显示/隐藏
+      addressId: [11, 1101, 110101], //记录选择的现居地址进行数据复现
+      birthdays: false, //出生日期选择框的显示/隐藏
+      birthdaysId: "", //记录选择的出生日期进行数据复现
+      EndYear: 2022, //出生日期选择框的最大年份
+      NativePlace: false, //籍贯选择框的显示/隐藏
+      NativePlaceId: [11, 1101, 110101], //记录选择的籍贯进行数据复现
+      WorkArea: false, //工作领域选择框的显示/隐藏
+      WorkAreaId: [0], //记录选择的工作领域进行数据复现
+      //工作领域选择框内容
+      WorkAreaList: [],
+      form: {
+        name: "",
+        realName: "",
+        sex: "",
+        birthdays: "",
+        phone: "",
+        NativePlace: "",
+        address: "",
+        DetailedAddress: "",
+        WorkArea: "",
+        schoolId: "",
+        job: "",
+        businessName: "",
+        businessAddress: "",
+        businessUser: "",
+        businessLicense: "",
+        schoolJob: "",
+        faculty: "",
+      },
+      job: false,
+      roleId: 0,
+      college: false,
+      isDisabled: false,
+      route: "", //判断提交成功之后的页面
+      idcardPositive: idcardPositive,
+      idcardBack: idcardBack,
+      workCard: workCard,
+      enterprisesImg:enterprisesImg
+    };
+  },
+  onLoad(e) {
+    this.action = this.$u.http.config.baseUrl + this.action;
+    this.header.Authorization = "Bearer " + this.vuex_token;
+    this.roleId = e.id;
+    console.log(this.roleId, "this.roleId---");
+    this.route = e.route;
+    let name = this.vuex_user.name;
+    if (this.roleId == 0) {
+      this.title = "企业认证";
+      this.form.businessUser = name;
+    } else if (this.roleId == 2) {
+      this.title = "教职工认证";
+      this.form.name = name;
+    } else if (this.roleId == 1) {
+      this.title = "管理员认证";
+      this.form.name = name;
+    }
+    this.EndYear = new Date().getFullYear();
+    this.form.phone = this.vuex_user.phone;
+    this.getschoolId();
+    this.getShool();
+    this.getWorkFile();
+  },
+  created() {},
+  methods: {
+    //获取学校id
+    getschoolId() {
+      this.$u.apiList.GetUserSchool().then((res) => {
+        // 学生时
+        if ([0,2].includes(this.vuex_user.userType)) {
+          this.form.schoolId = res.items.schoolId;
+          this.shoolName = res.items.school.name;
+        }
+        // 教师时
+        if (this.vuex_user.userType === 1) {
+          this.form.schoolId = res.jzgItems.schoolId;
+          this.shoolName = res.jzgItems.school.name;
+        }
+        this.getColleg();
+      });
+    },
+    // 获取学校
+    getShool() {
+      this.$u.api.GetAllSchool().then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.shoolList.push({
+            label: res[i].schoolName + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取学院
+    getColleg() {
+      const data = {
+        schoolid: this.form.schoolId,
+        // name:name
+      };
+      this.$u.apiList.GetCollegeList(data).then((res) => {
+        for (let i = 0; i < res.length; i++) {
+          this.CollegeList.push({
+            label: res[i].name + "",
+            value: res[i].id + "",
+          });
+        }
+      });
+    },
+    //获取工作领域
+    getWorkFile() {
+      this.$u.apiList.GetWorkFile().then((res) => {
+        this.WorkAreaList = res.map((item) => {
+          return {
+            label: item.workFieldName,
+            value: item.id,
+          };
+        });
+      });
+    },
+    // 提示
+    tips(title, type, time) {
+      this.$refs.uToast.show({
+        title: title ? title : "",
+        type: type ? type : "success",
+        duration: time ? time + "" : "1000",
+      });
+    },
+    // 保存
+    save: Debounce(function (e) {
+      console.log(this.roleId, "this.roleId-");
+      // return
+      // if (this.route == 'my') {
+      // 		this.$refs.uToast.show({
+      // 			title: '提交认证成功',
+      // 			type: 'success',
+      // 		})
+      // 		setTimeout(() => {
+      // 			uni.switchTab({
+      // 				url: '../../my/my/my'
+      // 			});
+      // 		}, 2000)
+      // 	}else{
+      //     this.$refs.uToast.show({
+      //       title: '提交认证成功',
+      //       type: 'success',
+      //       url: 'pages/my/authentication/authentication'
+      //     })
+      //   }
+      // return
+      var data = this.form;
+      this.form.userId = this.vuex_user.id;
+      if (this.roleId == 1) {
+        if (data.name === "") {
+          this.tips("请输入用户名", "error");
+          return;
+        }
+        //  var reg = new RegExp("^[1][3,4,5,7,8,9][0-9]{9}$", "g"); //手机号
+        //  if (data.phone === "" || !reg.test(data.phone)) {
+        // this.tips("请输入正确的手机号码", "error");
+        // return;
+        //  }
+        if (data.schoolId === "") {
+          this.tips("请选择学校", "error");
+        }
+        // if(data.job === ""){
+        //  this.tips("请选择职业","error")
+        // }
+        if (!this.filecheck()) {
+          return;
+        }
+        this.SubmitAttestationGLY();
+      } else if (this.roleId == 0) {
+        if (data.businessName === "") {
+          this.tips("请输入企业名称", "error");
+          return;
+        }
+        if (data.businessAddress === "") {
+          this.tips("请输入企业地址", "error");
+          return;
+        }
+        // if(data.phone === ""){
+        //  this.tips("请输入联系方式", "error");
+        //  return;
+        // }
+        if (data.job === "") {
+          this.tips("请输入申请人职务", "error");
+          return;
+        }
+        if (!this.filecheck()) {
+          return;
+        }
+        this.SubmitAttestationQY();
+      } else if (this.roleId == 2) {
+        var reg = new RegExp("^[\u4e00-\u9fa5]{0,}$", "g"); //真实姓名
+        if (data.name === "" || !reg.test(data.name)) {
+          this.tips("请输入正确的真实姓名", "error");
+          return;
+        }
+        //  var reg1 = new RegExp("^[1][3,4,5,7,8,9][0-9]{9}$", "g"); //手机号
+        //  if (data.phone === "" || !reg1.test(data.phone)) {
+        // this.tips("请输入正确的手机号码", "error");
+        // return;
+        //  }
+        if (data.schoolId === "") {
+          this.tips("请选择入职学校", "error");
+          return;
+        }
+        if (data.schoolJob === "") {
+          this.tips("请选择校内职务", "error");
+          return;
+        }
+        if (data.schoolJob === "教师") {
+          if (data.faculty === "") {
+            this.tips("请输入所属院系", "error");
+            return;
+          }
+          if (data.job === "") {
+            this.tips("请选择具体职位", "error");
+            return;
+          }
+        }
+        if (!this.filecheck()) {
+          return;
+        }
+        this.SubmitAttestationJZG();
+      }
+    }, 1000),
+
+    filecheck() {
+      let file1 = this.$refs.uUpload1.lists[0];
+      let file2 = this.$refs.uUpload2.lists[0];
+      let file3 = this.$refs.uUpload3.lists[0];
+      if (!file1) {
+        this.tips("请上传身份证正面", "error");
+        return false;
+      }
+      if (!file2) {
+        this.tips("请上传身份证反面", "error");
+        return false;
+      }
+      if (!file3) {
+        this.tips("请上传个人工作证", "error");
+        return false;
+      }
+      if (this.roleId == 0) {
+        let file4 = this.$refs.uUpload4.lists[0];
+        if (!file4) {
+          this.tips("请上传企业营业执照", "error");
+          return false;
+        }
+      }
+      return true;
+    },
+    // 盘判断出生日期
+    isBirthday(data) {
+      return new Date(data) >= new Date();
+    },
+    // 选择工作领域
+    selectWorkArea(e) {
+      this.form.job = e[0].label;
+      this.WorkAreaId = [parseInt(e[0].value)];
+    },
+    // 选择籍贯
+    selectNativePlace(e) {
+      this.form.NativePlace =
+        e.province.label + "-" + e.city.label + "-" + e.area.label;
+      var arr = [];
+      //   - 0 是转化为隐式转换为数组类型
+      arr.push(e.province.value - 0);
+      arr.push(e.city.value - 0);
+      arr.push(e.area.value - 0);
+      this.NativePlaceId = arr;
+    },
+    // 选择出生日期
+    selectBirthdays(e) {
+      this.form.birthdays = e.year + "-" + e.month + "-" + e.day;
+      this.birthdaysId = e.year + "-" + e.month + "-" + e.day;
+    },
+    //   选择性别
+    selectSex(e) {
+      this.form.sex = e[0].label;
+      this.sexId = [parseInt(e[0].value)];
+    },
+    //   选择校内职务
+    selectScpost(e) {
+      if (e[0].label == "教师") {
+        this.isDisabled = true;
+      } else {
+        this.form.faculty = "";
+        this.form.job = "";
+        this.isDisabled = false;
+      }
+      this.form.schoolJob = e[0].label;
+      this.schoolPostId = [parseInt(e[0].value)];
+    },
+    //选择所属院系
+    selectCpllege(e) {
+      this.form.faculty = e[0].label;
+      this.collegeId = [parseInt(e[0].value)];
+    },
+    //   选择具体职务
+    selectJob(e) {
+      this.form.job = e[0].label;
+      this.jobId = [parseInt(e[0].value)];
+    },
+    //   选择地址
+    selectAddress(e) {
+      this.form.businessAddress =
+        e.province.label + "-" + e.city.label + "-" + e.area.label;
+      var arr = [];
+      //   - 0 是转化为隐式转换为数组类型
+      arr.push(e.province.value - 0);
+      arr.push(e.city.value - 0);
+      arr.push(e.area.value - 0);
+      this.addressId = arr;
+    },
+    // 学校选择
+    shoolSelect(e) {
+      this.shoolName = e[0].label;
+      this.form.schoolId = e[0].value;
+      this.getColleg(this.form.schoolId, this.shoolName);
+    },
+    // 提交管理员认证
+    SubmitAttestationGLY() {
+      this.state = false;
+      this.$u.apiList
+        .SubmitAttestationGLY(this.form)
+        .then((res) => {
+          this.state = true;
+          if (this.route == "my") {
+            this.$refs.uToast.show({
+              title: "提交认证成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              uni.switchTab({
+                url: "../../my/my/my",
+              });
+            }, 1000);
+          } else {
+            this.$refs.uToast.show({
+              title: "提交认证成功",
+              type: "success",
+            });
+          }
+        })
+        .catch((e) => {
+          this.state = true;
+          console.log(e, "e---");
+          this.$refs.uToast.show({
+            title: e.error || "提交失败",
+            type: "error",
+          });
+        });
+    },
+    //提交企业认证
+    SubmitAttestationQY() {
+      this.state = false;
+      setTimeout(() => {
+        this.state = true;
+        // uni.showToast({
+        // 	title: '提交异常,请联系管理员',
+        // 	icon: 'none'
+        // })
+      }, 5000);
+      this.$u.apiList
+        .SubmitAttestationQY(this.form)
+        .then((res) => {
+          this.state = true;
+          this.$refs.uToast.show({
+            title: "提交认证成功",
+            type: "success",
+          });
+          // uni.showToast({
+          // 	title: "提交认证成功",
+          // 	duration: 2000,
+          // });
+          setTimeout(() => {
+              uni.switchTab({
+                url: "../../my/my/my",
+              });
+            }, 1000);
+        })
+        .catch((err) => {
+          this.state = true;
+          /* uni.showToast({
+            title: err.error || "提交失败",
+            icon: "none",
+          }); */
+          this.$refs.uToast.show({
+            title: err.error || "提交失败",
+            type: "error",
+          });
+        });
+    },
+    //提交教职工认证
+    SubmitAttestationJZG() {
+      this.state = false;
+      this.$u.apiList
+        .SubmitAttestationJZG(this.form)
+        .then((res) => {
+          this.state = true;
+          if (this.route == "my") {
+            this.$refs.uToast.show({
+              title: "提交认证成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              uni.switchTab({
+                url: "../../my/my/my",
+              });
+            }, 2000);
+          } else {
+            this.$refs.uToast.show({
+              title: "提交认证成功",
+              type: "success",
+              // url: 'pages/my/authentication/authentication'
+            });
+            setTimeout(() => {
+              uni.redirectTo({
+                url: "/pages/my/authentication/authentication",
+              });
+            }, 500);
+          }
+        })
+        .catch((e) => {
+          console.log(e, "e------");
+          this.state = true;
+          this.$refs.uToast.show({
+            title: e.error || "提交失败",
+            type: "error",
+          });
+        });
+    },
+    //图片上传成功
+    onSuccess(data, index, lists, name) {
+      if (name == 0) {
+        this.form.imgFront = data.data;
+      } else if (name == 1) {
+        this.form.imgReverse = data.data;
+      } else if (name == 2) {
+        this.form.imgWork = data.data;
+      } else if (name == 3) {
+        this.form.businessLicense = data.data;
+      }
+    },
+    //返回上一级
+    router() {
+      if (this.route == "my") {
+        uni.switchTab({
+          url: "../../my/my/my",
+        });
+      } else {
+        this.$u.route({
+          url: "pages/my/authentication/authentication",
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.file {
+  background: #f6f8f9;
+  .group_9 {
+    width: calc(100% - 60rpx);
+    padding: 30rpx;
+    margin: 0 auto;
+
+    .text_23 {
+      color: rgb(46, 155, 255);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+    }
+
+    .button {
+      margin: 0.14rem 0.07rem 0 0.08rem;
+      padding: 0.12rem 0;
+      color: rgb(255, 255, 255);
+      font-size: 0.15rem;
+      line-height: 0.16rem;
+      letter-spacing: 0.03rem;
+      white-space: nowrap;
+      background-color: rgb(46, 155, 255);
+      border-radius: 0.1rem;
+    }
+
+    .text_25 {
+      margin-left: 0.025rem;
+      margin-top: 0.21rem;
+      color: rgb(164, 174, 183);
+      font-size: 0.15rem;
+      line-height: 0.14rem;
+      letter-spacing: 0.03rem;
+      white-space: nowrap;
+    }
+
+    .grid {
+      margin: 0.1rem 0.03rem 0 0.02rem;
+      height: 1.61rem;
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      grid-row-gap: 0.11rem;
+      grid-column-gap: 0.11rem;
+
+      .grid-item {
+        background-color: rgb(176, 191, 205);
+        border-radius: 0.05rem;
+      }
+
+      .grid-item_1 {
+        padding: 0.23rem 0 0.29rem;
+        background-color: rgb(176, 191, 205);
+        border-radius: 0.05rem;
+      }
+
+      .image_14 {
+        width: 100%;
+        height: 0.8rem;
+      }
+    }
+  }
+
+  .section_4 {
+    width: calc(100% - 60rpx);
+    margin: 20rpx auto;
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+
+    .text_11 {
+      color: #191919;
+      font-size: 32rpx;
+      white-space: nowrap;
+    }
+
+    .equal-division {
+      margin-top: 0.13rem;
+      color: rgb(46, 155, 255);
+      font-size: 0.12rem;
+      line-height: 0.16rem;
+      white-space: nowrap;
+
+      .equal-division-item {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        margin-bottom: 20rpx;
+
+        .text_11 {
+          color: #191919;
+          font-size: 32rpx;
+          white-space: nowrap;
+        }
+
+        .section_5 {
+          padding: 0.17rem 0.22rem 0.14rem 0.22rem;
+          border-radius: 0.05rem;
+          border: 1px dotted #66b5ff;
+        }
+
+        .text_16 {
+          margin-top: 0.055rem;
+          align-self: center;
+        }
+      }
+
+      .equal-division-item_1 {
+        max-width: 48.5%;
+        margin-left: 0.14rem;
+        flex: 1 1 1.6rem;
+
+        .text_11 {
+          color: #191919;
+          font-size: 32rpx;
+          white-space: nowrap;
+        }
+
+        .section_6 {
+          padding: 0.17rem 0.22rem 0.14rem 0.22rem;
+          border-radius: 0.05rem;
+          border: 1px dotted #66b5ff;
+        }
+
+        .text_19 {
+          margin-top: 0.05rem;
+          align-self: center;
+        }
+      }
+
+      .top-section {
+        padding: 0.12rem 0 0.1rem;
+        border-radius: 0.05rem;
+        background: #eff7ff;
+
+        .image_6 {
+          width: 0.22rem;
+          height: 0.17rem;
+        }
+
+        .text_12 {
+          margin-left: 0.075rem;
+          margin-top: 0.015rem;
+        }
+      }
+
+      .bottom-section {
+        margin-top: 0.1rem;
+        padding: 0.09rem 0.17rem 0.13rem;
+        border-radius: 0.05rem;
+        background: #eff7ff;
+
+        .image_8 {
+          margin-right: 0.08rem;
+          width: 0.23rem;
+          height: 0.17rem;
+        }
+
+        .text_14 {
+          margin-top: 0.015rem;
+        }
+      }
+    }
+  }
+}
+
+.form {
+  .headerImg {
+    padding-bottom: 0.05rem;
+  }
+
+  .section_2 > view > view {
+    margin-left: 0.21rem;
+    padding: 0 !important;
+    border-bottom: 0.01rem solid #edeeef;
+    position: relative;
+  }
+
+  .section_2 > view > view .input,
+  .section_2 > view > view text {
+    line-height: 0.5rem;
+  }
+
+  .section_2 > view > view .input {
+    padding-right: 0.2rem !important;
+  }
+
+  .section_2 > view > view text {
+    margin-right: 0.1rem;
+    min-width: 0.91rem;
+    white-space: nowrap;
+  }
+
+  .section_2 > view > view image {
+    position: absolute;
+    top: 50%;
+    right: 0.14rem;
+    transform: translateY(-50%);
+  }
+
+  .image_3 {
+    width: 0.075rem;
+    height: 0.13rem;
+  }
+
+  .group {
+    flex: 1 1 auto;
+    overflow-y: auto;
+  }
+  .group-box {
+    width: calc(100% - 60rpx);
+    margin: 0 30rpx;
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 0 30rpx;
+  }
+  .group-box-item {
+    margin: 0 !important;
+  }
+
+  .item-wrapper {
+    position: relative;
+  }
+
+  .input-cover {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1;
+  }
+
+  .section_2 {
+    padding: 0.055rem 0 0 0;
+    background-color: #f6f8f9;
+  }
+
+  .group_16 {
+    margin-top: 0.21rem;
+    padding: 0 0.02rem;
+  }
+
+  .button_1,
+  .button {
+    padding: 0.13rem 0;
+    color: rgb(255, 255, 255);
+    font-size: 0.15rem;
+    line-height: 0.14rem;
+    letter-spacing: 0.03rem;
+    white-space: nowrap;
+    background-color: rgb(46, 155, 255);
+    border-radius: 0.1rem;
+    width: 3.1rem;
+    margin: 0 auto;
+  }
+
+  .button_1 {
+    margin-top: 0.1rem;
+    color: rgb(55, 59, 72);
+    background-color: rgb(255, 255, 255);
+    border: solid 0.01rem rgba(160, 162, 172, 0.33);
+    margin-bottom: 0.2rem;
+  }
+
+  .view_1 {
+    margin-left: 0.02rem;
+  }
+
+  .text_15 {
+    color: #191919;
+    font-size: 28rpx;
+    white-space: nowrap;
+  }
+
+  .image_2 {
+    width: 0.6rem;
+    height: 0.6rem;
+    border-radius: 50%;
+    overflow: hidden;
+  }
+
+  .image_4 {
+    margin-right: 0.15rem;
+    margin-top: 0.28rem;
+  }
+}
+.text_tip {
+  font-size: 24rpx;
+  color: rgba(0, 0, 0, 0.5);
+}
+::v-deep .u-add-wrap {
+  display: none !important;
+}
+</style>
diff --git a/pages/my/examine/examine.vue b/pages/my/examine/examine.vue
new file mode 100644
index 0000000..0e3d8bb
--- /dev/null
+++ b/pages/my/examine/examine.vue
@@ -0,0 +1,555 @@
+<template>
+	<view>
+		<u-navbar  title="审核处理" ></u-navbar>
+		<view class="guanzhu">
+			<u-tabs-swiper
+			  ref="uTabs"
+			  :list="navList"
+			  :current="current"
+			  :is-scroll="false"
+			  :active-item-style="{ color: '#3CB5FB', fontSize: '0.15rem' }"
+			  :bar-style="{ background: '#3CB5FB' }"
+			  @change="tabsChange"
+			></u-tabs-swiper>
+			<scroll-view
+			  scroll-y="true"
+			  style="height: calc(100vh - 1rem); width: 100%"
+			  @scrolltolower="onreachBottom"
+			>
+			<view class="flex-col group_2">
+				<view class="flex-col list">
+					<view class="list-item flex-row group_3" v-for="(item,index) in AuditList" :key="index" @click="onAudit(item.id,current)">
+						<image
+							:src="$u.http.config.imgUrl + item.head"
+							class="text_3 image_1" />
+						<view class="bottom-text-wrapper justify-between view_1">
+							<text class="text_5 text_7">{{item.name}}</text>
+							<view class="center-text-wrapper flex-col items-end">
+								<text class="text_8">{{item.schoolName}}</text>
+							</view>
+							<view class="right-text-wrapper flex-col items-center" v-if="item.state==0">
+								<text class="text_10" >待处理</text>
+							</view>
+							<view class="right-text-wrapper flex-col items-center" v-if="item.state==1" style="background-color:#08da08;">
+								<text class="text_10" >已通过</text>
+							</view>
+							<view class="right-text-wrapper flex-col items-center" v-if="item.state==2" style="background-color:#ef0909;">
+								<text class="text_10" >已驳回</text>
+							</view>
+							<view class="right-text-wrapper flex-col items-center"  v-if="item.state==3" style="background-color:rgb(242, 142, 12);">
+								<!-- <text class="text_10">{{auto[item.state]}}</text> -->
+								<text class="text_10">待二次审核</text>
+								<!-- <text class="text_10">{{item.state==0?'待处理':'已通过'}}</text> -->
+							</view>
+						</view>
+					</view>
+		<!-- 			<view class="list-item flex-row group_8">
+						<image
+							src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/6216dee45a7e3f031061d0f1/621c59e162a7d90011002985/16460345196775201756.png"
+							class="text_3 image_6" />
+						<view class="bottom-text-wrapper justify-between view_1">
+							<text class="text_5 text_26">Meiji</text>
+							<view class="center-text-wrapper flex-col items-end view_20">
+								<text class="text_8">浙江大学</text>
+							</view>
+							<view class="right-text-wrapper flex-col items-center view_21">
+								<text class="text_10">审核中</text>
+							</view>
+						</view>
+					</view> -->
+				</view>
+			</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				AuditList:[],
+				current:0,
+				schoolId:"",
+				navList:[
+					{
+					  name: "待审核",
+					},
+					{
+					  name: "已审核",
+					},
+				],
+				auto:{
+					0:'待处理',
+					1:'已通过',
+					2:'已驳回',
+					3:'待二次审核'
+				},
+				pageIndex:1,
+				pageSize:10,
+				total:0
+			}
+		},
+		onLoad(){
+			// this.getschoolId()
+		},
+    onShow(){
+      this.pageIndex = 1;
+      this.AuditList = [];
+      this.getschoolId()
+      // this.getAuditList();
+    },
+		methods: {
+			getschoolId(){
+				this.$u.apiList.GetUserSchool().then(res=>{
+          // 学生时
+          if([0,2].includes(this.vuex_user.userType)){
+            this.schoolId = res.items.schoolId
+          }
+          // 教师时
+          if(this.vuex_user.userType === 1){
+            this.schoolId = res.jzgItems.schoolId
+          }
+					this.getAuditList()
+				})
+			},
+			getAuditList(){
+				const data = {
+					pageIndex:this.pageIndex,
+					pageSize:this.pageSize,
+					userId:this.vuex_user.id,
+					schoolId:this.schoolId,
+					type:this.current
+				}
+				this.$u.apiList.AuditList(data).then(res=>{
+					this.total = res.total
+					this.AuditList.push(...res.items)
+					
+				})
+			},
+			tabsChange(i){
+				if(this.current != i){
+					this.current = i 
+					this.AuditList = []
+					this.pageIndex = 1
+					this.getAuditList()
+				}
+			},
+			// onExamine(item){
+			// 	console.log(1)
+			// 	if(this.vuex_user.isAttestationJZG){
+			// 		this.onAttestationJZG(item)
+			// 	}else{
+			// 		this.onAttestationGLY0(item)
+			// 	}
+			// },
+			//教职工认证
+			// onAttestationJZG(item){
+			// 	this.$u.apiList.AttestationJZG({userId:item.id}).then((res)=>{
+					
+			// 	})
+			// },
+			// onAttestationGLY(item){
+			// 	this.$u.apiList.AttestationGLY({userId:item.id}).then((res)=>{
+					
+			// 	})
+			// },
+			onAudit(id,current){
+				this.$u.route({
+					url:'pages/my/AuditDeatil/AuditDeatil',
+					params:{id:id,type:current}
+				})
+			},
+			onreachBottom(){
+				 let num = this.pageIndex * this.pageSize
+				 
+				 if(num >= this.total)return
+				 this.pageIndex++
+				 this.getAuditList()
+			},
+			//返回上一级
+			router(){
+				 uni.switchTab({
+				 	url: '../../my/my/my'
+				 });
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.guanzhu {
+		.list-item {
+			padding: 0rem 0 0 0.15rem;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			width: 100%;
+			position: relative;
+		}
+	
+		.text_3 {
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+	
+		.bottom-text-wrapper {
+			margin-top: 0.1rem;
+			padding: 0.035rem 0;
+			color: rgb(115, 129, 255);
+			font-size: 0.11rem;
+			line-height: 0.11rem;
+			letter-spacing: 0.011rem;
+			white-space: nowrap;
+			background-color: rgba(115, 129, 255, 0.1);
+			border-radius: 0.09rem;
+		}
+	
+		.text_5 {
+			margin-left: 0.1rem;
+			margin-right: 0.03rem;
+		}
+	
+		.center-text-wrapper {
+			padding: 0.035rem 0.08rem;
+			color: rgb(115, 129, 255);
+			font-size: 0.11rem;
+			line-height: 0.11rem;
+			letter-spacing: 0.011rem;
+			white-space: nowrap;
+			background-color: rgba(115, 129, 255, 0.1);
+			border-radius: 0.09rem;
+			position: absolute;
+			left: 0.4rem;
+			bottom: 0.1rem;
+		}
+	
+		.right-text-wrapper {
+			margin-right: 0.06rem;
+			margin-top: 0.03rem;
+			margin-left: 0.06rem;
+			padding: 0.085rem 0.08rem;
+			color: rgb(255, 255, 255);
+			font-size: 0.14rem;
+			line-height: 0.13rem;
+			white-space: nowrap;
+			background-color: rgb(46, 155, 255);
+			border-radius: 0.15rem;
+			width: 0.85rem;
+			height: 0.3rem;
+			position: relative;
+		}
+	
+		.text_8 {
+			margin-right: 0.03rem;
+		}
+	
+		.text_10 {
+			text-transform: uppercase;
+		}
+	
+		.text_12 {
+			margin-left: 0.05rem;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+	
+		.text_14 {
+			margin-left: 0.1rem;
+			margin-right: 0.03rem;
+		}
+	
+		.group_2 {
+			// padding: 0.11rem 0 4.94rem;
+			// flex: 1 1 auto;
+			// overflow-y: auto;
+			position: relative;
+		}
+	
+		.text-wrapper {
+			// margin-left: 0.17rem;
+			padding: 0.11rem 0 0.12rem;
+			color: rgb(255, 255, 255);
+			font-size: 0.18rem;
+			line-height: 0.17rem;
+			letter-spacing: 0.018rem;
+			white-space: nowrap;
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+			width: 0.4rem;
+			height: 0.4rem;
+			margin-top: 0.08rem;
+			background: #6574fc;
+			border-radius: 50%;
+	
+			text {
+				display: inline-block;
+				width: 100%;
+				text-align: center;
+			}
+		}
+	
+		.list {
+			
+		}
+	
+		.text_2 {
+			color: #fff;
+		}
+	
+	
+		.group_4 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+			margin-top: 0.015rem;
+		}
+	
+		.group_5 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+	
+		.group_6 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+	
+		.group_7 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+	
+		.group_8 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+	
+		.group_9 {
+			padding: initial;
+			align-self: initial;
+			box-shadow: initial;
+			width: initial;
+			position: initial;
+		}
+	
+		.image_1 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			margin-top: 0;
+			width: 0.4rem;
+			height: 0.4rem;
+			border-radius: 50%;
+			overflow: hidden;
+			    position: absolute;
+			    top: 50%;
+			    transform: translateY(-50%);
+		}
+	
+		.view_1 {
+			margin-top: initial;
+			padding: 0.15rem 0.05rem 0.18rem 0.4rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.12rem;
+			margin-right: 0.04rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			height: 0.67rem;
+			position: relative;
+		}
+	
+		.image_2 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+	
+		.view_4 {
+			margin-top: initial;
+			padding: 0.14rem 0 0.1rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.12rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		}
+	
+		.image_3 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+	
+		.view_8 {
+			margin-top: initial;
+			padding: 0.15rem 0 0.14rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.13rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		}
+	
+		.image_4 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+	
+		.view_12 {
+			margin-top: initial;
+			padding: 0.17rem 0 0.08rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.12rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+		}
+	
+		.image_5 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+	
+		.view_16 {
+			margin-top: initial;
+			padding: 0.15rem 0 0.11rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.16rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			height: 0.67rem;
+		}
+	
+		.image_6 {
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			align-self: center;
+			width: 0.4rem;
+			height: 0.4rem;
+		}
+	
+		.view_19 {
+			margin-top: initial;
+			padding: 0.18rem 0 0.18rem;
+			color: initial;
+			font-size: initial;
+			line-height: initial;
+			letter-spacing: initial;
+			white-space: initial;
+			background-color: initial;
+			border-radius: initial;
+			margin-left: 0.16rem;
+			flex: 1 1 auto;
+			box-shadow: 0px 0.005rem rgb(234, 234, 234);
+			height: 0.67rem;
+			position: relative;
+		}
+	
+		.text_7 {
+			margin-left: initial;
+			margin-right: initial;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+	
+		.text_26 {
+			margin-left: initial;
+			margin-right: initial;
+			color: rgb(2, 2, 2);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.015rem;
+			white-space: nowrap;
+		}
+	
+		.view_20 {
+			left: -0.03rem;
+			bottom: 0.075rem;
+		}
+	
+		.view_21 {
+			margin-right: 0.06rem;
+			margin-top: initial;
+			padding: 0.09rem 0 0.06rem;
+			color: rgb(73, 76, 87);
+			background-color: initial;
+			border: solid 0.01rem rgb(185, 185, 185);
+		}
+	}
+</style>
diff --git a/pages/my/fileAcc/fileAcc.vue b/pages/my/fileAcc/fileAcc.vue
new file mode 100644
index 0000000..d31b29b
--- /dev/null
+++ b/pages/my/fileAcc/fileAcc.vue
@@ -0,0 +1,489 @@
+<template>
+  <view>
+    <u-navbar title="附件简历"></u-navbar>
+    <!-- 内容 -->
+    <view class="item-box" v-for="(x, xIndex) in fileList" :key="xIndex">
+      <view class="item-left">
+        <image
+          v-if="['pdf', 'PDF'].includes(x.type)"
+          style="width: 60rpx; height: 60rpx"
+          src="/static/common/img/pdf.svg"
+        />
+        <image
+          v-else-if="['doc', 'docx', 'DOC', 'DOCX'].includes(x.type)"
+          style="width: 60rpx; height: 60rpx"
+          src="/static/common/img/word.svg"
+        />
+        <image
+          v-else
+          style="width: 60rpx; height: 60rpx"
+          src="/static/common/img/img.svg"
+        />
+      </view>
+      <view class="item-center" @click="downLoadFn(x)">
+        <view class="title-box" :class="x.isShow ? 'isShow' : ''">{{
+          x.resumeName
+        }}</view>
+        <view class="item-date">
+          <text>{{ x.size }}MB</text>
+          <text>上传于 {{ x.createTime }}</text>
+        </view>
+      </view>
+      <view class="item-right" @click="sheetFn(x)">
+        <image style="width: 30rpx; height: 30rpx" src="/static/common/img/sheet.svg" />
+      </view>
+      <!-- 定位盒子 -->
+      <!-- <view class="show-box" v-if="x.isShow">展示</view> -->
+    </view>
+    <!-- 空内容 -->
+    <view v-if="!fileList.length" style="padding-top: 100rpx">
+      <no-data type="resume" text="当前暂无附件简历">
+        
+      </no-data>
+    </view>
+    <!-- 占位 -->
+    <view style="height: 20rpx"></view>
+    <!-- 按钮 -->
+    <view class="btn-box" @click="selectFn">
+      去添加
+      <!-- <u-button
+        style="width: 254rpx"
+        shape="square"
+        type="primary"
+        :loading="loading"
+        @click="selectFn"
+        >上传附件简历</u-button
+      > -->
+    </view>
+    <u-top-tips ref="uTips" :navbar-height="50"></u-top-tips>
+    <u-toast ref="uToast" />
+    <u-action-sheet
+      @click="sheetConfirm"
+      :list="list"
+      v-model="selectShow"
+    ></u-action-sheet>
+  </view>
+</template>
+
+<script>
+import NoData from '@/components/NoData.vue';
+export default {
+  components: {
+    NoData
+  },
+  data() {
+    return {
+      action: "app/User/AddUserFile",
+      header: { Authorization: "" },
+      fileList: [],
+      queryParams: {
+        type: "add",
+      },
+      loading: false,
+      pathArr: [],
+      selectShow: false,
+      list: [
+        {
+          text: "设置为展示简历",
+          color: "#2979ff",
+        },
+        {
+          text: "删除",
+          color: "red",
+        },
+      ],
+      currentRow: {},
+    };
+  },
+  onLoad(e) {
+    this.header.Authorization = "Bearer " + this.vuex_token;
+    Object.assign(this.queryParams, e);
+  },
+  onShow() {
+    this.getListFn();
+  },
+  created() {},
+  methods: {
+    sheetFn(x) {
+      this.currentRow = x;
+      this.selectShow = true;
+    },
+    sheetConfirm(val) {
+      console.log(val, "val*--");
+      // 设置为展示简历
+      if (val === 0) {
+        this.setFileFn(this.currentRow);
+      }
+      // 删除
+      if (val === 1) {
+        this.deleteFn(this.currentRow);
+      }
+    },
+    async getListFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      // 待审核
+      const res = await this.$u.apiList.GetUserFileApi(req);
+      console.log(res, "res--");
+      this.fileList = res
+        .map((x) => {
+          //添加一个类型
+          x.type = x.url.split(".").at(-1);
+          return x;
+        })
+        .sort((a, b) => {
+          //根据时间排序
+          let dateA = new Date(a.createTime);
+          let dateB = new Date(b.createTime);
+          return dateB - dateA;
+        })
+        .sort((a, b) => {
+          //true的显示最上方
+          if (a.isShow) {
+            return -1;
+          }
+          return 0;
+        });
+    },
+    // 设置为展示简历
+    async setFileFn(row) {
+      const req = {
+        id: row.id,
+      };
+      const res = await this.$u.apiList.UpdateUserFileApi(req);
+      /* uni.showToast({
+        title: "设置成功",
+        duration: 1000,
+      }); */
+      this.$refs.uToast.show({
+        title: "设置成功",
+        type: "success",
+      });
+      setTimeout(() => {
+        this.getListFn();
+      }, 1000);
+    },
+    // 删除
+    deleteFn(row) {
+      uni.showModal({
+        // title: "提示",
+        content: `确定删除此附件？`,
+        success: async (res) => {
+          if (res.confirm) {
+            const req = {
+              id: row.id,
+            };
+            const res = await this.$u.apiList.DelUserFileApi(req);
+            console.log(res, "res--");
+            /* uni.showToast({
+              title: "删除成功",
+              duration: 1000,
+            }); */
+            this.$refs.uToast.show({
+              title: "删除成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              this.getListFn();
+            }, 1000);
+          }
+          if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    // 选择文件
+    selectFn() {
+      // 最多上传5个文件
+      if (this.fileList.length > 4) {
+        /* uni.showToast({
+          icon: "none",
+          title: "最多上传五个附件简历",
+          duration: 2000,
+        }); */
+        this.$refs.uToast.show({
+          title: "最多上传五个附件简历",
+          type: "error",
+        });
+        return;
+      }
+      // this.$refs.uUpload.selectFile();
+      let that = this;
+      const fileType = [
+        ".doc",
+        ".docx",
+        ".jpg",
+        ".png",
+        ".pdf",
+        ".DOC",
+        ".DOCX",
+        ".JPG",
+        ".PNG",
+        ".PDF",
+      ];
+      uni.chooseFile({
+        count: 1,
+        extension: fileType,
+        success(res) {
+          // tempFilePath可以作为img标签的src属性显示图片
+          console.log(res, "res--");
+          // 限制文件类型
+          const someType = res.tempFiles.some((x) => {
+            console.log(x.name.split(".").at(-1));
+            const currentType = x.name.split(".").at(-1);
+            // console.log(currentType, "currentType");
+            return !fileType.includes("." + currentType);
+          });
+          if (someType) {
+           /*  uni.showToast({
+              icon: "none",
+              title: "仅允许选择DOC、DOCX、JPG、PNG、PDF格式文件",
+              duration: 2000,
+            }); */
+            that.$refs.uToast.show({
+              title: "仅允许选择DOC、DOCX、JPG、PNG、PDF格式文件",
+              type: "error",
+            });
+            return;
+          }
+          // 限制文件个数
+          console.log(res.tempFilePaths.length, "res.tempFilePaths.length--");
+          if (res.tempFilePaths.length > 5) {
+            console.log("6666");
+            /* uni.showToast({
+              icon: "none",
+              title: "单次最多选择5个附件",
+              duration: 2000,
+            }); */
+            that.$refs.uToast.show({
+              title: "单次最多选择5个附件",
+              type: "error",
+            });
+            return;
+          }
+          // 限制文件大小
+          const someSize = res.tempFiles.some((x) => x.size > 1024 * 1024 * 20);
+          if (someSize) {
+            /* uni.showToast({
+              icon: "none",
+              title: "仅允许选择20M内大小文件",
+              duration: 2000,
+            }); */
+            that.$refs.uToast.show({
+              title: "仅允许选择20M内大小文件",
+              type: "error",
+            });
+            return;
+          }
+          // return
+          // 上传逻辑
+          that.pathArr = res.tempFilePaths;
+          res.tempFiles.forEach((x, xIndex) => {
+            that.uploadFn(x, xIndex);
+          });
+        },
+      });
+    },
+    // 上传
+    uploadFn(file, index) {
+      uni.showLoading({
+        title: "上传中",
+      });
+      uni.uploadFile({
+        url: this.$u.http.config.imgUrl + this.action,
+        filePath: this.pathArr[index],
+        name: "file",
+        header: this.header,
+        success: (res) => {
+          console.log(res, "res--成功");
+          this.getListFn();
+        },
+        fail: (e) => {
+          console.log("失败");
+          uni.hideLoading();
+        },
+        complete: (res) => {
+          console.log("完成");
+          uni.hideLoading();
+        },
+      });
+    },
+    // 下崽
+    downLoadFn(row) {
+      function stringToBase64(str) {
+        // 将字符串转换为二进制数据
+        var binary = window.atob(str);
+        var len = binary.length;
+        var bytes = new Uint8Array(len);
+        for (var i = 0; i < len; i++) {
+          bytes[i] = binary.charCodeAt(i);
+        }
+
+        // 将二进制数据转换为Base64字符串
+        return window.btoa(String.fromCharCode.apply(null, new Uint8Array(bytes)));
+      }
+      function urlToBase64(url) {
+        // 创建一个 Image 对象
+        var img = new Image();
+        img.crossOrigin = "Anonymous";
+        // 当图像加载完成时执行的函数
+        img.onload = function () {
+          var canvas = document.createElement("canvas");
+          canvas.width = img.width;
+          canvas.height = img.height;
+          var ctx = canvas.getContext("2d");
+          // 将图像绘制到画布上
+          ctx.drawImage(img, 0, 0);
+          // 将画布内容转换为 DataURL（Base64 编码）
+          var base64 = canvas.toDataURL();
+          console.log(base64);
+        };
+        // 设置图像的源
+        img.src = url;
+      }
+      function base64Encode(str) {
+        try {
+          // 对于普通的 ASCII 字符串，直接使用 btoa 函数进行 Base64 编码
+          return btoa(str);
+        } catch (error) {
+          // 处理包含非 ASCII 字符的情况
+          let utf8Str = unescape(encodeURIComponent(str));
+          let binary = "";
+          for (let i = 0; i < utf8Str.length; i++) {
+            binary += String.fromCharCode(utf8Str.charCodeAt(i));
+          }
+          return btoa(binary);
+        }
+      }
+      const downUrl = this.$u.http.config.imgUrl + row.url.slice(1);
+      window.open(
+        "http://sl.vrgon.com:8012/onlinePreview?url=" +
+          encodeURIComponent(base64Encode(downUrl))
+      );
+      return;
+      console.log(downUrl, "downUrl--");
+      const a = document.createElement("a");
+      a.href = downUrl;
+      a.download = row.resumeName;
+      a.click();
+      return;
+      // 下载文件
+      const downloadFile = (url, downName) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open("GET", url, true);
+        xhr.responseType = "blob";
+        xhr.onload = function () {
+          if (this.status === 200) {
+            const a = document.createElement("a");
+            const urlObj = window.URL || window.webkitURL;
+            const blob = new Blob([this.response], {
+              type: this.getResponseHeader("Content-Type"),
+            });
+            const url = urlObj.createObjectURL(blob);
+            a.href = url;
+            a.download = downName;
+            a.click();
+          }
+        };
+        xhr.send();
+      };
+      downloadFile(downUrl, row.resumeName);
+      return;
+      // 下载文件
+      uni.downloadFile({
+        url: downUrl,
+        success: (res) => {
+          if (res.statusCode === 200) {
+            // console.log("下载成功");
+          }
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.isShow {
+  color: #2979ff;
+}
+.title-box {
+  word-break: break-all;
+  display: -webkit-box; /* 使用弹性盒模型 */
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
+// 按钮
+.btn-box {
+  width: 254rpx;
+  height: 92rpx;
+  border-radius: 100rpx;
+  color: white;
+  font-size: 32rpx;
+  margin: 0 auto;
+  background: #3cb5fb;
+  text-align: center;
+  line-height: 90rpx;
+  box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.3);
+}
+.item-box {
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+  // border: 1px solid red;
+  background-color: white;
+  border-bottom: 1px solid #eef0f2;
+  display: flex;
+  position: relative;
+  .show-box {
+    position: absolute;
+    right: 10rpx;
+    top: 5rpx;
+    // transform: translateX(-50%);
+    color: #49cc90;
+    font-size: 20rpx;
+    transform: skewY(10deg);
+    // letter-spacing: 10rpx;
+    animation: breath 4s ease-in-out infinite;
+  }
+  @keyframes breath {
+    0% {
+      opacity: 0.5; /* 初始透明度较低，文字较淡 */
+    }
+    50% {
+      opacity: 1; /* 透明度达到最大，文字完全显示 */
+    }
+    100% {
+      opacity: 0.5; /* 回到初始透明度，文字再次变淡 */
+    }
+  }
+  .item-left {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .item-center {
+    flex: 1;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    color: black;
+    word-break: break-all;
+    .item-date {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 10rpx;
+      font-size: 25rpx;
+      color: #9e9e9e;
+    }
+  }
+  .item-right {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>
diff --git a/pages/my/my/my copy.vue b/pages/my/my/my copy.vue
new file mode 100644
index 0000000..b08cd47
--- /dev/null
+++ b/pages/my/my/my copy.vue	
@@ -0,0 +1,1952 @@
+<template>
+  <view>
+    <view class="flex-col group">
+      <view class="group_1">
+        <view class="flex-col section_1">
+          <view class="flex-col group_2">
+            <view class="flex-col section_2">
+              <!--							<text class="text_1">我的</text>-->
+              <view class="flex-row">
+
+                <view class="flex-col items-center group_3">
+                  <u-avatar :src="$u.http.config.imgUrl+vuex_user.head" class="image_1"></u-avatar>
+                  <!-- 学校认证 -->
+                  <image v-if="vuex_user.isAttestationQY" src="/static/common/img/qiyeicon.png"
+                         class="image_2"/>
+                  <image v-else-if='vuex_user.isAttestationXY' src="/static/common/img/shoolIcon.png"
+                         class="image_2"/>
+                    
+                </view>
+                <view class="flex-col justify-center info">
+                  <view class="flex-row group_4">
+                    <view class="flex-row" style='position:relative;z-index: 999;'>
+                      <text @click="lookFn" class="text_2">{{ vuex_user.userName ||  vuex_user.name}}</text>
+                      <view style="position: absolute;right:0;display:flex;transform: translateX(100%);">
+                        <!-- <view class="flex-col items-center group_6" v-if="vuex_user.isAttestationGLY">
+                          <image src="/static/common/img/adminIcon.png" class="image_3"/>
+                        </view>
+                        <view class="flex-col items-center group_7" v-if="vuex_user.isAttestationJZG">
+                          <image src="/static/common/img/teacherIcon.png" class="image_3"/>
+                        </view> -->
+                    
+                        <view class="role-box" @click="goSelectPage" v-if="[0].includes(vuex_user.userType)">    <image src="/static/common/img/change1.png" class="icon-change"/>学生</view>
+                        <view class="role-box" @click="goSelectPage" v-if="[1].includes(vuex_user.userType)">    <image src="/static/common/img/change1.png" class="icon-change"/>教师</view>
+                      </view>
+                    </view>
+
+                  </view>
+                  <!-- 企业认证 -->
+                  <!-- 设计更新 -->
+                  <text class="text_6" v-if="vuex_user.isAttestationQY&&false">{{ attestation.name }}</text>
+                  <text class="text_6" v-if="false">{{ attestation.schoolName }} {{ attestation.job }}</text>
+                  <text v-if="baseData&&baseData.phone" class="text_6">{{ baseData.phone.slice(0, 3) }}****{{ baseData.phone.slice(7, 11) }}
+                  </text>
+                </view>
+              </view>
+            </view>
+            <!--  待认证-->
+            <!-- <view v-if="!vuex_user.isAttestationGLY && vuex_user.isAttestationXY"
+                  class="flex-col items-center text-wrapper_1" style="opacity: 0.5">
+              <text>成为管理员</text>
+            </view>
+            <view
+                v-if="!vuex_user.isAttestationGLY && vuex_user.isAttestationXY && !vuex_user.isAttestationQY"
+                class="flex-col items-center text-wrapper_1" @click="goGLY">
+              <text>成为管理员</text>
+            </view> -->
+          </view>
+          <!-- 设置  -->
+          <image @click="goset" src="/static/common/img/setingIcon.png" class="image_6"/>
+
+          <view class="flex-row InfoBox">
+            <view class="left" @click="Releasemore(1)">
+              <view class="flex-col items-center">
+                <span class="name">我的发布</span>
+                <b>{{myPublishsNumber}}</b>
+              </view>
+            </view>
+            <view class="right" @click="Releasemore(2)">
+              <view class="flex-col items-center">
+                <span class="name">我的收藏</span>
+                <b>{{myCollectionNumber}}</b>
+              </view>
+            </view>
+          </view>
+        </view>
+        <!--				<image src="/static/common/img/16466166400468141735.png" class="image_7" />-->
+
+      </view>
+
+      <view class="flex-col section_5 "
+            :style="{'margin-top':(vuex_user.isAttestationGLY&&vuex_user.isAttestationJZG)?'0.085rem':'0.0'}">
+        <view class="justify-between group_14">
+          <view class="flex-row group_15">
+            <view class="left-section"></view>
+            <text class="text_22">校友服务</text>
+          </view>
+        </view>
+        <view class="alumniService flex-row">
+          <view class="item" v-if="vuex_user.userType === 0" @click="goPageFn">
+            <view class="icon"><img src="/static/common/img/ServiceIcon1.png"></view>
+            <span class="name">返校预约</span>
+          </view>
+          <view class="item" @click="goWishlist">
+            <view class="icon"><img src="/static/common/img/ServiceIcon2.png"></view>
+            <span class="name">心愿单</span>
+          </view>
+          <view class="item" @click="goAuthentication">
+            <view class="icon"><img src="/static/common/img/ServiceIcon3.png"></view>
+            <span class="name">官方认证</span>
+          </view>
+          <view class="item"  v-if="vuex_user.userType === 0"   @click="goRoute('/pages/my/personalResume/personalResume')">
+            <view class="icon"><img src="/static/common/img/ServiceIcon4.png"></view>
+            <span class="name">个人简历</span>
+          </view>
+        </view>
+      </view>
+
+      <view class="flex-col group_13">
+        <!-- 学校资讯  教职工管理员认证后出现 -->
+        <!-- v-if='vuex_user.isAttestationGLY&&vuex_user.isAttestationJZG' -->
+        <view v-if="GLYTYPE" class="section_5" style='background:#fff;'
+              >
+          <view class="justify-between section_3">
+            <view class="flex-row group_8">
+              <view class="left-section"></view>
+              <text class="text_8">学校资讯</text>
+            </view>
+            <!-- vuex_user.isAttestationGLY&&vuex_user.isAttestationJZG&& -->
+            <text class="text_9" style="margin-right:-30rpx;"
+                  v-if="schoolJournas.length>0"
+                  @click="Releasemore(0)">更多
+            </text>
+          </view>
+          <view class="flex-col section_4" v-if="schoolJournas.length==0">
+            <view class="renzhen">
+              <view class="group_1 flex-col view_3" style="margin: 0.05rem 0;border-radius: 0.05rem;overflow: hidden;">
+                <view class="section_88" style="height: 0.3rem;"></view>
+                <text class="text_17">还没有学校资讯~</text>
+              </view>
+            </view>
+          </view>
+          <!-- v-if="vuex_user.isAttestationXY" -->
+          <view class="flex-col section_4" >
+            <view class="flex-col" >
+              <view class="list-item flex-row" @click="onDetails(item)" :key="i"
+                    v-for="(item, i) in schoolJournas">
+                <image v-if='item.imageUrl&&item.imageUrl!="string"'
+                       :src="$u.http.config.imgUrl + item.imageUrl.split(',')[0]" class="image_8"/>
+                <view class="right-group flex-col" style="border:1px solid transparent;">
+                  <view style="border:1px solid transparent;"
+                      class="text_10">{{ item.title.length > 20 ? item.title.slice(0, 20) + "..." : item.title }}
+                  </view>
+                  <view class="bottom-group justify-between" style="border:1px solid transparent;">
+                    <text>{{ item.userName }}</text>
+                    <text class="text_13">{{ item.creationTime }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+            <!-- v-if="vuex_user.isAttestationGLY && vuex_user.isAttestationJZG" -->
+            <view class="justify-center button" style="margin-top: 0.18rem;"
+                 v-if="vuex_user.userType === 1 && [0,1].includes(this.glyType)"  >
+              <image src="/static/common/img/16466166424139703844.png" class="image_16"/>
+              <text class="text_21" @click="Publishnow(0)">发布最新学校资讯</text>
+            </view>
+          </view>
+        </view>
+
+        <!-- 教育经历 -->
+        <!--  -->
+        <view v-if="[0].includes(vuex_user.userType)"   class="flex-col section_5 edu"
+              :style="{'margin-top':(vuex_user.isAttestationGLY&&vuex_user.isAttestationJZG)?'0.085rem':'0.0',}">
+          <view class="justify-between group_14">
+            <view class="flex-row group_15">
+              <view class="left-section"></view>
+              <text class="text_22">教育经历</text>
+            </view>
+            <text class="text_9" v-if='EdcationList.length>0' @click="Educationsmore">更多</text>
+          </view>
+          <view class="flex-col group_16" v-for="(item,index) in EdcationList" :key="index"
+                :class="{'currentbg':item.isSelected}" @click="currentidx(item,index)">
+            <view class="flex-row group_17">
+              <view class="flex-row">
+                <image :src="$u.http.config.imgUrl+item.schoolLogo.slice(1)" class="image_17"/>
+                <view class="flex-col group_18">
+                  <view class="flex-row">
+                    <text class="text_24">{{ item.schoolName }}</text>
+                    <text class="text_25"
+                          :class="item.certifyStatus==0?'color2':item.certifyStatus==1?'color1':'color3'">
+                      {{ certifyArr[item.certifyStatus] }}
+                    </text>
+                  </view>
+                  <view class="flex-row group_20">
+                    <text>{{ item.startYear }}年入学</text>
+                    <text>{{ item.major }}</text>
+                    <text class="text_28" >{{ item.educationStr }}</text>
+                  </view>
+                </view>
+              </view>
+              <view class="flex-col group_19" :class='{on:item.isSelected}'>
+                <u-icon name="checkbox-mark" :color="'#fff'" size="22"></u-icon>
+              </view>
+            </view>
+            <view class="section_6"></view>
+          </view>
+          <view class="justify-center button" style='margin-top:0.18rem' @click="addEducation">
+            <image src="/static/common/img/16466166424139703844.png" class="image_16"/>
+            <text class="text_21">添加教育经历</text>
+          </view>
+        </view>
+
+        <!-- 任职院校 -->
+       <view v-if="[1].includes(vuex_user.userType)" class="flex-col section_5 teacher"
+        :style="{'margin-top':(vuex_user.isAttestationGLY&&vuex_user.isAttestationJZG)?'0.085rem':'0.0',}">
+          <view class="justify-between group_14">
+            <view class="flex-row group_15">
+              <view class="left-section"></view>
+              <text class="text_22">任职院校</text>
+            </view>
+            <text class="text_9" v-if='EdcationList.length>0' @click="goTeacherList">更多</text>
+          </view>
+          <view class="flex-col group_16" v-for="(item,index) in EdcationList" :key="index"
+                :class="{'currentbg':item.isSelected}" @click="teacherIdx(item,index)">
+            <view class="flex-row group_17">
+              <view class="flex-row">
+                <image :src="$u.http.config.imgUrl+item.logo.slice(1)" class="image_17"/>
+                <view class="flex-col group_18">
+                  <view class="flex-row">
+                    <text class="text_24">{{ item.school }}</text>
+                    <text v-if="item.certifyStatus===0" class="text_25 color3">
+                      {{ statusArr[item.certifyStatus] }}
+                    </text>
+                    <text v-if="item.certifyStatus===1" class="text_25 color1">
+                      {{ statusArr[item.certifyStatus] }}
+                    </text>
+                    <text v-if="item.certifyStatus===2" class="text_25 color2">
+                      {{ statusArr[item.certifyStatus] }}
+                    </text>
+                  </view>
+                  <view class="flex-row group_20">
+                   <text>{{ item.schoolJob }}</text>
+                    <!-- <text>{{ item.startYear }}年入学</text>
+                    <text>{{ item.major }}</text>
+                    <text class="text_28" >{{ item.educationStr }}</text> -->
+                  </view>
+                </view>
+              </view>
+              <view class="flex-col group_19" :class='{on:item.isSelected}'>
+                <u-icon name="checkbox-mark" :color="'#fff'" size="22"></u-icon>
+              </view>
+            </view>
+            <view class="section_6"></view>
+          </view>
+          <view class="justify-center button" style='margin-top:0.18rem' @click="addWorkSchool">
+            <image src="/static/common/img/16466166424139703844.png" class="image_16"/>
+            <text class="text_21">添加任职院校</text>
+          </view>
+        </view>
+
+        <!-- 审核处理 管理员认证出现 -->
+        <!-- v-if="vuex_user.isAttestationXY && vuex_user.isAttestationGLY" -->
+        <view v-if="GLYTYPE" class="flex-col section_7" >
+          <view class="justify-between group_25">
+            <view class="flex-row group_26">
+              <view class="left-section"></view>
+              <text class="text_34">审核处理</text>
+              <text style="margin-left:5px;color:#FF780B;font-weight:700;" v-if="audits.length">{{ audits.length }}</text>
+            </view>
+            <text class="text_9" @click="onExamine">更多</text>
+          </view>
+          <scroll-view scroll-x="true" style="width：100vw">
+            <view class="flex-row equal-division" @click="onExamine" v-if="false">
+              <view class="flex-col equal-division-item" v-for="(item,index) in audits" v-if='index<5'
+                    :key="index">
+                <image :src="$u.http.config.imgUrl + item.head" class="image_20"/>
+                <view class="group_27">
+                  <!-- <text class="text_36">{{item.userName || '暂无' }}<br /></text> -->
+                  <text class="text_37">{{ item.name }}<br/></text>
+                </view>
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+
+        <!-- 我的发布  学历认证后可发布 -->
+        <view class="flex-col section_8" v-if="false"> //新版本ui 隐藏该模块
+          <view class="justify-between group_32">
+            <view class="flex-row group_33">
+              <view class="left-section"></view>
+              <text class="text_46">我的发布</text>
+            </view>
+            <text class="text_47" v-if="myPublist.length>0" @click="Releasemore(1)">更多</text>
+          </view>
+          <view class="renzhen" v-if="!vuex_user.isAttestationXY&&false" @click='torenzheng'>
+            <view class="group_1 flex-col view_3">
+              <view class="section_88"></view>
+              <text class="text_17">完成认证才能发布动态内容~</text>
+              <text class="text_18">去认证 >></text>
+            </view>
+          </view>
+          <view class="renzhen" v-else-if="myPublist.length==0">
+            <view class="group_1 flex-col view_3" style="margin: 0.05rem 0">
+              <view class="section_88" style="height: 0.3rem;"></view>
+              <text class="text_17">还没有发布动态，赶紧去发布吧~</text>
+            </view>
+          </view>
+          <information @clickImg="clickImg" :list="myPublist"
+                       v-if="vuex_user.isAttestationXY&&myPublist.length>0" type="2" route="1">
+          </information>
+          <view class="justify-center button" @click="Publishnow(1)" v-if="vuex_user.isAttestationXY">
+            <image src="/static/common/img/16466166424139703844.png" class="image_16"
+                   v-if="vuex_user.isAttestationXY"/>
+            <text class="text_21">立即发布</text>
+          </view>
+        </view>
+        <!-- 我的收藏  学历认证后 -->
+        <view class="flex-col section_9" v-if="false"> //新版本ui 隐藏该模块
+          <view class="justify-between group_34">
+            <view class="flex-row group_35">
+              <view class="left-section"></view>
+              <text class="text_49">我的收藏</text>
+            </view>
+            <text class="text_9" v-if="myCollect.length>0" @click="Releasemore(2)">更多</text>
+          </view>
+          <view class="renzhen" @click='torenzheng' v-if="!vuex_user.isAttestationXY&&false">
+            <view class="group_1 flex-col view_3">
+              <view class="section_88"></view>
+              <text class="text_17">完成认证才能查看内容~</text>
+              <text class="text_18">去认证 >></text>
+            </view>
+          </view>
+          <view class="renzhen" v-else-if="myCollect.length==0">
+            <view class="group_1 flex-col view_3" style="margin: 0.05rem 0">
+              <view class="section_88" style="height: 0.3rem;"></view>
+              <text class="text_17">还没有收藏~</text>
+            </view>
+          </view>
+          <view class="flex-col group_36" v-if="vuex_user.isAttestationXY">
+            <information @clickImg="clickImg" :list="myCollect" v-if="myCollect.length>0" type="3" route="1"
+                         flag='Collection'>s
+            </information>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- <view class="wenjuan">
+      <a href='https://www.wjx.cn/vm/YzABazN.aspx#'>
+        <image src="/static/common/img/wenjuan.png" mode=""></image>
+      </a>
+    </view> -->
+    <u-tabbar @change="pageChangeFn" :list="vuex_tabbar" :class="{phone:vuex_iPhone}"></u-tabbar>
+    <u-toast ref="uToast"/>
+  </view>
+</template>
+
+<script>
+import information from "../../../components/Information.vue";
+
+export default {
+  components: {
+    information: information,
+  },
+  data() {
+    return {
+      list18z0vPee: [null, null, null, null],
+      list_hdUa8nir: [null, null],
+      curIdx: 0,
+      certifyArr: {
+        0: "未认证",
+        1: "已认证",
+        2: "审核中"
+      },
+      statusArr: {
+        0: "待审核",
+        1: "通过",
+        2: "不通过"
+      },
+      schoolId: "",
+      EdcationList: [],
+      releaseList: [],
+      myPublist: [],
+      myCollect: [],
+      schoolJournas: [],//学校咨询列表
+      attestation: {},
+      baseData: {},
+      audits: [],
+      isonShow: true,
+      myPublishsNumber: 0,
+      myCollectionNumber: 0,
+      glyType:3,
+    };
+  },
+ async onShow() {
+    if (this.isonShow) {
+      this.$u.api.getUser()
+      this.Mypage()
+    }
+    // this.AttestationGLY()
+    // this.MyEducations()
+    // this.myPublishs()
+     this.myPostsFavorites()
+    console.log('%c%s', 'color:red', this.vuex_glyType,'this.vuex_glyType')
+    this.glyType = this.vuex_glyType
+  },
+  onLoad() {
+    // this.Mypage()
+    this.glyType = this.vuex_glyType
+  },
+  created() {
+
+  },
+  methods: {
+    pageChangeFn(e){
+      console.log(e,'e--')
+      if(e===1){
+        uni.$emit('circle')
+      }
+    },
+    lookFn(){
+      console.log(this,'this')
+      console.log(this.vuex_glyType,'this.vuex_glyType')
+      console.log(this.vuex_token,'this.vuex_token')
+    },
+    goSelectPage(){
+      // this.myPostsFavorites();
+      // return
+      uni.navigateTo({
+					url: "/pages/login/roleSelection?source=my",
+				});
+    },
+    // 官方认证
+    goAuthentication() {
+      // 如果是学生 
+      if([0].includes(this.vuex_user.userType)){
+          if(!this.EdcationList.length){
+          return  this.$refs.uToast.show({
+            title: '请先进行教育经历认证',
+            type: 'none',
+            })
+          }
+          const findRow = this.EdcationList.find(x=>x.isSelected === true);
+          // console.log(findRow,'findRow--')
+          if([0,2].includes(findRow.certifyStatus)){
+            return  this.$refs.uToast.show({
+              title: '请先进行教育经历认证',
+              type: 'none',
+            })
+          }
+        
+      }
+      // 如果是教师
+      if([1].includes(this.vuex_user.userType)){
+        // 校验当前学校是否审核通过
+        if(!this.EdcationList.length){
+          return  this.$refs.uToast.show({
+            title: '请先进行任职学校认证',
+            type: 'none',
+            })
+          }
+          const findRow = this.EdcationList.find(x=>x.isSelected === true);
+          if([0,2].includes(findRow.certifyStatus)){
+            return  this.$refs.uToast.show({
+              title: '请先进行任职学校认证',
+              type: 'none',
+            })
+          }
+      }
+      this.$u.route({
+          url: "/pages/my/authentication/authentication",
+          params: {},
+        });
+        return 
+      // if(this.vuex_user.isAttestationXY){
+        // this.$u.route({
+        //   url: "/pages/my/authentication/authentication",
+        //   params: {},
+        // });
+      // }else{
+      //   return  this.$refs.uToast.show({
+      //     title: '请先进行教育经历认证',
+      //     type: 'none',
+      //   })
+      // }
+    },
+    // 获取我的发布|收藏
+   async myPostsFavorites() {
+     // 先获取学校id
+      // const req = {
+      //   userId: this.vuex_user.id,
+      // };
+      // const result = await this.$u.apiList.MyEducations(req);
+      // console.log(result,'result--')
+      // this.schoolId = result.find((x)=>x.isSelected)?.schoolId
+      const result = await this.$u.apiList.GetUserSchool();
+      console.log(result,'result---')
+        // 学生时
+        if([0,2].includes(this.vuex_user.userType)){
+          this.schoolId = result.items.schoolId
+        }
+        // 教师时
+        if(this.vuex_user.userType === 1){
+          this.schoolId = result.jzgItems.schoolId
+        }
+      const data = {
+        userId:this.vuex_user.id,
+        // schoolId:this.vuex_user.schoolId,
+        schoolId:this.schoolId,
+      }
+      
+      this.$u.apiList.Publishs(data).then((res)=>{
+        this.myPublishsNumber = res.total
+      })
+      data.pageIndex=1
+      data.pageSize=999
+      this.$u.apiList.Collection(data).then((res)=>{
+        this.myCollectionNumber = res.length
+      })
+    },
+    // 返校预约
+    goPageFn(){
+      if(!this.EdcationList.length){
+        return  this.$refs.uToast.show({
+          title: '请先进行教育经历认证',
+          type: 'none',
+        })
+      }
+      const findRow = this.EdcationList.find(x=>x.isSelected === true);
+      // console.log(findRow,'findRow--')
+      if([0,2].includes(findRow.certifyStatus)){
+        return  this.$refs.uToast.show({
+          title: '请先进行教育经历认证',
+          type: 'none',
+        })
+      }
+      // 校验
+      this.$u.route({
+        url: "pages/my/BackSchool/BackSchool",
+      });
+    },
+    goset() {
+      this.$u.route({
+        url: "pages/my/mySeting/mySeting",
+        params: {
+          name: "lisa",
+        },
+      });
+    },
+    goWishlist(){
+      // 如果是教师
+      if(this.vuex_user.userType === 1){
+          if(!this.EdcationList.length){
+            return  this.$refs.uToast.show({
+              title: '请先进行任职学校认证',
+              type: 'none',
+            })
+          }
+          const findRow = this.EdcationList.find(x=>x.isSelected === true);
+          // console.log(findRow,'findRow--')
+          if([0,2].includes(findRow.certifyStatus)){
+            return  this.$refs.uToast.show({
+              title: '请先进行任职学校认证',
+              type: 'none',
+            })
+          }
+          this.$u.route({
+          url: "pages/my/wishlist/wishlist",
+          });
+        return
+      }
+      // 其他什么身份的
+      if(!this.EdcationList.length){
+        return  this.$refs.uToast.show({
+          title: '请先进行教育经历认证',
+          type: 'none',
+        })
+      }
+      const findRow = this.EdcationList.find(x=>x.isSelected === true);
+      // console.log(findRow,'findRow--')
+      if([0,2].includes(findRow.certifyStatus)){
+        return  this.$refs.uToast.show({
+          title: '请先进行教育经历认证',
+          type: 'none',
+        })
+      }
+      this.$u.route({
+        url: "pages/my/wishlist/wishlist",
+      });
+    },
+    goRoute(route){
+      this.$u.route({ url: route, });
+    },
+    Mypage(val) {
+      const data = {
+        userId: this.vuex_user.id,
+      }
+      this.$u.apiList.MyPage(data).then((res) => {
+        console.log(JSON.parse(JSON.stringify(res)),'res')
+        // 教育经历列表
+        this.EdcationList = res.edcationList || []
+        // 审核列表
+        this.audits = res.audits || [];
+        // 学校咨询列表
+        this.schoolJournas = res.schoolJournas || [];
+        this.attestation = res.attestation
+        this.baseData = res.baseData
+        if (res.myPublish) {
+          this.myPublist.push(res.myPublish)
+        }
+        console.log(this.schoolJournas,'this.schoolJournas')
+        // 不清楚干嘛的,都是报错,教师身份时打断
+        if(this.vuex_user.userType === 1){
+          return 
+        }
+        let i = this.EdcationList.findIndex((item, index) => {
+          return item.isSelected
+        })
+        let id = this.EdcationList[i].id
+        const data = {
+          userId: this.vuex_user.id,
+          educationId: id
+        }
+        this.myCollect = []
+        this.myPublist = []
+        this.curIdx = i
+        this.getShoolId(data, this.curIdx, 1)
+        if (res.myCollect && res.myCollect.collectId != "00000000-0000-0000-0000-000000000000") {
+          this.myCollect.push(res.myCollect)
+        }
+
+
+
+      })
+    },
+    //管理员认证
+    AttestationGLY() {
+      const data = {
+        userId: this.vuex_user.id,
+      }
+      this.$u.apiList.AttestationGLY(data).then((res) => {
+      })
+    },
+    //添加教育经历
+    addEducation() {
+      this.$u.route({
+        url: "pages/my/AddEducation/AddEducation",
+      });
+    },
+    // 添加任职院校
+    addWorkSchool(){
+      this.$u.route({
+			  url: "/pages/my/certificationDetails/certificationDetails",
+			  params: { id: 2,route: 'my' },
+			});
+    },
+    //选择教育经历
+    currentidx(item, index) {
+      if (item.isSelected) {
+        this.$refs.uToast.show({
+          title: '已选择该学校',
+          type: 'warning',
+        })
+        return
+      }
+      const data = {
+        userId: this.vuex_user.id,
+        educationId: item.id
+      }
+      // if (item.certifyStatus == 0) {
+      // 	this.$refs.uToast.show({
+      // 		title: '该教育经历未认证',
+      // 		type: 'error',
+      // 	})
+      // 	return
+      // }
+      // if (item.certifyStatus == 1) {
+      // 	this.$refs.uToast.show({
+      // 		title: '该教育经历待审核',
+      // 		type: 'error',
+      // 	})
+      // 	return
+      // }
+      // return
+      this.getShoolId(data, index)
+    },
+    // 选择学校
+   async teacherIdx(item){
+      console.log(item,'item--');
+      if (item.isSelected) {
+        this.$refs.uToast.show({
+          title: '已选择该学校',
+          type: 'warning',
+        })
+        return
+      }
+      const req = {
+        userId: this.vuex_user.id,
+        educationId: item.id
+      }
+      const res = await this.$u.apiList.SelectJZGApi(req);
+      console.log(res,'res--选择学校');
+      this.$u.vuex('vuex_token', res.token)
+      this.$u.vuex('vuex_glyType', res.glyType)
+      this.glyType = res.glyType
+      this.$refs.uToast.show({
+            title: '绑定学校成功',
+            type: 'success',
+      })
+      this.$u.vuex('vuex_user', res.user)
+      this.Mypage()
+      this.$u.api.getUser()
+      setTimeout(() => {
+        this.myPostsFavorites()
+      }, 1000)
+    },
+    getShoolId(data, index, type) {
+      this.$u.apiList.SelectEducation(data).then((res) => {
+        console.info("🚀 ~ file:my method: line:496 -----",res )
+
+        this.curIdx = index
+        this.schoolId = res.schoolId
+          console.log('%c%s', 'color:red', res.glyType,'res.glyType');
+        // 更新 vuex_token
+        this.$u.vuex('vuex_token', res.token)
+        this.$u.vuex('vuex_glyType', res.glyType)
+        this.glyType = res.glyType
+        this.$u.vuex('vuex_user', res.user)
+        if (!type) {
+          this.$refs.uToast.show({
+            title: '绑定学校成功',
+            type: 'success',
+          })
+          this.Mypage()
+          this.$u.api.getUser()
+          setTimeout(() => {
+            this.myPostsFavorites()
+          }, 1000)
+        }
+      }).catch((err) => {
+          console.log(err,'err-------')
+            this.$refs.uToast.show({
+              title: err.error,
+              type: 'error',
+            })
+            // this.curIdx = index
+      })
+    },
+    //教育经历更多
+    Educationsmore() {
+      this.$u.route({
+        url: "pages/my/ShoolList/ShoolList"
+      })
+    },
+    //教师任职院校更多
+    goTeacherList(){
+      this.$u.route({
+        url: "pages/my/TeacherList/TeacherList"
+      })
+    },
+    //我的发布更多
+    Releasemore(type) {
+      this.$u.route({
+        url: "pages/my/ReleaseList/ReleaseList",
+        params: {
+          Id: this.schoolId,
+          type: type
+        },
+      })
+    },
+    //立即发布
+    Publishnow(type) {
+      this.$u.route({
+        url: "pages/AlumniCircle/release/release",
+        params: {
+          Id: this.schoolId,
+          type: type
+        },
+      })
+    },
+    //审核 ->更多
+    onExamine() {
+      this.$u.route({
+        url: 'pages/my/examine/examine'
+      })
+    },
+    torenzheng() {
+      if (this.EdcationList.length) {
+        this.$u.route({
+          url: "pages/my/ShoolList/ShoolList"
+        })
+      } else {
+        this.$u.route({
+          url: "pages/my/ShoolList/ShoolList"
+        })
+      }
+    },
+    goGLY() {
+      const data = {
+        schoolId: this.schoolId,
+        type: 1
+      }
+      this.$u.apiList.GetUserApproval(data).then((res) => {
+        this.$u.route({
+          url: "pages/my/certificationDetails/certificationDetails",
+          params: {
+            id: 1,
+            route: 'my'
+          }
+        })
+      })
+          .catch((err) => {
+            this.$refs.uToast.show({
+              title: err.error,
+              type: 'warning',
+            })
+          })
+    },
+    //详情
+    onDetails(item) {
+      // console.log(item,'item--')
+      // return
+      item.mytype = 0
+      item.route = 1
+      this.$u.route({
+        url: 'pages/AlumniCircle/ArticleDetails/ArticleDetails',
+        params: {
+          data: JSON.stringify(item)
+        },
+      })
+    },
+    //预览图片
+    clickImg(item) {
+      this.isonShow = false
+      item = this.$u.http.config.imgUrl + item
+      var images = [];
+      images.push(item);
+      uni.previewImage({ // 图片路径必须是一个数组 => ['']
+        current: 0,
+        urls: images,
+      });
+    }
+  },
+  computed:{
+    GLYTYPE(){
+      // 学生时
+      if([0,2].includes(this.vuex_user.userType)){
+        // 学生管理员
+        if(this.glyType === 2){
+          return  true
+        }
+      }
+      // 教师时
+      if(this.vuex_user.userType === 1){
+        // 教职工管理员 或 校级管理员
+        if([0,1].includes(this.glyType)){
+          return  true
+        }
+      }
+      return false
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .Information .list-item {
+  margin-bottom: 0;
+  padding: 0.15rem 0.05rem 0.05rem;
+}
+.alumniService{
+  // display: flex;
+  // border:1px solid red;
+  .item{
+    // border:1px solid blue;
+    display: flex;
+    flex: 1;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    // justify-items: center;
+  }
+}
+.InfoBox {
+  width: 100%;
+  padding-bottom: .5rem;
+
+  & > view {
+    flex: 1;
+  }
+
+  .name {
+    font-weight: 400;
+    font-size: .14rem;
+    color: #FFFFFF;
+    line-height: .28rem;
+  }
+
+  b {
+    font-size: .28rem;
+    color: #FFFFFF;
+    line-height: .28rem;
+  }
+}
+
+.wenjuan {
+  position: absolute;
+  top: 20%;
+  right: 5%;
+  z-index: 999999;
+
+  a {
+    text-decoration: none;
+    display: inline-block;
+  }
+
+  image {
+    width: 0.5rem;
+    height: 0.5rem;
+  }
+}
+
+.renzhen {
+  .group_1 {
+    position: relative;
+    height: auto !important;
+  }
+
+  .section_88 {
+    background-color: rgb(246, 247, 250);
+    height: 0.53rem;
+  }
+
+  .text_17 {
+    color: rgb(160, 162, 172);
+    font-size: 0.15rem;
+    line-height: 0.14rem;
+    letter-spacing: 0.015rem;
+    white-space: nowrap;
+    position: absolute;
+    left: 0.2rem;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+
+  .text_18 {
+    color: rgb(46, 155, 255);
+    font-size: 0.15rem;
+    line-height: 0.15rem;
+    white-space: nowrap;
+    text-transform: uppercase;
+    position: absolute;
+    right: 0.2rem;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+}
+
+.left-section {
+  background-color: rgb(46, 155, 255);
+  border-radius: 0.015rem;
+  width: 0.03rem;
+  height: 0.15rem;
+  display: none;
+}
+
+.list-item {
+  border-bottom: solid 0.01rem rgba(180, 182, 189, 0.3);
+  // padding: 0.03rem 0.01rem;
+  padding: 0.1rem 0.01rem;
+}
+
+.list-item:last-child {
+  border-bottom: none;
+}
+
+.image_17 {
+  width: 0.45rem;
+  height: 0.45rem;
+  border-radius: 50%;
+  box-shadow: 0 0 1px #6f6f6f;
+}
+
+.image_8 {
+  margin-bottom: 0.015rem;
+  width: 0.9rem;
+  height: 0.6rem;
+}
+
+.right-group {
+  margin-left: 0.085rem;
+  flex: 1 1 auto;
+  position: relative;
+}
+
+.image_20 {
+  border-radius: 50%;
+  width: 0.4rem;
+  height: 0.4rem;
+}
+
+.text_10 {
+  margin-right: 0.07rem;
+  color: rgb(46, 46, 54);
+  font-size: 0.15rem;
+  line-height: 0.18rem;
+}
+
+.bottom-group {
+  margin-top: 0.095rem;
+  color: rgb(184, 184, 184);
+  font-size: 0.12rem;
+  line-height: 0.16rem;
+  white-space: nowrap;
+  // position: absolute;
+  bottom: 0;
+  width: 100%;
+}
+
+.image_27 {
+  width: 1.11rem;
+  height: 1.11rem;
+}
+
+.image_3 {
+  width: 0.2rem;
+  height: 0.21rem;
+}
+.role-box{
+  // height: 0.25rem;
+  // line-height: 0.25rem;
+    .icon-change{
+      // margin-top:0.01rem;
+      width: 0.15rem;
+      height: 0.15rem;
+      transform: translateY(0.02rem);
+      margin-right:0.01rem;
+    }
+  border:1px solid white;
+  color:white;
+  border-radius: 0.05rem;
+  margin-top:0.03rem;
+  padding-left:0.07rem;
+  padding-right:0.07rem;
+  margin-left:0.07rem;
+}
+
+.text_3 {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.text_13 {
+  margin-right: 0.08rem;
+}
+
+.group {
+  flex: 1 1 auto;
+  overflow-y: auto;
+  background: #f6f7fa;
+}
+
+.group_1 {
+  position: relative;
+  height: 2.63rem;
+}
+
+.group_13 {
+  position: relative;
+  border-radius: 0.15rem 0.15rem 0px 0px;
+  background: #f6f7fa;
+}
+
+.image-wrapper {
+  padding: 0.055rem 0 0.49rem;
+  background-color: rgb(255, 255, 255);
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+}
+
+.text-wrapper {
+  padding: 1.17rem 0 0.23rem;
+  color: rgb(255, 255, 255);
+  font-size: 0.14rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+  background-color: rgb(255, 255, 255);
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0.64rem;
+}
+
+.section_1 {
+  //background-color: rgb(46, 155, 255);
+  background-image: url("/static/common/img/mybackimg.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+}
+
+.image_7 {
+  width: 2.62rem;
+  height: 3.15rem;
+  position: absolute;
+  left: -1.28rem;
+  top: 0;
+}
+
+.section_3 {
+  padding: 0.12rem 0.15rem 0.05rem;
+  background-color: rgb(255, 255, 255);
+  box-shadow: 0.0002rem 0.005rem rgba(0, 0, 0, 0.03);
+  border-radius: 0.15rem 0.15rem 0px 0px;
+}
+
+.section_4 {
+  //padding: 0 0.18rem 0.13rem 0.18rem;
+  background-color: rgb(255, 255, 255);
+}
+.edu{
+  // border:1px solid blue;
+}
+.teacher{
+  // border:1px solid red;
+}
+.section_5 {
+  // border:1px solid red;
+  padding: 0.05rem 0.15rem 0.19rem 0.15rem;
+  background-color: rgb(255, 255, 255);
+  box-shadow: 0rem 0.01rem 0.05rem -0.01rem rgba(0,0,0,0.06), 0rem 0.02rem 0.02rem 0rem rgba(0,0,0,0.04), 0rem 0.01rem 0.06rem 0rem rgba(0,0,0,0.02);
+  border-radius: 0.12rem 0.12rem 0.12rem 0.12rem;
+  margin: 0.085rem 0.18rem ;
+  transform: translateY(-0.5rem);
+}
+.section_7 {
+  margin-top: 0.085rem;
+  padding: 0.12rem 0 0.09rem;
+  background-color: rgb(255, 255, 255);
+  box-shadow: 0rem 0.01rem 0.05rem -0.01rem rgba(0,0,0,0.06), 0rem 0.02rem 0.02rem 0rem rgba(0,0,0,0.04), 0rem 0.01rem 0.06rem 0rem rgba(0,0,0,0.02);
+  border-radius: 0.12rem 0.12rem 0.12rem 0.12rem;
+  margin: 0.085rem 0.18rem ;
+  transform: translateY(-0.5rem);
+}
+
+.section_8 {
+  margin-top: 0.08rem;
+  padding: 0px 0.15rem 0.1rem 0.15rem;
+  background-color: rgb(255, 255, 255);
+}
+
+.section_9 {
+  margin-top: 0.095rem;
+  padding: 0 0.15rem 0.1rem 0.15rem;
+  background-color: rgb(255, 255, 255);
+}
+
+.image {
+  width: 3.27rem;
+  height: 0.09rem;
+}
+
+.text {
+  margin-left: 0.78rem;
+}
+
+.group_2 {
+  position: relative;
+}
+
+.image_6 {
+  width: 0.23rem;
+  height: 0.2rem;
+  position: absolute;
+  right: 0.17rem;
+  top: 0.3rem;
+}
+
+.group_8 {
+  margin-bottom: 0.015rem;
+  color: rgb(55, 59, 72);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.text_9 {
+  color: rgb(46, 155, 255);
+  font-size: 0.15rem;
+  line-height: 0.16rem;
+  white-space: nowrap;
+}
+
+.button {
+  // margin-left: 0.12rem;
+  margin-right: 0.02rem;
+  padding: 0.12rem 0 0.085rem;
+  color: rgb(46, 155, 255);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+  background-color: rgba(46, 155, 255, 0.03);
+  border-radius: 0.05rem;
+  border: solid 0.01rem rgb(46, 155, 255);
+}
+
+.group_14 {
+  padding: 0.12rem 0;
+}
+
+.group_16:nth-last-child(2) {
+
+  // margin-top: 0.26rem;
+  .section_6 {
+    box-shadow: none;
+  }
+}
+
+.group_21 {
+  margin-top: 0.21rem;
+  padding: 0 0.03rem;
+}
+
+.group_25 {
+  padding-left: 0.2rem;
+  padding-right: 0.13rem;
+}
+
+.equal-division {
+  margin-top: 0.1rem;
+  padding-left: 0.06rem;
+}
+
+.group_32 {
+  padding: 0.12rem 0;
+}
+
+.button_1 {
+  margin: 0.23rem 0.12rem 0 0.055rem;
+  padding: 0.13rem 0 0.095rem;
+  color: rgb(46, 155, 255);
+  font-size: 0.15rem;
+  line-height: 0.16rem;
+  white-space: nowrap;
+  background-color: rgba(46, 155, 255, 0.03);
+  border-radius: 0.1rem;
+  border: solid 0.01rem rgb(46, 155, 255);
+}
+
+.section_2 {
+  padding: 0.53rem 0.23rem 0.19rem;
+  //background-image: url("~@/static/common/img/16466166399439803895.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+
+.text-wrapper_1 {
+  padding: 0.03rem 0;
+  color: rgb(255, 255, 255);
+  font-size: 0.11rem;
+  line-height: 0.16rem;
+  white-space: nowrap;
+  background-color: rgba(0, 0, 0, 0.1);
+  border-radius: 0.11rem;
+  width: 0.77rem;
+  position: absolute;
+  right: 0.2rem;
+  top: 0.83rem;
+}
+
+.text_8 {
+  margin-left: -0.07rem;
+  line-height: 1;
+}
+
+
+.image_16 {
+  width: 0.17rem;
+  height: 0.17rem;
+}
+
+.text_21 {
+  margin: 0.015rem 0 0.02rem 0.055rem;
+}
+
+.group_15 {
+  color: rgb(55, 59, 72);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.section_6 {
+  margin-left: 0.015rem;
+  margin-right: 0.04rem;
+  box-shadow: 0.0002rem 0.005rem rgba(0, 0, 0, 0.11);
+  border-radius: 0.15rem 0.15rem 0px 0px;
+  height: 1px;
+
+}
+
+.group_22 {
+  margin: 0.035rem 0 0.04rem 0.095rem;
+  flex: 1 1 auto;
+}
+
+.group_26 {
+  margin-bottom: 0.02rem;
+  color: rgb(55, 59, 72);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.equal-division-item {
+  padding: 0 0.095rem 0.015rem 0.11rem;
+  width: 20%;
+  text-align: center;
+  align-items: center;
+}
+
+.equal-division-item_1 {
+  padding: 0 0.095rem 0.015rem;
+  flex: 1 1 0.74rem;
+}
+
+.equal-division-item_2 {
+  padding-left: 0.1rem;
+  padding-right: 0.1rem;
+  flex: 1 1 0.74rem;
+}
+
+.equal-division-item_3 {
+  padding: 0 0.065rem 0.01rem 0.14rem;
+  flex: 1 1 0.74rem;
+}
+
+.equal-division-item_4 {
+  padding: 0 0.1rem 0.015rem 0.11rem;
+  flex: 1 1 0.74rem;
+}
+
+.group_33 {
+  color: rgb(55, 59, 72);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.text_47 {
+  color: rgb(46, 155, 255);
+  font-size: 0.15rem;
+  line-height: 1;
+  white-space: nowrap;
+}
+
+.group_34 {
+  padding: 0.12rem 0;
+
+  .group_35 {
+    color: rgb(55, 59, 72);
+    font-size: 0.15rem;
+    line-height: 0.14rem;
+    white-space: nowrap;
+  }
+}
+
+.text_50 {
+  color: rgb(46, 155, 255);
+  font-size: 0.15rem;
+  line-height: 0.16rem;
+  white-space: nowrap;
+}
+
+.group_37 {
+  padding: 0 0.2rem;
+}
+
+.text_53 {
+  margin-left: 0.2rem;
+  margin-top: 0.17rem;
+  color: rgb(55, 59, 72);
+  font-size: 0.18rem;
+  line-height: 0.17rem;
+  white-space: nowrap;
+}
+
+.text_54 {
+  margin: 0.12rem 0.13rem 0 0.2rem;
+  color: rgb(73, 76, 87);
+  font-size: 0.15rem;
+  line-height: 0.24rem;
+}
+
+.equal-division_1 {
+  margin-top: 0.03rem;
+  padding: 0 0.13rem;
+  color: rgb(180, 182, 189);
+  font-size: 0.14rem;
+  line-height: 0.11rem;
+  white-space: nowrap;
+}
+
+.text_1 {
+  align-self: center;
+  color: rgb(255, 255, 255);
+  font-size: 0.18rem;
+  line-height: 0.16rem;
+  white-space: nowrap;
+}
+
+.group_3 {
+  //margin-top: 0.2rem;
+  align-self: center;
+  width: 0.52rem;
+  position: relative;
+
+}
+
+.info {
+  padding: 0.13rem;
+}
+
+.group_4 {
+  //margin-top: 0.1rem;
+  //align-self: center;
+  // transform: translateX(0.27rem);
+}
+
+.text_6 {
+  margin-top: 0.07rem;
+  color: rgb(255, 255, 255);
+  font-size: 0.14rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+  position: relative;
+  z-index: 5;
+}
+
+.text_22 {
+  margin-left: 0.065rem;
+  line-height: 1;
+}
+
+.group_17 {
+  // margin: 0.035rem 0 0.04rem 0.095rem;
+  justify-content: space-between;
+  padding: 0.1rem;
+  position: relative;
+}
+
+.group_18 {
+  margin: 0.035rem 0 0rem 0.095rem;
+  width: 59vw
+}
+
+.group_18 > view:first-child {
+  justify-content: space-between;
+}
+
+.group_19 {
+  position: absolute;
+  right: 0;
+  top: 0;
+  display: none;
+
+}
+
+.group_19.on .u-icon {
+  position: absolute;
+  left: 67%;
+  top: 33%;
+  transform: translate(-50%, -50%)
+}
+
+.group_19.on::before {
+  content: '';
+  display: block;
+  border: 15px solid #71d271;
+  border-left-color: transparent;
+  border-bottom-color: transparent;
+}
+
+.group_24 {
+  margin-top: 0.09rem;
+  color: rgb(55, 59, 72);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.text_34 {
+  //margin-left: 0.065rem;
+}
+
+.group_27 {
+  margin-top: 0.07rem;
+}
+
+.image_22 {
+  margin-left: 0.025rem;
+}
+
+.group_28 {
+  margin-right: 0.02rem;
+  margin-top: 0.07rem;
+}
+
+.image_23 {
+  margin-left: 0.02rem;
+}
+
+.group_29 {
+  margin-top: 0.07rem;
+}
+
+.group_30 {
+  margin-top: 0.07rem;
+}
+
+.image_25 {
+  align-self: center;
+}
+
+.group_31 {
+  margin-top: 0.07rem;
+}
+
+.text_46 {
+  margin-left: 0.065rem;
+}
+
+.text_49 {
+  margin-left: 0.07rem;
+  line-height: 1;
+}
+
+.image_26 {
+  margin-bottom: 0.015rem;
+  width: 0.3rem;
+  height: 0.3rem;
+}
+
+.group_38 {
+  margin-left: 0.065rem;
+  margin-top: 0.02rem;
+  flex: 1 1 auto;
+}
+
+.equal-division-item_5 {
+  padding: 0.05rem 0 0.03rem 0.07rem;
+  flex: 1 1 1.17rem;
+}
+
+.equal-division-item_6 {
+  padding: 0.05rem 0 0.035rem 0.07rem;
+  flex: 1 1 1.17rem;
+}
+
+.equal-division-item_7 {
+  padding: 0.05rem 0 0.035rem 0.06rem;
+  flex: 1 1 1.17rem;
+}
+
+.image_1 {
+  width: 0.54rem !important;
+  height: 0.54rem !important;
+  border-radius: 50%;
+  flex: 0 0 0.54rem !important;
+}
+
+.image_2 {
+  width: 0.22rem;
+  height: 0.22rem;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
+
+.group_7 {
+  margin-left: 0.045rem;
+  color: rgb(255, 255, 255);
+  font-size: 0.12rem;
+  line-height: 0.12rem;
+  white-space: nowrap;
+  width: 0.22rem;
+  position: relative;
+}
+
+.group_20 {
+  margin-top: 0.12rem;
+  color: #8d8e90;
+  font-size: 0.12rem;
+  line-height: 1;
+  white-space: nowrap;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis !important;
+    max-width: 450rpx;
+    // padding-right: 20rpx;
+    // box-sizing: border-box;
+    // border: 1px solid red;
+}
+
+.text_29 {
+  color: rgb(55, 59, 72);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.text_30 {
+  margin-left: 0.12rem;
+  color: rgb(21, 195, 73);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.text_32 {
+  margin-left: 0.06rem;
+}
+
+.text_33 {
+  margin-left: 0.035rem;
+}
+
+.text_36 {
+  color: rgb(2, 2, 2);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+  white-space: nowrap;
+}
+
+.text_37 {
+  color: rgb(133, 135, 141);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_38 {
+  color: rgb(2, 2, 2);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_39 {
+  color: rgb(133, 135, 141);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_40 {
+  color: rgb(2, 2, 2);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_41 {
+  color: rgb(133, 135, 141);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_42 {
+  color: rgb(2, 2, 2);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_43 {
+  color: rgb(133, 135, 141);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_44 {
+  color: rgb(2, 2, 2);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_45 {
+  color: rgb(133, 135, 141);
+  font-size: 0.15rem;
+  line-height: 0.22rem;
+  letter-spacing: 0.015rem;
+}
+
+.text_51 {
+  color: rgb(2, 2, 2);
+  font-size: 0.14rem;
+  line-height: 0.13rem;
+  white-space: nowrap;
+}
+
+.text_52 {
+  margin-top: 0.055rem;
+  color: rgb(184, 184, 184);
+  font-size: 0.12rem;
+  line-height: 0.12rem;
+  white-space: nowrap;
+}
+
+.group_39 {
+  margin-top: 0.18rem;
+}
+
+.group_40 {
+  margin-top: 0.19rem;
+  padding: 0 0.23rem;
+}
+
+.group_41 {
+  margin-top: 0.19rem;
+  padding: 0 0.21rem;
+}
+
+.text_2 {
+  margin: 0.025rem 0 0.02rem;
+  color: rgb(255, 255, 255);
+  font-size: 0.18rem;
+  line-height: 0.17rem;
+  white-space: nowrap;
+}
+
+.group_6 {
+  color: rgb(255, 255, 255);
+  font-size: 0.12rem;
+  line-height: 0.12rem;
+  white-space: nowrap;
+  width: 0.21rem;
+  position: relative;
+  margin-left: 0.1rem;
+}
+
+.text_24 {
+  color: rgb(55, 59, 72);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.text_25 {
+  margin-left: 0.04rem;
+  font-size: 0.1rem;
+  line-height: 0.14rem;
+  white-space: nowrap;
+}
+
+.color1 {
+  color: rgb(21, 195, 73);
+}
+
+.color2 {
+  color: red;
+}
+
+.color3 {
+  color: #FF9900;
+}
+
+.text_27 {
+  margin-left: 0.06rem;
+}
+
+.text_28 {
+  margin-left: 0.035rem;
+}
+
+.image_29 {
+  width: 0.22rem;
+  height: 0.21rem;
+}
+
+.text_55 {
+  margin-left: 0.08rem;
+  align-self: center;
+}
+
+.image_31 {
+  margin-left: 0.06rem;
+  width: 0.18rem;
+  height: 0.2rem;
+}
+
+.text_56 {
+  align-self: center;
+}
+
+.image_33 {
+  margin-left: 0.095rem;
+  width: 0.2rem;
+  height: 0.2rem;
+}
+
+.text_57 {
+  align-self: center;
+}
+
+.currentbg {
+  background-color: #F6F7FA;
+  border-radius: 15px;
+  overflow: hidden;
+}
+
+.xyList {
+  .list {
+    margin-top: 0.055rem;
+    padding-bottom: 0.06rem;
+
+    .list-item_1 {
+      padding: 0.19rem 0 0.07rem;
+      background-color: rgb(255, 255, 255);
+      margin-bottom: 0.1rem;
+
+      .group_11 {
+        padding: 0 0.16rem;
+
+        .image_9 {
+          margin-bottom: 0.015rem;
+          width: 0.3rem;
+          height: 0.3rem;
+        }
+
+        .group_23 {
+          margin-left: 0.065rem;
+          margin-top: 0.02rem;
+          flex: 1 1 auto;
+
+          .text_10 {
+            color: rgb(2, 2, 2);
+            font-size: 0.14rem;
+            line-height: 0.13rem;
+          }
+
+          .text_11 {
+            margin-top: 0.055rem;
+            color: rgb(184, 184, 184);
+            font-size: 0.12rem;
+            line-height: 0.12rem;
+          }
+        }
+      }
+
+      .text_12 {
+        margin-top: 0.17rem;
+        align-self: center;
+        color: rgb(55, 59, 72);
+        font-size: 0.18rem;
+        line-height: 0.17rem;
+      }
+
+      .text_13 {
+        margin: 0.12rem 0.15rem 0 0.17rem;
+        color: rgb(73, 76, 87);
+        font-size: 0.15rem;
+        line-height: 0.24rem;
+      }
+
+      .equal-division {
+        margin-top: 0.035rem;
+        padding: 0.05rem 0.15rem;
+
+        .tool {
+          margin-top: 0.3rem;
+
+          .group_8 {
+            padding-left: 0.26rem;
+            padding-right: 0.24rem;
+            flex: 1 1 1.11rem;
+
+            .image_12 {
+              width: 0.22rem;
+              height: 0.21rem;
+            }
+
+            .text_17 {
+              margin-left: 0.08rem;
+              align-self: center;
+              color: rgb(180, 182, 189);
+              font-size: 0.14rem;
+              line-height: 0.11rem;
+            }
+          }
+
+          .group_9 {
+            margin-left: 0.055rem;
+            padding: 0 0.24rem;
+            flex: 1 1 1.11rem;
+
+            .image_14 {
+              width: 0.18rem;
+              height: 0.2rem;
+            }
+
+            .text_18 {
+              margin-left: 0.08rem;
+              align-self: center;
+              color: rgb(180, 182, 189);
+              font-size: 0.14rem;
+              line-height: 0.11rem;
+            }
+          }
+
+          .group_10 {
+            margin-left: 0.05rem;
+            padding: 0 0.23rem;
+            flex: 1 1 1.11rem;
+            width: 1.12rem;
+
+            .image_16 {
+              margin-left: 0.07rem;
+              width: 0.2rem;
+              height: 0.2rem;
+            }
+
+            .text_19 {
+              align-self: center;
+              color: rgb(180, 182, 189);
+              font-size: 0.14rem;
+              line-height: 0.11rem;
+            }
+          }
+        }
+
+        .image_10 {
+          flex: 1 1 1.11rem;
+          width: 1.11rem;
+          height: 1.11rem;
+        }
+
+        .image_13 {
+          margin-left: 0.055rem;
+        }
+
+        .image_15 {
+          margin-left: 0.05rem;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/my/my/my.vue b/pages/my/my/my.vue
new file mode 100644
index 0000000..032d3e9
--- /dev/null
+++ b/pages/my/my/my.vue
@@ -0,0 +1,1072 @@
+<template>
+  <view>
+    <view class="top-box">
+      <view class="page-title">我的</view>
+      <view class="name-info">
+        <view class="name">
+          <view class="avatar"> <u-avatar :src="$u.http.config.imgUrl + vuex_user.head" class="avatar-img"></u-avatar>
+          </view>
+          <view class="name-phone">
+            <view class="user-name"><text>{{ vuex_user.userName || vuex_user.name }}</text>
+              <view class="role-box" @click="goSelectPage" v-if="[0, 2].includes(vuex_user.userType)">学生</view>
+              <view class="role-box" @click="goSelectPage" v-if="[1].includes(vuex_user.userType)">教师</view>
+            </view>
+            <text class="text-phone">{{ hidePhoneNumber(baseData.phone) }}</text>
+          </view>
+        </view>
+        <image class="right-arrow" src="/static/common/img/right-arrow.png" @click="goMyHome"></image>
+        <view class="my-setting" @click="goset"></view>
+        <view class="top-bg"></view>
+      </view>
+      <view class="school-info">
+        <text>{{ EdcationList.length ? EdcationList[curIdx].schoolName || EdcationList[curIdx].school : "暂无学校" }}</text>
+        <image class="school-type" @click="goAuthFn" v-if="EdcationList[curIdx]"
+          :src="EdcationList[curIdx].certifyStatus == 1 ? authenticated : unAuthenticated"></image>
+      </view>
+    </view>
+    <!-- <view class="user-like">
+      <view class="likes" v-for="(item, index) in userlikes" :key="index">
+        <text class="like-num">{{ item.num }}</text>
+        <text class="like-name">{{ item.name }}</text>
+      </view>
+    </view> -->
+    <view class="my-released">
+      <text class="my-released-title">我的发布</text>
+      <view class="released-list">
+        <view class="my-released-item" v-for="(item, index) in releaseList" :key="index"
+          @click="Releasemore(item.route)">
+          <image class="released-icon" :src="item.icon"></image>
+          <text class="released-name">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="my-released">
+      <text class="my-released-title">常用工具</text>
+      <view class="released-list">
+        <view class="my-released-item" v-for="(item, index) in toolList" :key="index" @click="toolsMore(item.route)">
+          <image class="released-icon" :src="item.icon"></image>
+          <text class="released-name">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="my-released">
+      <text class="my-released-title">校友服务</text>
+      <view class="released-list">
+        <view class="my-released-item" v-for="(item, index) in serviceList" :key="index"
+          @click="serviceMore(item.route)">
+          <image class="released-icon" :src="item.icon"></image>
+          <text class="released-name">{{ item.name }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="bottom"></view>
+
+    <u-tabbar @change="pageChangeFn" :list="vuex_tabbar" :class="{ phone: vuex_iPhone }"
+      :active-color="vuex_tabbar_config.activeColor" :inactive-color="vuex_tabbar_config.inactiveColor"></u-tabbar>
+    <u-toast ref="uToast" />
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+  </view>
+</template>
+
+<script>
+import information from "../../../components/Information.vue";
+import authenticated from "@/static/common/img/my/authenticated.png";
+import unAuthenticated from "@/static/common/img/my/unauthenticated.png";
+
+export default {
+  components: {
+    information: information,
+  },
+  data() {
+    return {
+      authenticated: authenticated,
+      unAuthenticated: unAuthenticated,
+      list18z0vPee: [null, null, null, null],
+      list_hdUa8nir: [null, null],
+      curIdx: 0,
+      certifyArr: {
+        0: "未认证",
+        1: "已认证",
+        2: "审核中",
+      },
+      statusArr: {
+        0: "待审核",
+        1: "通过",
+        2: "不通过",
+      },
+      schoolId: "",
+      EdcationList: [],
+      releaseList: [],
+      myPublist: [],
+      myCollect: [],
+      schoolJournas: [], //学校咨询列表
+      attestation: {},
+      baseData: {},
+      audits: [],
+      isonShow: true,
+      myPublishsNumber: 0,
+      myCollectionNumber: 0,
+      glyType: 3,
+      userlikes: [
+        {
+          num: 200,
+          name: "获赞",
+        },
+        {
+          num: 200,
+          name: "粉丝",
+        },
+        {
+          num: 200,
+          name: "关注",
+        },
+      ],
+      // 我的发布
+      releaseList: [
+        {
+          name: "我的发布",
+          icon: "/static/common/img/my/my-publish.png",
+          route: 1,
+        },
+        {
+          name: "我的收藏",
+          icon: "/static/common/img/my/my-collection.png",
+          route: 2,
+        },
+        {
+          name: "草稿箱",
+          icon: "/static/common/img/my/my-draft-box.png",
+          route: "",
+        },
+        {
+          name: "浏览历史",
+          icon: "/static/common/img/my/my-history.png",
+          route: "",
+        },
+      ],
+      //常用工具
+      toolList: [
+      ],
+      // 校友服务
+      serviceList: [
+        {
+          name: "企业认证",
+          icon: "/static/common/img/my/my-enterprises.png",
+          route: 1,
+        },
+        {
+          name: "成为管理员",
+          icon: "/static/common/img/my/my-admin.png",
+          route: 2,
+        },
+        {
+          name: "身份认证",
+          icon: "/static/common/img/my/my-identity.png",
+          route: "",
+        },
+      ],
+    };
+  },
+  async onShow() {
+    if (this.isonShow) {
+      this.$u.api.getUser();
+    }
+    this.Mypage();
+    // this.AttestationGLY()
+    // this.MyEducations()
+    // this.myPublishs()
+    this.myPostsFavorites();
+    console.log("%c%s", "color:red", this.vuex_glyType, "this.vuex_glyType");
+    this.glyType = this.vuex_glyType;
+  },
+  onLoad() {
+    // this.Mypage()
+    this.glyType = this.vuex_glyType;
+  },
+  created() { },
+  methods: {
+    pageChangeFn(e) {
+      console.log(e, "e--");
+      if (e === 1) {
+        uni.$emit("circle");
+      }
+    },
+    lookFn() {
+      console.log(this, "this");
+      console.log(this.vuex_glyType, "this.vuex_glyType");
+      console.log(this.vuex_token, "this.vuex_token");
+    },
+    goSelectPage() {
+      // this.myPostsFavorites();
+      // return
+      uni.navigateTo({
+        url: "/pages/login/roleSelection?source=my",
+      });
+    },
+    // 企业认证
+    goAuthentication() {
+      // 如果是学生
+      if ([0].includes(this.vuex_user.userType)) {
+        if (!this.EdcationList.length) {
+          // return this.$tips("请先进行教育经历认证","warning");
+
+
+        }
+        const findRow = this.EdcationList.find((x) => x.isSelected === true);
+        if (!findRow) {
+          // return this.$tips("请先绑定学校","warning");
+          return this.$refs.uToast.show({
+            title: "请先绑定学校",
+            type: "warning",
+          });
+        }
+        console.log(findRow, this.EdcationList, 'findRow--')
+        if ([0, 2].includes(findRow.certifyStatus)) {
+          // return this.$tips("请先进行教育经历认证","warning");
+          return this.$refs.uToast.show({
+            title: "请先进行教育经历认证",
+            type: "warning",
+          });
+        }
+      }
+      // 如果是教师
+      if ([1].includes(this.vuex_user.userType)) {
+        // 校验当前学校是否审核通过
+        if (!this.EdcationList.length) {
+          // return this.$tips("请先进行任职学校认证","warning");
+          return this.$refs.uToast.show({
+            title: "请先进行任职学校认证",
+            type: "warning",
+          });
+        }
+        const findRow = this.EdcationList.find((x) => x.isSelected === true);
+        if (!findRow) {
+          // return this.$tips("请先绑定学校","warning");
+          return this.$refs.uToast.show({
+            title: "请先绑定学校",
+            type: "warning",
+          });
+        }
+        if ([0, 2].includes(findRow.certifyStatus)) {
+          // return this.$tips("请先进行任职学校认证","warning");
+          return this.$refs.uToast.show({
+            title: "请先进行任职学校认证",
+            type: "warning",
+          });
+        }
+      }
+      const data = {
+        userId: this.vuex_user.id,
+      }
+      this.$u.apiList.AttestationQY(data).then((res) => {
+        console.log(res, "res---企业认证成功");
+        if (res.state === 1) {
+          this.$refs.uToast.show({
+            title: "企业认证已通过，无需再次认证",
+            type: "success",
+          });
+        } else if (res.state === 0) {
+          this.$refs.uToast.show({
+            title: "企业认证审核中，请等待",
+            type: "error",
+          });
+          // this.$tips("企业认证失败","error");
+
+        } else {
+          this.$u.route({
+            url: "pages/my/certificationDetails/certificationDetails",
+            params: {
+              id: 0,
+              route: 'my'
+            }
+          })
+        }
+
+      })
+        .catch((err) => {
+          this.$refs.uToast.show({
+            title: err.error,
+            type: 'warning',
+          })
+        })
+
+
+
+    },
+    // 前往学校认证页面
+    goAuthFn() {
+
+      if (this.EdcationList[this.curIdx].certifyStatus == 1) {
+        return this.$refs.uToast.show({
+          title: "已认证",
+          type: "warning",
+        });
+        // return this.$tips("已认证","warning");
+      } else if (this.EdcationList[this.curIdx].certifyStatus == 0) {
+        if (this.vuex_user.userType === 1) {
+          return this.$refs.uToast.show({
+            title: "审核中，请等待",
+            type: "warning",
+          });
+        } else {
+          this.$u.route({
+            url: 'pages/my/shoolAuthentication/shoolAuthentication',
+            params: {
+              educationId: this.EdcationList[this.curIdx].id
+            },
+          })
+        }
+      }else{
+        return this.$refs.uToast.show({
+            title: "审核中，请等待",
+            type: "warning",
+          });
+      }
+
+    },
+    // 获取我的发布|收藏
+    async myPostsFavorites() {
+      // 先获取学校id
+      // const req = {
+      //   userId: this.vuex_user.id,
+      // };
+      // const result = await this.$u.apiList.MyEducations(req);
+      // console.log(result,'result--')
+      // this.schoolId = result.find((x)=>x.isSelected)?.schoolId
+      const result = await this.$u.apiList.GetUserSchool();
+      console.log(result, "result---");
+      // 学生时
+      if ([0, 2].includes(this.vuex_user.userType)) {
+        this.schoolId = result.items.schoolId;
+      }
+      // 教师时
+      if (this.vuex_user.userType === 1) {
+        this.schoolId = result.jzgItems.schoolId;
+      }
+      const data = {
+        userId: this.vuex_user.id,
+        // schoolId:this.vuex_user.schoolId,
+        schoolId: this.schoolId,
+      };
+
+      this.$u.apiList.Publishs(data).then((res) => {
+        this.myPublishsNumber = res.total;
+      });
+      data.pageIndex = 1;
+      data.pageSize = 999;
+      this.$u.apiList.Collection(data).then((res) => {
+        this.myCollectionNumber = res.length;
+      });
+    },
+    // 返校预约
+    goPageFn() {
+      if (!this.EdcationList.length) {
+        return this.$refs.uToast.show({
+          title: "请先进行教育经历认证",
+          type: "warning",
+        });
+        // return this.$tips("请先进行教育经历认证","warning");
+      }
+      const findRow = this.EdcationList.find((x) => x.isSelected === true);
+      // console.log(findRow,'findRow--')
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "请先进行教育经历认证",
+          type: "warning",
+        });
+        // return this.$tips("请先进行教育经历认证","warning");
+
+      }
+      // 校验
+      this.$u.route({
+        url: "pages/my/BackSchool/BackSchool",
+      });
+    },
+    goset() {
+      this.$u.route({
+        url: "pages/my/mySeting/mySeting",
+        params: {
+          name: "lisa",
+        },
+      });
+    },
+    goWishlist() {
+      // 如果是教师
+      if (this.vuex_user.userType === 1) {
+        if (!this.EdcationList.length) {
+          return this.$refs.uToast.show({
+            title: "请先进行任职学校认证",
+            type: "warning",
+          });
+          // return this.$tips("请先进行任职学校认证","warning");
+
+        }
+        const findRow = this.EdcationList.find((x) => x.isSelected === true);
+        // console.log(findRow,'findRow--')
+        if ([0, 2].includes(findRow.certifyStatus)) {
+          return this.$refs.uToast.show({
+            title: "请先进行任职学校认证",
+            type: "warning",
+          });
+          // return this.$tips("请先进行任职学校认证","warning");
+
+        }
+        this.$u.route({
+          url: "pages/my/wishlist/wishlist",
+        });
+        return;
+      }
+      // 其他什么身份的
+      if (!this.EdcationList.length) {
+        return this.$refs.uToast.show({
+          title: "请先进行教育经历认证",
+          type: "warning",
+        });
+        // return this.$tips("请先进行教育经历认证","warning");
+
+      }
+      const findRow = this.EdcationList.find((x) => x.isSelected === true);
+      // console.log(findRow,'findRow--')
+      if ([0, 2].includes(findRow.certifyStatus)) {
+        return this.$refs.uToast.show({
+          title: "请先进行教育经历认证",
+          type: "warning",
+        });
+        // return this.$tips("请先进行教育经历认证","warning");
+
+      }
+      this.$u.route({
+        url: "pages/my/wishlist/wishlist",
+      });
+    },
+    goRoute(route) {
+      this.$u.route({ url: route });
+    },
+    Mypage(val) {
+      const data = {
+        userId: this.vuex_user.id,
+      };
+      this.$u.apiList.MyPage(data).then((res) => {
+        console.log(JSON.parse(JSON.stringify(res)), "res");
+        // 教育经历列表
+        this.EdcationList = res.edcationList || [];
+        // 审核列表
+        this.audits = res.audits || [];
+        // 学校咨询列表
+        this.schoolJournas = res.schoolJournas || [];
+        this.attestation = res.attestation;
+        this.baseData = res.baseData;
+        if (res.myPublish) {
+          this.myPublist.push(res.myPublish);
+        }
+        console.log(this.schoolJournas, "this.schoolJournas");
+
+        // 不清楚干嘛的,都是报错,教师身份时打断
+        if (this.vuex_user.userType === 1) {
+          // 教师身份时 只有一个心愿单
+          this.toolList = [
+            {
+              name: "任职院校",
+              icon: "/static/common/img/my/my-education.png",
+              route: 5,
+            },
+            {
+              name: "心愿单",
+              icon: "/static/common/img/my/my-wish.png",
+              route: 4,
+            },
+          ]
+          let i = this.EdcationList.findIndex((item, index) => {
+            return item.isSelected;
+          });
+          let id = this.EdcationList[i].id;
+          const data = {
+            userId: this.vuex_user.id,
+            educationId: id,
+          };
+          this.curIdx = i;
+          this.teacherChange(data, this.curIdx, 1)
+          return
+        } else if ([0].includes(this.vuex_user.userType)) {
+          // 学生身份时
+          this.toolList = [
+            {
+              name: "教育经历",
+              icon: "/static/common/img/my/my-education.png",
+              route: 1,
+            },
+            {
+              name: "个人简历",
+              icon: "/static/common/img/my/my-resume.png",
+              route: 2,
+            },
+            {
+              name: "心愿单",
+              icon: "/static/common/img/my/my-wish.png",
+              route: 4,
+            },
+          ]
+        } else if ([2].includes(this.vuex_user.userType)) {
+          // 毕业生身份时
+          this.toolList = [
+            {
+              name: "教育经历",
+              icon: "/static/common/img/my/my-education.png",
+              route: 1,
+            },
+            {
+              name: "个人简历",
+              icon: "/static/common/img/my/my-resume.png",
+              route: 2,
+            },
+            {
+              name: "返校预约",
+              icon: "/static/common/img/my/my-return-school.png",
+              route: 3,
+            },
+            {
+              name: "心愿单",
+              icon: "/static/common/img/my/my-wish.png",
+              route: 4,
+            },
+          ]
+        }
+
+
+
+        let i = this.EdcationList.findIndex((item, index) => {
+          return item.isSelected;
+        });
+        let id = this.EdcationList[i].id;
+        const data = {
+          userId: this.vuex_user.id,
+          educationId: id,
+        };
+        this.myCollect = [];
+        this.myPublist = [];
+        this.curIdx = i;
+        this.getShoolId(data, this.curIdx, 1);
+        if (
+          res.myCollect &&
+          res.myCollect.collectId != "00000000-0000-0000-0000-000000000000"
+        ) {
+          this.myCollect.push(res.myCollect);
+        }
+      });
+    },
+    //管理员认证
+    AttestationGLY() {
+      const data = {
+        userId: this.vuex_user.id,
+      };
+      this.$u.apiList.AttestationGLY(data).then((res) => { });
+    },
+    //添加教育经历
+    addEducation() {
+      this.$u.route({
+        url: "pages/my/AddEducation/AddEducation",
+      });
+    },
+    // 添加任职院校
+    addWorkSchool() {
+      this.$u.route({
+        url: "/pages/my/certificationDetails/certificationDetails",
+        params: { id: 2, route: "my" },
+      });
+    },
+    //选择教育经历
+    currentidx(item, index) {
+      if (item.isSelected) {
+        this.$refs.uToast.show({
+          title: "已选择该学校",
+          type: "warning",
+        });
+        // return this.$tips("已选择该学校","warning");
+      }
+      const data = {
+        userId: this.vuex_user.id,
+        educationId: item.id,
+      };
+      // if (item.certifyStatus == 0) {
+      // 	this.$refs.uToast.show({
+      // 		title: '该教育经历未认证',
+      // 		type: 'error',
+      // 	})
+      // 	return
+      // }
+      // if (item.certifyStatus == 1) {
+      // 	this.$refs.uToast.show({
+      // 		title: '该教育经历待审核',
+      // 		type: 'error',
+      // 	})
+      // 	return
+      // }
+      // return
+      this.getShoolId(data, index);
+    },
+    // 选择学校
+    async teacherIdx(item) {
+      console.log(item, "item--");
+      if (item.isSelected) {
+        this.$refs.uToast.show({
+          title: "已选择该学校",
+          type: "warning",
+        });
+        // this.$tips("已选择该学校","warning");
+        return;
+      }
+      const req = {
+        userId: this.vuex_user.id,
+        educationId: item.id,
+      };
+      const res = await this.$u.apiList.SelectJZGApi(req);
+      console.log(res, "res--选择学校");
+      this.$u.vuex("vuex_token", res.token);
+      this.$u.vuex("vuex_glyType", res.glyType);
+      this.glyType = res.glyType;
+      this.$refs.uToast.show({
+        title: "绑定学校成功",
+        type: "success",
+      });
+      // this.$tips("绑定学校成功","success");
+      this.$u.vuex("vuex_user", res.user);
+      this.Mypage();
+      this.$u.api.getUser();
+      setTimeout(() => {
+        this.myPostsFavorites();
+      }, 1000);
+    },
+    // 学生选择学校 切换token
+    getShoolId(data, index, type) {
+      this.$u.apiList
+        .SelectEducation(data)
+        .then((res) => {
+          console.info("🚀 ~ file:my method: line:496 -----", res);
+
+          this.curIdx = index;
+          this.schoolId = res.schoolId;
+          console.log("%c%s", "color:red", res.glyType, "res.glyType");
+          // 更新 vuex_token
+          this.$u.vuex("vuex_token", res.token);
+          this.$u.vuex("vuex_glyType", res.glyType);
+          this.glyType = res.glyType;
+          this.$u.vuex("vuex_user", res.user);
+          if (!type) {
+            this.$refs.uToast.show({
+              title: "绑定学校成功",
+              type: "success",
+            });
+            // this.$tips("绑定学校成功","success");
+            this.Mypage();
+            this.$u.api.getUser();
+            setTimeout(() => {
+              this.myPostsFavorites();
+            }, 1000);
+          }
+        })
+        .catch((err) => {
+          console.log(err, "err-------");
+          this.$refs.uToast.show({
+            title: err.error,
+            type: "error",
+          });
+          // this.$tips(err.error,"error");
+          // this.curIdx = index
+        });
+    },
+    teacherChange(data, index, type) {
+
+      this.$u.apiList.SelectJZGApi(data).then((res) => {
+        console.info("🚀 ~ file:my method: line:496 -----", res);
+
+        this.curIdx = index;
+        this.schoolId = res.schoolId;
+        console.log("%c%s", "color:red", res.glyType, "res.glyType");
+        // 更新 vuex_token
+        this.$u.vuex("vuex_token", res.token);
+        this.$u.vuex("vuex_glyType", res.glyType);
+        this.glyType = res.glyType;
+        this.$u.vuex("vuex_user", res.user);
+        if (!type) {
+          this.$refs.uToast.show({
+            title: "绑定学校成功",
+            type: "success",
+          });
+          // this.$tips("绑定学校成功","success");
+          this.Mypage();
+          this.$u.api.getUser();
+          setTimeout(() => {
+            this.myPostsFavorites();
+          }, 1000);
+        }
+      })
+        .catch((err) => {
+          console.log(err, "err-------");
+          this.$refs.uToast.show({
+            title: err.error,
+            type: "error",
+          });
+          // this.$tips(err.error,"error");
+          // this.curIdx = index
+        });
+    },
+    //教育经历更多
+    Educationsmore() {
+      this.$u.route({
+        url: "pages/my/ShoolList/ShoolList",
+      });
+    },
+    //教师任职院校更多
+    goTeacherList() {
+      this.$u.route({
+        url: "pages/my/TeacherList/TeacherList",
+      });
+    },
+    //我的发布更多
+    Releasemore(type) {
+      if (!type) {
+        return this.$refs.uToast.show({
+          title: "暂未开放！",
+          type: "warning",
+        });
+        // return this.$tips("暂未开放！","warning");
+      }
+      this.$u.route({
+        url: "pages/my/ReleaseList/ReleaseList",
+        params: {
+          Id: this.schoolId,
+          type: type,
+        },
+      });
+    },
+    //立即发布
+    Publishnow(type) {
+      this.$u.route({
+        url: "pages/AlumniCircle/release/release",
+        params: {
+          Id: this.schoolId,
+          type: type,
+        },
+      });
+    },
+    //审核 ->更多
+    onExamine() {
+      this.$u.route({
+        url: "pages/my/examine/examine",
+      });
+    },
+    goGLY() {
+      const data = {
+        schoolId: this.schoolId,
+        type: 1,
+      };
+      this.$u.apiList
+        .GetUserApproval(data)
+        .then((res) => {
+          this.$u.route({
+            url: "pages/my/certificationDetails/certificationDetails",
+            params: {
+              id: 1,
+              route: "my",
+            },
+          });
+        })
+        .catch((err) => {
+          this.$refs.uToast.show({
+            title: err.error,
+            type: "error",
+          });
+          // this.$tips(err.error,"error");
+        });
+    },
+    //详情
+    onDetails(item) {
+      // console.log(item,'item--')
+      // return
+      item.mytype = 0;
+      item.route = 1;
+      this.$u.route({
+        url: "pages/AlumniCircle/ArticleDetails/ArticleDetails",
+        params: {
+          data: JSON.stringify(item),
+        },
+      });
+    },
+    //预览图片
+    clickImg(item) {
+      this.isonShow = false;
+      item = this.$u.http.config.imgUrl + item;
+      var images = [];
+      images.push(item);
+      uni.previewImage({
+        // 图片路径必须是一个数组 => ['']
+        current: 0,
+        urls: images,
+      });
+    },
+    // 前往个人简历
+    goResume() {
+      this.$u.route({
+        url: "/pages/my/personalResume/personalResume",
+      });
+    },
+    // 点击常用工具
+    toolsMore(type) {
+      switch (type) {
+        case 1:
+          this.Educationsmore();
+          break;
+        case 2:
+          this.goResume();
+          break;
+        case 3:
+          this.goPageFn();
+          break;
+        case 4:
+          this.goWishlist();
+          break;
+        case 5:
+          this.goTeacherList();
+          break;
+      }
+    },
+
+    // 点击校友服务
+    serviceMore(type) {
+      if (type === 1) {
+        this.goAuthentication();
+      } else if (type === 2) {
+        this.goGLY();
+      } else {
+        this.$refs.uToast.show({
+          title: "暂未开放！",
+          type: "warning",
+        });
+        // this.$tips("暂未开放！","warning");
+      }
+    },
+    // 点击右箭头-前往我的个人主页
+    goMyHome() {
+
+      this.$u.route({
+        url: '/pages/AlumniCircle/userDetail/userDetail?id=' + this.vuex_user.id,
+      });
+    },
+    hidePhoneNumber(phone) {
+      return phone ? phone.slice(0, 3) + '****' + phone.slice(7, 11) : '';
+    }
+  },
+  computed: {
+    GLYTYPE() {
+      // 学生时
+      if ([0, 2].includes(this.vuex_user.userType)) {
+        // 学生管理员
+        if (this.glyType === 2) {
+          return true;
+        }
+      }
+      // 教师时
+      if (this.vuex_user.userType === 1) {
+        // 教职工管理员 或 校级管理员
+        if ([0, 1].includes(this.glyType)) {
+          return true;
+        }
+      }
+      return false;
+    },
+
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.top-box {
+  width: 100%;
+  height: 445rpx;
+  background: linear-gradient(to bottom, #b3e3ff, #f6f8f9);
+  padding: 60rpx 30rpx 0;
+
+  .page-title {
+    color: rbga(0, 0, 0, 0.9);
+    font-size: 36rpx;
+    font-weight: 800;
+  }
+
+  .name-info {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    padding-top: 130rpx;
+    align-items: center;
+
+    .right-arrow {
+      width: 40rpx;
+      height: 40rpx;
+    }
+  }
+
+  .school-info {
+    height: 92rpx;
+    background: linear-gradient(90deg, #CEEDFA 0%, #E7F0FF 100%);
+    border-radius: 24rpx 24rpx 24rpx 24rpx;
+    display: flex;
+    padding: 0 20rpx;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 20rpx;
+    margin-bottom: 20rpx;
+    font-size: 28rpx;
+    color: rgba(0, 0, 0, 0.8);
+
+    .school-type {
+      width: 124rpx;
+      height: 56rpx;
+    }
+
+  }
+
+  .name {
+    display: flex;
+    flex-direction: row;
+
+    .avatar {
+      width: 98rpx;
+      height: 98rpx;
+      background: #fff;
+      border-radius: 50%;
+      margin-right: 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+  }
+
+  .name-phone {
+    display: flex;
+    flex-direction: column;
+
+    .user-name {
+      font-weight: 800;
+      font-size: 40rpx;
+      color: rgba(0, 0, 0, 0.9);
+      display: flex;
+
+      .role-box {
+        margin-left: 15rpx;
+        background: #3cb5fb;
+        border-radius: 32rpx;
+        width: 90rpx;
+        height: 44rpx;
+        line-height: 44rpx;
+        text-align: center;
+        font-size: 20rpx;
+        color: #fff;
+        font-weight: normal;
+        margin-top: 5rpx;
+      }
+    }
+
+    .text-phone {
+      font-weight: 500;
+      font-size: 28rpx;
+      color: rgba(0, 0, 0, 0.6);
+    }
+  }
+
+  .top-bg {
+    position: absolute;
+    top: 150rpx;
+    right: 60rpx;
+    width: 255rpx;
+    height: 152rpx;
+    background: url("/static/common/img/my/my-bg.png");
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+  }
+
+  .my-setting {
+    position: absolute;
+    top: 170rpx;
+    right: 35rpx;
+    width: 48rpx;
+    height: 48rpx;
+    background: url("/static/common/img/my/my-setting.png");
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    z-index: 10;
+  }
+}
+
+.user-like {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+
+  padding: 0 120rpx;
+
+  .likes {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .like-num {
+      font-weight: 800;
+      font-size: 36rpx;
+      color: #1f2232;
+    }
+
+    .like-name {
+      font-weight: 500;
+      font-size: 24rpx;
+      color: #616977;
+    }
+  }
+}
+
+.my-released {
+  width: calc(100% - 60rpx);
+  height: 242rpx;
+  background: #ffffff;
+  border-radius: 24rpx;
+  margin: 30rpx auto 0;
+  padding: 30rpx 20rpx;
+
+  .my-released-title {
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #000000;
+  }
+
+  .released-list {
+    display: flex;
+    flex-direction: row;
+    // justify-content: space-between;
+    margin-top: 20rpx;
+
+    .my-released-item {
+      width: 25%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .released-icon {
+        width: 60rpx;
+        height: 60rpx;
+        margin-bottom: 10rpx;
+      }
+
+      .released-name {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #191919;
+      }
+    }
+  }
+}
+
+.bottom {
+  width: 100%;
+  height: 100rpx;
+}
+</style>
diff --git a/pages/my/myDetails/myDetails.vue b/pages/my/myDetails/myDetails.vue
new file mode 100644
index 0000000..4bae7ca
--- /dev/null
+++ b/pages/my/myDetails/myDetails.vue
@@ -0,0 +1,609 @@
+<template>
+  <view>
+    <u-navbar title="个人信息"></u-navbar>
+    <view class="flex-col group">
+      <view class="flex-col section_2">
+        <view class="flex-col">
+          <view class="justify-between headerImg flex-center">
+            <text class="text_15">头像</text>
+            <u-avatar
+              @click="chooseAvatar"
+              :src="$u.http.config.imgUrl + form.head"
+              class="image_2"
+            ></u-avatar>
+            <!-- <ima
+                src="/static/common/img/row_right.png"
+                class="image_3"
+              /> -->
+          </view>
+        </view>
+        <view class="list-row">
+          <text class="text_15">用户名</text>
+          <u-input
+            class="input"
+            :type="'text'"
+            :border="false"
+            :maxlength="8"
+            v-model="form.userName"
+            placeholder="请输入"
+            inputAlign="right"
+          />
+        </view>
+        <view class="list-row">
+          <text class="text_15">真实姓名</text>
+          <u-input
+            :type="'text'"
+            :border="false"
+            v-model="form.name"
+            placeholder="请输入"
+            :disabled="form.name != ''"
+            inputAlign="right"
+          />
+        </view>
+        <view class="list-row">
+          <text class="text_15">性别</text>
+          <view class="item-row">
+            <view class="input-cover" @click="sex = true"></view>
+            <u-input
+              class="input"
+              :type="'text'"
+              :border="false"
+              placeholder="请选择"
+              v-model="form.sex"
+              disabled
+              inputAlign="right"
+            />
+            <image src="/static/common/img/row_right.png" class="image-right" />
+          </view>
+        </view>
+        <view class="list-row">
+          <text class="text_15">出生日期</text>
+          <view class="item-row">
+            <view class="input-cover" @click="birthdays = true"></view>
+            <u-input
+              class="input"
+              :type="'text'"
+              :border="false"
+              v-model="form.birthday"
+              placeholder="请选择出生日期"
+              disabled
+              inputAlign="right"
+            />
+            <image src="/static/common/img/row_right.png" class="image-right" />
+          </view>
+        </view>
+        <view class="list-row">
+          <text class="text_15">手机号码</text>
+          <u-input
+            class="input"
+            :type="'number'"
+            :border="false"
+            v-model="form.phone"
+            disabled
+            inputAlign="right"
+          />
+        </view>
+        <view class="list-row">
+          <text class="text_15">籍贯</text>
+          <view class="item-row">
+            <view class="input-cover" @click="NativePlace = true"></view>
+            <u-input
+              class="input"
+              :type="'text'"
+              :border="false"
+              placeholder="请选择"
+              v-model="form.NativePlace"
+              disabled
+              inputAlign="right"
+            />
+            <image src="/static/common/img/row_right.png" class="image-right" />
+          </view>
+        </view>
+        <view class="list-row">
+          <text class="text_15">现居地</text>
+          <view class="item-row">
+            <view class="input-cover" @click="address = true"></view>
+            <u-input
+              class="input"
+              :type="'text'"
+              :border="false"
+              placeholder="请选择"
+              v-model="form.residence"
+              disabled
+              inputAlign="right"
+            />
+            <image src="/static/common/img/row_right.png" class="image-right" />
+          </view>
+        </view>
+        <view class="list-row">
+          <text class="text_15">详细地址</text>
+          <u-input
+            class="input"
+            :type="'text'"
+            :border="false"
+            v-model="form.address"
+            placeholder="请输入"
+            inputAlign="right"
+          />
+        </view>
+        <view class="list-row" v-if="![0].includes(vuex_user.userType)">
+          <text class="text_15">工作领域</text>
+          <view class="item-row">
+            <view class="input-cover" @click="WorkArea = true"></view>
+            <u-input
+              class="input"
+              :type="'text'"
+              :border="false"
+              placeholder="请选择"
+              v-model="form.WorkArea"
+              disabled
+              inputAlign="right"
+            />
+            <image src="/static/common/img/row_right.png" class="image-right" />
+          </view>
+        </view>
+        <view class="list-row">
+          <text class="text_15">兴趣爱好</text>
+          <view class="item-row">
+            <view class="input-cover" @click="selectHobby"></view>
+            <u-input
+              class="input"
+              :type="'text'"
+              :border="false"
+              placeholder="请选择"
+              v-model="form.hobby"
+              disabled
+              inputAlign="right"
+            />
+            <image src="/static/common/img/row_right.png" class="image-right" />
+          </view>
+        </view>
+      </view>
+      <view style="height: 100rpx; width: 100%"></view>
+      <view class="btn-box">
+        <view class="flex-col items-center button" @click="save">
+          <text>保存</text>
+        </view>
+        <!-- <view class="flex-col items-center button_1" @click="goHome">
+          <text>取消</text>
+        </view> -->
+      </view>
+    </view>
+    <!-- 地址 -->
+    <u-picker
+      mode="region"
+      v-model="address"
+      :area-code="addressId"
+      @confirm="selectAddress"
+    ></u-picker>
+    <!-- 性别 -->
+    <u-select
+      v-model="sex"
+      mode="single-column"
+      :default-value="sexId"
+      :list="sexList"
+      @confirm="selectSex"
+    ></u-select>
+    <!-- 出生日期 -->
+    <u-picker
+      mode="time"
+      v-model="birthdays"
+      :end-year="EndYear"
+      :default-time="birthdaysId"
+      @confirm="selectBirthdays"
+    ></u-picker>
+    <!-- 籍贯 -->
+    <u-picker
+      mode="region"
+      v-model="NativePlace"
+      :area-code="NativePlaceId"
+      @confirm="selectNativePlace"
+    ></u-picker>
+    <!-- 工作领域 -->
+    <u-select
+      v-model="WorkArea"
+      mode="single-column"
+      :default-value="WorkAreaId"
+      :list="WorkAreaList"
+      @confirm="selectWorkArea"
+    ></u-select>
+    <!-- 提示 -->
+    <u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      // input 样式
+      /* inputStyle: {
+        lineHeight: "0.5rem",
+        height: "0.5rem",
+        width: "2rem",
+      }, */
+      sex: false, //性别选择框的显示/隐藏
+      sexList: [
+        //性别选择框内容
+        { label: "男", value: "0" },
+        { label: "女", value: "1" },
+      ],
+      sexId: [0], //记录选择的性别进行数据复现
+      address: false, //现居地址选择框的显示/隐藏
+      addressId: [11, 1101, 110101], //记录选择的现居地址进行数据复现
+      birthdays: false, //出生日期选择框的显示/隐藏
+      birthdaysId: "", //记录选择的出生日期进行数据复现
+      EndYear: 2022, //出生日期选择框的最大年份
+      NativePlace: false, //籍贯选择框的显示/隐藏
+      NativePlaceId: [11, 1101, 110101], //记录选择的籍贯进行数据复现
+      WorkArea: false, //工作领域选择框的显示/隐藏
+      WorkAreaId: [0], //记录选择的工作领域进行数据复现
+      //工作领域选择框内容
+      WorkAreaList: [
+        { label: "在校生", value: "1" },
+        { label: "计算机/互联网/通信/电子", value: "2" },
+        { label: "销售/客服", value: "3" },
+        { label: "会计/金融/银行/保险", value: "4" },
+        { label: "生产/营运/采购/物流", value: "5" },
+        { label: "建筑/房地产", value: "6" },
+        { label: "设计/市场/媒体/广告", value: "7" },
+        { label: "人事/行政/高级管理", value: "8" },
+        { label: "教育/培训", value: "9" },
+        { label: "生物/制药/化工/医疗", value: "10" },
+        { label: "咨询/法律/科研", value: "11" },
+        { label: "服务业", value: "12" },
+        { label: "政府机构/翻译/其他", value: "13" },
+      ],
+      form: {
+        head: "",
+        workFieldId: "",
+        userName: "admin",
+        name: "管理员",
+        sex: "男",
+        nativeProvince: "", //籍贯省
+        nativeCity: "", //籍贯市
+        nativeArea: "", //籍贯区
+        nHomProvince: "", //现居省
+        nHomCity: "", //现居市
+        nHomArea: "", //现居区
+        residence: "", //现居地
+        birthday: "", //出生日期
+        phone: "", //手机号
+        NativePlace: "",
+        address: "",
+        WorkArea: "",
+        hobby:"",
+        list:[]
+      },
+    };
+  },
+  onLoad() {
+    this.EndYear = new Date().getFullYear();
+    Object.assign(this.form, this.vuex_user);
+    this.form.list = this.vuex_user_hobby
+    if (this.form.birthday != "0001-01-01 00:00:00") {
+      this.form.birthday = this.form.birthday.slice(0, 10);
+    } else {
+      this.form.birthday = "";
+    }
+    this.form.NativePlace =
+      this.form.nativeProvince +
+      "-" +
+      this.form.nativeCity +
+      "-" +
+      this.form.nativeArea;
+    this.form.residence =
+      this.form.nHomProvince +
+      "-" +
+      this.form.nHomCity +
+      "-" +
+      this.form.nHomArea;
+    if (this.form.NativePlace == "null-null-null") {
+      this.form.NativePlace = "";
+    }
+    if (this.form.residence == "null-null-null") {
+      this.form.residence = "";
+    }
+    
+  },
+  onShow(){
+    if(this.vuex_user_hobby){
+      const selectedIds = this.vuex_user_hobby.map(item => {
+        return {lableId:item.lableId}
+      });
+      this.$u.vuex("vuex_hobby", selectedIds);
+      this.form.hobby = this.vuex_user_hobby.map(item => item.lableName).join('、')
+    }
+  },
+  created() {
+    // 监听从裁剪页发布的事件，获得裁剪结果
+    uni.$on("uAvatarCropper", (path) => {
+      this.form.head = path;
+      var file = this.common.base64toFile(path, new Date().getTime());
+      if (file.type.indexOf("image") < 0) {
+        // this.$tips("请选择图片", "error");
+        this.$refs.uToast.show({
+          title: "请选择图片",
+          type: "error",
+        });
+        return false;
+      }
+      uni.uploadFile({
+        url: this.$u.http.config.baseUrl + "/app/User/UserHead",
+        file: file,
+        fileType: "image",
+        header: {
+          Authorization: "Bearer " + this.vuex_token,
+        },
+        complete: (res) => {
+          this.$u.apiList
+            .GetUser({
+              userId: this.vuex_user.id,
+            })
+            .then((res) => {
+              this.$u.vuex("vuex_user", res);
+              this.form.head = this.vuex_user.head;
+            });
+          // this.form.head = JSON.parse(res.data).data;
+        },
+      });
+    });
+    this.getWorkFile();
+  },
+
+  methods: {
+    // 头像裁剪
+    chooseAvatar() {
+      // 此为uView的跳转方法，详见"文档-JS"部分，也可以用uni的uni.navigateTo
+      this.$u.route({
+        // 关于此路径，请见下方"注意事项"
+        url: "/uview-ui/components/u-avatar-cropper/u-avatar-cropper",
+        // 内部已设置以下默认参数值，可不传这些参数
+        params: {
+          // 输出图片宽度，高等于宽，单位px
+          destWidth: 200,
+          // 裁剪框宽度，高等于宽，单位px
+          rectWidth: 200,
+          // 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可
+          fileType: "jpg",
+        },
+      });
+    },
+    //获取工作领域
+    getWorkFile() {
+      this.$u.apiList.GetWorkFile().then((res) => {
+        this.WorkAreaList = res.map((item) => {
+          return {
+            label: item.workFieldName,
+            value: item.id,
+          };
+        });
+        let data = this.WorkAreaList.find((item) => {
+          return item.value == this.form.workFieldId;
+        });
+        this.form.WorkArea = data.label;
+        this.form.workFieldId = data.value;
+      });
+    },
+    // 提示
+    tips(title, type, time) {
+      this.$refs.uToast.show({
+        title: title ? title : "",
+        type: type ? type : "success",
+        duration: time ? time + "" : "1000",
+      });
+    },
+    // 保存
+    save() {
+      var data = this.form;
+      data.id = this.vuex_user.id;
+      data.list = this.vuex_hobby
+      var reg = new RegExp("^[\u4e00-\u9fa5]{0,}$", "g"); //真实姓名
+      var reg1 = new RegExp("^[\u4E00-\u9FA5A-Za-z0-9]+$", "g");
+      if (data.userName === "" || !reg1.test(data.userName)) {
+        this.tips("用户名格式不正确", "error");
+        return;
+      }
+      if (data.name === "" || !reg.test(data.name)) {
+        this.tips("请输入正确的真实姓名", "error");
+        return;
+      }
+      if (data.sex === "" || data.sex === null) {
+        this.tips("请选择性别", "error");
+        return;
+      }
+      if (data.birthday === "" || this.isBirthday(data.birthday)) {
+        this.tips("请选择正确出生日期", "error");
+        return;
+      }
+      // reg = new RegExp("^[1][3,4,5,7,8,9][0-9]{9}$", "g"); //手机号
+      // if (data.phone === "" || !reg.test(data.phone)) {
+      //   this.tips("请输入正确的手机号码", "error");
+      //   return;
+      // }
+      if (data.NativePlace === "") {
+        this.tips("请选择籍贯", "error");
+        return;
+      }
+      if (data.residence === "" || data.residence === null) {
+        this.tips("请选择现居地", "error");
+        return;
+      }
+      if (data.address === "" || data.address === null) {
+        this.tips("请输入详细地址", "error");
+        return;
+      }
+      if (data.WorkArea === ""&&![0].includes(this.vuex_user.userType)) {
+        this.tips("请选择工作领域", "error");
+        return;
+      }
+      this.$u.apiList.UpdateUser(data).then((res) => {
+        /* uni.showToast({
+          title: "修改成功",
+          duration: 2000,
+        }); */
+        this.$refs.uToast.show({
+          title: "修改成功",
+          type: "success",
+        });
+        setTimeout(() => {
+          this.$u.route({
+            url: "pages/my/mySeting/mySeting",
+          });
+        }, 1000);
+      });
+    },
+    // 盘判断出生日期
+    isBirthday(data) {
+      return new Date(data) >= new Date();
+    },
+    // 选择工作领域
+    selectWorkArea(e) {
+      this.form.WorkArea = e[0].label;
+      this.form.workFieldId = e[0].value;
+    },
+     // 选择兴趣爱好
+     selectHobby() {
+      this.$u.route({
+        url: "pages/my/myDetails/myInterest",
+      });
+    },
+    // 选择籍贯
+    selectNativePlace(e) {
+      this.form.nativeProvince = e.province.label;
+      this.form.nativeCity = e.city.label;
+      this.form.nativeArea = e.area.label;
+      this.form.NativePlace =
+        e.province.label + "-" + e.city.label + "-" + e.area.label;
+      var arr = [];
+      //   - 0 是转化为隐式转换为数组类型
+      arr.push(e.province.value - 0);
+      arr.push(e.city.value - 0);
+      arr.push(e.area.value - 0);
+      this.NativePlaceId = arr;
+    },
+    // 选择出生日期
+    selectBirthdays(e) {
+      this.form.birthday = e.year + "-" + e.month + "-" + e.day;
+      this.birthdaysId = e.year + "-" + e.month + "-" + e.day;
+    },
+    //   选择性别
+    selectSex(e) {
+      this.form.sex = e[0].label;
+      this.sexId = [parseInt(e[0].value)];
+    },
+    //   选择地址
+    selectAddress(e) {
+      this.form.nHomProvince = e.province.label;
+      this.form.nHomCity = e.city.label;
+      this.form.nHomArea = e.area.label;
+      this.form.residence =
+        e.province.label + "-" + e.city.label + "-" + e.area.label;
+      var arr = [];
+      //   - 0 是转化为隐式转换为数组类型
+      arr.push(e.province.value - 0);
+      arr.push(e.city.value - 0);
+      arr.push(e.area.value - 0);
+      this.addressId = arr;
+    },
+    goHome() {
+      this.$u.route({
+        url: "pages/my/mySeting/mySeting",
+      });
+    },
+    //返回上一级
+    router() {
+      this.$u.route({
+        url: "pages/my/mySeting/mySeting",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.group {
+  width: 100vw;
+  flex: 1 1 auto;
+  overflow-y: auto;
+}
+.section_2 {
+  width: calc(100% - 60rpx);
+  margin: 0.1rem auto 0.5rem;
+  border-radius: 40rpx;
+  background: #fff;
+  padding: 40rpx;
+}
+.image-right {
+  width: 12rpx;
+  height: 20rpx;
+  margin-left: 20rpx;
+  // margin-top: 5rpx;
+}
+.text_15 {
+  width: 200rpx;
+  font-weight: 500;
+  font-size: 28rpx;
+  color: rgba(0, 0, 0, 0.9);
+}
+
+.button_1,
+.button {
+  padding: 0.13rem 0;
+  color: rgb(255, 255, 255);
+  font-size: 0.15rem;
+  line-height: 0.14rem;
+  letter-spacing: 0.03rem;
+  white-space: nowrap;
+  background-color: #3cb5fb;
+  border-radius: 0.3rem;
+  width: 3.1rem;
+  margin: 0 auto;
+  z-index: 999;
+}
+.list-row {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 120rpx;
+  border-bottom: 2rpx solid #f6f8f9;
+  &:last-of-type {
+    border-bottom: none;
+  }
+}
+.item-row {
+  display: flex;
+  width: 380rpx;
+  align-items: center;
+  position: relative;
+}
+
+.input-cover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1;
+}
+
+.flex-center {
+  height: 120rpx;
+  display: flex;
+  align-items: center;
+}
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: white;
+}
+</style>
diff --git a/pages/my/myDetails/myInterest.vue b/pages/my/myDetails/myInterest.vue
new file mode 100644
index 0000000..03d57b6
--- /dev/null
+++ b/pages/my/myDetails/myInterest.vue
@@ -0,0 +1,280 @@
+<template>
+  <view class="flex-col preference-page">
+    <u-navbar title="兴趣爱好" :border-bottom="false"  />
+    <view class="selected-count">
+      已选择（{{ selectedInterests.length }}/10）
+      <text class="desc"
+        >您选择的标签将影响系统推荐给你的信息类型</text
+      >
+    </view>
+
+    <view class="selected-tags">
+      <view
+        v-for="item in selectedInterests"
+        :key="item.lableId"
+        class="tag selected"
+      >
+        {{ item.lableName }}
+        <image
+          class="close-btn"
+          src="/static/common/img/handDelete.png"
+          @click.stop="removeInterest(item)"
+        ></image>
+      </view>
+    </view>
+    <view class="line"></view>
+    <view class="all-tags">
+      <view class="title">兴趣爱好</view>
+      <view class="tags-list">
+        <view
+          v-for="item in interestList"
+          :key="item.lableId"
+          class="tag"
+          :class="{ selected: selectedInterests.includes(item) }"
+          @click="toggleInterest(item)"
+          >{{ item.lableName }}</view
+        >
+      </view>
+    </view>
+    <view class="line-shadow"></view>
+    <view class="btn-box">
+      <u-button
+        shape="circle"
+        class="button"
+        type="primary"
+        @click="finishPreference"
+        >完成</u-button
+      >
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      interestList: [],
+      selectedInterests: [],
+    };
+  },
+  created(){
+    this.initData()
+  },
+  onShow(){
+    this.echoData()
+  },
+  methods: {
+    async initData() {
+      await this.GetInterestLable()
+    },
+    echoData(){
+      // 如果有兴趣则回显，并在全部中过滤掉已选择的
+        if (this.vuex_user_hobby) {
+            this.selectedInterests = JSON.parse(JSON.stringify(this.vuex_user_hobby)) 
+            // 修改过滤逻辑
+            const selectedIds = this.selectedInterests.map(item => item.lableId)
+            const hobbyIds = this.selectedInterests.map(item => {
+              return { lableId: item.lableId };
+            })
+            this.$u.vuex("vuex_hobby", hobbyIds);
+            this.interestList = this.interestList.filter(item => !selectedIds.includes(item.lableId))
+        }
+    },
+    async GetInterestLable() {
+      const res = await this.$u.apiList.GetInterestLable();
+      this.interestList = res;
+    },
+    toggleInterest(item) {
+      // 从 interestList 中移除
+      const interestIndex = this.interestList.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+      if (interestIndex > -1) {
+        // 添加到已选择列表
+        if (this.selectedInterests.length >= 10) {
+          this.$refs.uToast.show({
+            title: "最多选择10个",
+            type: "error",
+          });
+          return;
+        }
+        this.interestList.splice(interestIndex, 1);
+        this.selectedInterests.push(item);
+      }
+    },
+    removeInterest(item) {
+      // 从已选择列表中移除
+      const selectedIndex = this.selectedInterests.findIndex(
+        (i) => i.lableId === item.lableId
+      );
+      if (selectedIndex > -1) {
+        this.selectedInterests.splice(selectedIndex, 1);
+        // 添加回 interestList
+        this.interestList.push(item);
+      }
+    },
+    // 完成偏好设置
+    async finishPreference() {
+      if (
+        this.selectedInterests.length === 0
+      ) {
+        this.$refs.uToast.show({
+          title: "请至少选择一个标签",
+          type: "error",
+        });
+        return;
+      }
+
+
+
+        const interestList = this.selectedInterests.map((item) => ({
+          lableId: item.lableId,
+        }));
+        // console.log('interestList',interestList,this.selectedInterests);
+        this.$u.vuex("vuex_user_hobby", this.selectedInterests);
+
+        this.$u.vuex("vuex_hobby", interestList);
+        // 保存到vuex里面
+        uni.navigateBack({
+          delta: 1,
+        });
+
+
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.preference-page {
+  background: #fff;
+  height: calc(100vh - 200rpx);
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+
+
+  .selected-count {
+    padding: 24rpx;
+    font-weight: bold;
+    font-size: 32rpx;
+    line-height: 48rpx;
+    color: rgba(0, 0, 0, 0.9);
+    .desc {
+      display: block;
+      font-weight: 400;
+      font-size: 24rpx;
+      color: rgba(0, 0, 0, 0.6);
+      line-height: 40rpx;
+      margin-top: 8rpx;
+    }
+  }
+  .selected-tags {
+    padding: 0 24rpx;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 24rpx 24rpx;
+
+    .tag {
+      display: flex;
+      align-items: center;
+      background: #3cb5fb;
+      color: #fff;
+      border-radius: 64rpx;
+      padding: 20rpx;
+      font-size: 28rpx;
+      position: relative;
+      // max-width: 200rpx;
+      margin-right: 0;
+      margin-bottom: 0;
+      box-sizing: border-box;
+      justify-content: flex-start;
+      gap: 6rpx;
+    }
+
+    .close-btn {
+      font-size: 28rpx;
+      margin-right: 8rpx;
+      cursor: pointer;
+      color: #fff;
+      font-weight: bold;
+      line-height: 1;
+      display: inline-block;
+      width: 32rpx;
+      height: 32rpx;
+      text-align: center;
+      border-radius: 50%;
+      background: rgba(255, 255, 255, 0.18);
+    }
+  }
+  .line {
+    width: 100%;
+    height: 4rpx;
+    background: #f6f8f9;
+    margin-top: 24rpx;
+    margin-bottom: 44rpx;
+  }
+  .line-shadow {
+    width: 100%;
+    height: 2rpx;
+    background: #ffffff;
+    box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(0, 0, 0, 0.05);
+    margin-top: 56rpx;
+  }
+  .all-tags {
+    padding: 0 24rpx;
+    .title {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.9);
+      margin-bottom: 18rpx;
+    }
+    .tags-list {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 24rpx 24rpx;
+      margin-bottom: 32rpx;
+      .tag {
+        background: #f6f8f9;
+        color: #333;
+        border-radius: 200rpx;
+        padding: 20rpx 32rpx;
+        font-size: 28rpx;
+        &.selected {
+          background: #3cb5fb;
+          color: #fff;
+        }
+      }
+
+      .industry-tag {
+        background: #f0f4f8;
+        color: #333;
+        border-radius: 200rpx;
+        padding: 20rpx 32rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 28rpx;
+        text-align: center;
+        line-height: 28rpx;
+        box-sizing: border-box;
+        &.selected {
+          background: #3cb5fb;
+          color: #fff;
+        }
+      }
+    }
+  }
+  .btn-box {
+    position: fixed;
+    bottom: 62rpx;
+    left: 0;
+    right: 0;
+    padding: 0 24rpx;
+  }
+  .button {
+    margin: 48rpx 0 0 0;
+    width: 100%;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/my/mySeting/mySetPwd.vue b/pages/my/mySeting/mySetPwd.vue
new file mode 100644
index 0000000..cc8781a
--- /dev/null
+++ b/pages/my/mySeting/mySetPwd.vue
@@ -0,0 +1,204 @@
+<template>
+  <view class="editPwd">
+		<u-navbar back-text="" title="设置密码" :border-bottom="false">
+		</u-navbar>
+    <view class="form">
+      <div class="input">
+        <u-input
+          v-model="form.oldPwd"
+          :border="false"
+          :type="'text'"
+          placeholder="填写原始密码"
+        />
+      </div>
+      <div class="input">
+        <u-input
+          v-model="form.newPwd"
+          :border="false"
+          placeholder="填写新密码"
+          type="password"
+        />
+      </div>
+      <div class="input">
+        <u-input
+          v-model="form.repeatPwd"
+          :border="false"
+          placeholder="再次填写确认"
+          type="password"
+        />
+      </div>
+      <!-- <div class="codeInput">
+            <u-input v-model="form.code" :type="'number'" :border="false" placeholder="验证码" />
+            <u-button class="codeBtn" type="primary" size="medium">8556</u-button>
+          </div> -->
+      
+      <div class="btns">
+        <u-button class="btn" type="primary" @click="editPwd(true)"
+          >确定</u-button
+        >
+      </div>
+      <view style="width: 85%; color: grey;margin:0 auto;">
+        密码长度应该大于5，必须包含字母、数字、特殊字符，且不能包含中文!
+      </view>
+    </view>
+	<u-toast ref="uToast"/>
+  </view>
+</template>
+
+<script>
+import {aesEncrypt} from '@/utils/encrypt.js'
+export default {
+  data() {
+    return {
+      editPasswrod: false,
+      form: {
+        oldPwd: "",
+        newPwd: "",
+        repeatPwd: "",
+      },
+    };
+  },
+  methods: {
+    editPwd(state) {
+      if (state) {
+        if (this.form.oldPwd === "") {
+          // return this.$tips("请输入旧密码", "error");
+          return this.$refs.uToast.show({
+            title: "请输入旧密码",
+            type: "error",
+          });
+        }
+        if (this.form.newPwd === "") {
+          // return this.$tips("请输入新密码", "error");
+          return this.$refs.uToast.show({
+            title: "请输入新密码",
+            type: "error",
+          });
+        }
+        if (this.form.oldPwd == this.form.newPwd) {
+          // return this.$tips("新密码不能与旧密码一致", "error");
+          return this.$refs.uToast.show({
+            title: "新密码不能与旧密码一致",
+            type: "error",
+          });
+        }
+        if (this.form.newPwd.length < 5) {
+          // return this.$tips("您的密码长度应该大于5", "error");
+          return this.$refs.uToast.show({
+            title: "您的密码长度应该大于5",
+            type: "error",
+          });
+        }
+        let reg = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[\W_]).{5,}$/;
+        if (!reg.test(this.form.newPwd)) {
+          // return this.$tips("密码必须包含字母、数字、特殊字符，且不能包含中文!", "error");
+          return this.$refs.uToast.show({
+            title: "密码必须包含字母、数字、特殊字符，且不能包含中文!",
+            type: "error",
+          });
+        }
+        if (this.form.repeatPwd === "") {
+          // return this.$tips("请确认密码", "error");
+          return this.$refs.uToast.show({
+            title: "请确认密码",
+            type: "error",
+          });
+        }
+        if (this.form.repeatPwd !== this.form.newPwd) {
+          // return this.$tips("请确认两次密码是否一致", "error");
+          return this.$refs.uToast.show({
+            title: "请确认两次密码是否一致",
+            type: "error",
+          });
+        }
+        const data = {
+          userId: this.vuex_user.id,
+          oldPassword: aesEncrypt(this.form.oldPwd),
+          password: aesEncrypt(this.form.repeatPwd),
+        };
+        this.$u.api
+          .myChangePassword(data)
+          .then((res) => {
+            // this.$tips("修改成功");
+            this.$refs.uToast.show({
+              title: "修改成功",
+              type: "success",
+            });
+            this.form.newPwd = "";
+            this.form.oldPwd = "";
+            this.form.repeatPwd = "";
+            uni.navigateBack({
+              delta: 1
+            });
+          })
+          .catch((err) => {
+            // return this.$tips(err.error, "error");
+            return this.$refs.uToast.show({
+              title: err.error,
+              type: "error",
+            });
+          });
+      } else {
+        (this.form.newPwd = "");
+        this.form.repeatPwd = "";
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.editPwd {
+  .form {
+    padding:100rpx 56rpx;
+
+    .input {
+      background-color: #fff;
+      border-radius: 24rpx;
+      font-size:28rpx;
+      color: #b4b6bd;
+      margin-bottom: 40rpx;
+      padding: 20rpx 20rpx;
+    }
+
+    .codeInput {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 40rpx;
+
+      ::v-deep .u-input {
+        background-color: #f6f7fa;
+        border-radius: 14rpx;
+        font-size:28rpx;
+        color: #b4b6bd;
+        padding: 10rpx 10rpx !important;
+      }
+
+      .codeBtn {
+        width: 100rpx;
+        height: 100rpx;
+        background-color: #eaf5ff;
+        border-radius: 14rpx;
+        font-size: 52rpx;
+        line-height: 46rpx;
+        color: #2e9bff;
+        margin-left: 24rpx;
+      }
+    }
+
+    .btns {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 50rpx;
+      margin-bottom: 30rpx;
+
+      .btn {
+        width: 100%;
+        border-radius: 50rpx;
+        background: #3cb5fb;
+        height: 100rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/my/mySeting/mySeting.vue b/pages/my/mySeting/mySeting.vue
new file mode 100644
index 0000000..c88ddea
--- /dev/null
+++ b/pages/my/mySeting/mySeting.vue
@@ -0,0 +1,567 @@
+<template>
+  <view>
+    <u-navbar :custom-back="router" title="我的设置"></u-navbar>
+    <view class="flex-col group">
+      <view class="flex-col section_2">
+        <!-- <text class="text_1">账号设置</text> -->
+        <view class="flex-col group_1">
+          <view class="justify-between group_2 flex-center" @click="goEditpwd">
+            <view class="flex-center">
+              <image class="image-left image_3" src="/static/common/img/my/account.png"/>
+              <text>密码设置</text>
+            </view>
+            
+            <image class="image_2 image_3" src="/static/common/img/row_right.png"/>
+          </view>
+          <view class="section_3"></view>
+          <view class="justify-between group_3 flex-center" @click="goAuthentication">
+            <view class="flex-center">
+
+              <image class="image-left image_3" src="/static/common/img/my/agreement.png"/>
+              <text>官方认证</text>
+            </view>
+            <image class="image_2 image_4" src="/static/common/img/row_right.png"/>
+          </view>
+          <view class="section_3"></view>
+          <view class="justify-between group_3 flex-center" @click="goInfo">
+            <view class="flex-center">
+
+              <image class="image-left image_3" src="/static/common/img/my/person.png"/>
+              <text>个人信息</text>
+            </view>
+            <image class="image_2 image_5" src="/static/common/img/row_right.png"/>
+          </view>
+          <!-- <view class="section_3"> </view>
+          <view class="justify-between group_4" @click="goRealDetail">
+            <text>实名认证</text>
+            <image src="/static/common/img/row_right.png" class="image_2 image_5" />
+          </view> -->
+        </view>
+      </view>
+      <view class="flex-col section_4">
+        <view class="flex-center">
+
+          <image class="image-left image_3" src="/static/common/img/my/privacy.png"/>
+          <text class="text_5">隐私设置</text>
+        </view>
+        <view class="flex-col group_5" style='margin-top:0;'>
+          <!-- <view class="justify-between group_6">
+            <text class="text_6">获取定位</text>
+            <u-switch @change="onChange" class="switch" v-model="switchs.isLocation"></u-switch>
+          </view> -->
+          <view class="section_3" style='box-shadow:none;'></view>
+          <view class="justify-between group_7">
+            <text class="text_7">不把我推荐给可能认识的人</text>
+            <u-switch v-model="switchs.isPush" class="switch" @change="onChange"></u-switch>
+          </view>
+        </view>
+      </view>
+      <!-- <view class="flex-col section_5">
+        <text class="text_8">通用设置</text>
+        <view class="justify-between group_8">
+          <text class="text_9">消息提示</text>
+          <u-switch @change="onChange" class="switch" v-model="switchs.isMessage"></u-switch>
+        </view>
+      </view> -->
+      <view class="justify-between section_6 flex-center" @click="onFeedback">
+        <view class="flex-center">
+          <image class="image-left image_3" src="/static/common/img/my/evaluation.png"/>
+          <text>意见反馈</text>
+        </view>
+        <image class="image_2 image_9" src="/static/common/img/row_right.png"/>
+      </view>
+      <view class="flex-col items-center button" @click='show=true'>
+        <text>退出登录</text>
+      </view>
+    </view>
+    <!-- 修改密码 -->
+    <u-mask :show="editPasswrod">
+      <view class="editPwd">
+        <view class="form">
+          <div class="input">
+            <u-input v-model="form.oldPwd" :border="false" :type="'text'" placeholder="旧密码"/>
+          </div>
+          <div class="input">
+            <u-input v-model="form.newPwd" :border="false" placeholder="新密码" type="password"/>
+          </div>
+          <div class="input">
+            <u-input v-model="form.repeatPwd" :border="false" placeholder="重复密码" type="password"/>
+          </div>
+          <!-- <div class="codeInput">
+            <u-input v-model="form.code" :type="'number'" :border="false" placeholder="验证码" />
+            <u-button class="codeBtn" type="primary" size="medium">8556</u-button>
+          </div> -->
+          <view style="margin-bottom: 20rpx;color:grey;">
+            提示：密码长度应该大于5，必须包含字母、数字、特殊字符，且不能包含中文!
+          </view>
+          <div class="btns">
+            <u-button class="btn" @click="editPwd(false)">取消</u-button>
+            <u-button class="btn" type="primary" @click='editPwd(true)'>确认</u-button>
+          </div>
+        </view>
+      </view>
+    </u-mask>
+    <u-top-tips ref="uTips" :navbar-height="0" :z-index='999999'></u-top-tips>
+    <u-modal v-model="show" :content="'确认退出'" :show-cancel-button='true' @confirm='logOut'></u-modal>
+    <u-toast ref="uToast"/>
+  </view>
+</template>
+
+<script>
+import {aesEncrypt} from '@/utils/encrypt.js'
+export default {
+  data() {
+    return {
+      show: false,
+      editPasswrod: false,
+      form: {
+        oldPwd: "",
+        newPwd: "",
+        repeatPwd: "",
+      },
+      switchs: {
+        isLocation: false,
+        isPush: false,
+        isMessage: false,
+      },
+      EdcationList:[],
+    };
+  },
+  onLoad() {
+    this.switchs.userId = this.vuex_user.id
+    this.switchs.isLocation = this.vuex_user.isLocation
+    this.switchs.isMessage = this.vuex_user.isMessage
+    this.switchs.isPush = this.vuex_user.isPush
+    this.Mypage();
+  },
+  onShow(){
+
+    this.getUser()
+  },
+  methods: {
+    getUser() {
+      this.$u.apiList.GetUser({
+        userId: this.vuex_user.id
+      }).then((res) => {
+        this.$u.vuex('vuex_user', res.user)
+        this.$u.vuex('vuex_user_hobby', res.lableList)
+      })
+    },
+    onChange(e) {
+      this.$u.apiList.Setting(this.switchs).then((res) => {
+        this.getUser()
+      })
+    },
+    editPwd(state) {
+      if (state) {
+        if (this.form.oldPwd === "") {
+          // return this.$tips("请输入旧密码", "error");
+          return this.$refs.uToast.show({
+            title: '请输入旧密码',
+            type: 'error',
+          })
+        }
+        if (this.form.newPwd === "") {
+          // return this.$tips("请输入新密码", "error");
+          return this.$refs.uToast.show({
+            title: '请输入新密码',
+            type: 'error',
+          })
+        }
+        if (this.form.oldPwd == this.form.newPwd) {
+          // return this.$tips("新密码不能与旧密码一致", "error");
+          return this.$refs.uToast.show({
+            title: '新密码不能与旧密码一致',
+            type: 'error',
+          })
+        }
+        if (this.form.newPwd.length < 5) {
+          // return this.$tips("您的密码长度应该大于5", "error");
+          return this.$refs.uToast.show({
+            title: '您的密码长度应该大于5',
+            type: 'error',
+          })
+        }
+        let reg = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[\W_]).{5,}$/
+        if (!reg.test(this.form.newPwd)) {
+          // return this.$tips("密码必须包含字母、数字、特殊字符，且不能包含中文!", "error");
+          return this.$refs.uToast.show({
+            title: '密码必须包含字母、数字、特殊字符，且不能包含中文!',
+            type: 'error',
+          })
+        }
+        if (this.form.repeatPwd === "") {
+          // return this.$tips("请确认密码", "error");
+          return this.$refs.uToast.show({
+            title: '请确认密码',
+            type: 'error',
+          })
+        }
+        if (this.form.repeatPwd !== this.form.newPwd) {
+          // return this.$tips("请确认两次密码是否一致", "error");
+          return this.$refs.uToast.show({
+            title: '请确认两次密码是否一致',
+            type: 'error',
+          })
+        }
+        const data = {
+          userId: this.vuex_user.id,
+          oldPassword: aesEncrypt(this.form.oldPwd),
+          password: aesEncrypt(this.form.repeatPwd),
+
+        }
+        this.$u.api.myChangePassword(data).then((res) => {
+          this.editPasswrod = false;
+          // this.$tips("修改成功");
+          this.$refs.uToast.show({
+            title: '修改成功',
+            type: 'success',
+          })
+          this.form.newPwd = ''
+          this.form.oldPwd = ''
+          this.form.repeatPwd = ''
+        })
+            .catch((err) => {
+              // return this.$tips(err.error, "error");
+              return this.$refs.uToast.show({
+                title: err.error,
+                type: 'error',
+            })
+          })
+      } else {
+        this.editPasswrod = false,
+            this.form.newPwd = ''
+        this.form.repeatPwd = ''
+      }
+    },
+    // 退出登录
+    logOut() {
+      this.$u.vuex("vuex_msgList", '');
+      this.$u.vuex('vuex_user', '')
+      this.$u.vuex('vuex_token', '')
+      uni.clearStorage();
+      this.$u.route({
+        url: "/pages/login/login/login",
+      });
+    },
+    // 个人信息
+    goInfo() {
+      this.$u.route({
+        url: "/pages/my/myDetails/myDetails",
+        params: {},
+      });
+    },
+    goRealDetail() {
+      this.$u.route({
+        url: "/pages/my/realDetail/realDetail",
+        params: {},
+      });
+    },
+    async Mypage() {
+      const data = {
+        userId: this.vuex_user.id,
+      }
+     const res = await  this.$u.apiList.MyPage(data)
+     this.EdcationList = res.edcationList
+    
+    },
+    // 官方认证
+    goAuthentication() {
+          // 如果是学生 
+      if([0,2].includes(this.vuex_user.userType)){
+          if(!this.EdcationList.length){
+          return  this.$refs.uToast.show({
+            title: '请先进行教育经历认证',
+            type: 'warning',
+            })
+          }
+          const findRow = this.EdcationList.find(x=>x.isSelected === true);
+          // console.log(findRow,'findRow--')
+          if([0,2].includes(findRow.certifyStatus)){
+            return  this.$refs.uToast.show({
+              title: '请先进行教育经历认证',
+              type: 'warning',
+            })
+          }
+        
+      }
+      // 如果是教师
+      if([1].includes(this.vuex_user.userType)){
+        // 校验当前学校是否审核通过
+        if(!this.EdcationList.length){
+          return  this.$refs.uToast.show({
+            title: '请先进行任职学校认证',
+            type: 'none',
+            })
+          }
+          const findRow = this.EdcationList.find(x=>x.isSelected === true);
+          if([0,2].includes(findRow.certifyStatus)){
+            return  this.$refs.uToast.show({
+              title: '请先进行任职学校认证',
+              type: 'none',
+            })
+          }
+      }
+      this.$u.route({
+          url: "/pages/my/authentication/authentication",
+          params: {},
+        });
+    },
+    goEditpwd(){
+      this.$u.route({
+          url: "/pages/my/mySeting/mySetPwd"
+        });
+    },
+    //返回上一级
+    router() {
+      uni.switchTab({
+        url: '/pages/my/my/my'
+      });
+    },
+    //意见反馈
+    onFeedback() {
+      this.$u.route({
+        url: '/pages/my/Feedback/Feedback'
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.editPwd {
+  .form {
+    width: 80%;
+    background-color: #ffffff;
+    border-radius: 14rpx;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    padding: 30rpx;
+
+    .input {
+      background-color: #f6f7fa;
+      border-radius: 14rpx;
+      font-size:28rpx;
+      color: #b4b6bd;
+      margin-bottom: 40rpx;
+      padding: 10rpx 20rpx;
+    }
+
+    .codeInput {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 40rpx;
+
+      ::v-deep .u-input {
+        background-color: #f6f7fa;
+        border-radius: 14rpx;
+        font-size:28rpx;
+        color: #b4b6bd;
+        padding: 10rpx 10rpx !important;
+      }
+
+      .codeBtn {
+        width: 100rpx;
+        height: 100rpx;
+        background-color: #eaf5ff;
+        border-radius: 14rpx;
+        font-size: 52rpx;
+        line-height: 46rpx;
+        color: #2e9bff;
+        margin-left: 24rpx;
+      }
+    }
+
+    .btns {
+      display: flex;
+      justify-content: space-between;
+
+      .btn {
+        width: 40%;
+      }
+    }
+  }
+}
+
+.image_2 {
+  width: 15rpx;
+  height: 28rpx;
+}
+.image-left{
+  width: 88rpx;
+  height: 88rpx;
+}
+
+.section_3 {
+  background-color: rgb(255, 255, 255);
+  box-shadow: 2rpx 2rpx rgba(29, 38, 46, 0.08);
+  height: 10rpx;
+  position: relative;
+}
+
+.switch {
+  width: 90rpx;
+}
+
+.group {
+  padding: 20rpx 0 10rpx;
+  flex: 1 1 auto;
+  overflow-y: auto;
+}
+
+.section_2 {
+  width: calc(100% - 80rpx);
+  margin: 0 auto;
+  border-radius: 30rpx;
+  padding: 46rpx 0 34rpx 26rpx;
+  background-color: rgb(255, 255, 255);
+}
+
+.section_4 {
+  width: calc(100% - 80rpx);
+  margin: 20rpx auto;
+  border-radius: 30rpx;
+  padding: 46rpx 40rpx 48rpx 26rpx;
+  background-color: rgb(255, 255, 255);
+}
+
+.section_5 {
+  width: calc(100% - 80rpx);
+  margin: 0 auto;
+  border-radius: 30rpx;
+  padding: 46rpx 40rpx 34rpx 26rpx;
+  background-color: rgb(255, 255, 255);
+}
+
+.section_6 {
+  width: calc(100% - 80rpx);
+  margin: 0 auto;
+  border-radius: 30rpx;
+  padding: 46rpx 34rpx 38rpx 26rpx;
+  color: rgb(55, 59, 72);
+  font-size: 34rpx;
+  line-height: 34rpx;
+  white-space: nowrap;
+  background-color: rgb(255, 255, 255);
+}
+
+.button {
+  margin-top: 34rpx;
+  padding: 30rpx 0 30rpx;
+  align-self: center;
+  color: #ef3920;
+  font-size: 34rpx;
+  line-height: 34rpx;
+  letter-spacing: 6rpx;
+  white-space: nowrap;
+  background-color: #fff;
+  border-radius: 60rpx;
+  width: calc(100% - 100rpx);
+  border: 2rpx solid #fac3bc;
+  cursor: pointer;
+}
+
+.text_1 {
+  color: rgb(55, 59, 72);
+  font-size: 34rpx;
+  line-height: 38rpx;
+  white-space: nowrap;
+}
+
+.group_1 {
+  // margin-top: 58rpx;
+  color: rgb(55, 59, 72);
+  font-size: 34rpx;
+  line-height: 34rpx;
+  white-space: nowrap;
+}
+
+.text_5 {
+  color: rgb(55, 59, 72);
+  font-size: 34rpx;
+  line-height: 34rpx;
+  white-space: nowrap;
+}
+
+.group_5 {
+  margin-top: 58rpx;
+  color: rgb(55, 59, 72);
+  font-size: 34rpx;
+  line-height: 34rpx;
+  white-space: nowrap;
+}
+
+.text_8 {
+  color: rgb(55, 59, 72);
+  font-size: 34rpx;
+  line-height: 34rpx;
+  white-space: nowrap;
+}
+
+.group_8 {
+  margin-top: 20rpx;
+  padding-left: 10rpx;
+  color: rgb(55, 59, 72);
+  font-size: 34rpx;
+  line-height: 34rpx;
+  white-space: nowrap;
+}
+
+.image_9 {
+  margin-top: 20rpx;
+}
+
+.group_2 {
+  padding: 0 10rpx 14rpx;
+}
+
+.group_3 {
+  padding: 34rpx 10rpx 10rpx;
+}
+
+.group_4 {
+  padding-top: 28rpx;
+}
+
+.group_6 {
+  padding: 0 2rpx 4rpx;
+}
+
+.group_7 {
+  padding-top: 26rpx;
+}
+
+.text_9 {
+  margin: 10rpx 0 10rpx;
+}
+
+.image_3 {
+  margin-right: 26rpx;
+  // margin-top: 10rpx;
+}
+
+.image_4 {
+  margin-right: 26rpx;
+  margin-top: 10rpx;
+}
+
+.image_5 {
+  margin-right: 26rpx;
+  margin-top: 4rpx;
+}
+
+.text_6 {
+  margin: 10rpx 0 10rpx;
+}
+
+
+.text_7 {
+  margin-top: 6rpx;
+}
+.flex-center{
+  display: flex;
+  align-items: center;
+}
+</style>
diff --git a/pages/my/personalResume/online.vue b/pages/my/personalResume/online.vue
new file mode 100644
index 0000000..ff877b1
--- /dev/null
+++ b/pages/my/personalResume/online.vue
@@ -0,0 +1,441 @@
+<template>
+  <view>
+    <u-navbar :custom-back="goPageFn" title="在线简历"></u-navbar>
+    <view class="base-box">
+      <!-- 左侧头像 -->
+      <view class="base-left">
+        <u-avatar size="130" :src="$u.http.config.imgUrl + vuex_user.head"></u-avatar>
+      </view>
+      <!-- 右侧个人信息 -->
+      <view class="base-right">
+        <view class="base-item">
+          <text class="base-name">{{ vuex_user.name }}</text>
+          <text class="base-status">{{ baseMsg.startYear }}届</text>
+        </view>
+        <view class="base-item" v-if="workFieldName">
+          {{ workFieldName }}</view
+        >
+        <view class="base-item">
+          {{ baseMsg.educationStr }}-{{ baseMsg.college }}-{{ baseMsg.major }}
+        </view>
+        <view class="base-item"> 手机号:{{ vuex_user.phone }}</view>
+      </view>
+    </view>
+    <!-- 线  -->
+    <view style="height: 20rpx"></view>
+    <!-- tabs -->
+    <u-tabs-swiper
+      ref="uTabs"
+      :list="tabList"
+      :current="tabsCurrent"
+      :is-scroll="false"
+      :active-item-style="{ color: '#3CB5FB', fontSize: '0.15rem' }"
+      :bar-style="{ background: '#3CB5FB' }"
+      @change="tabsChange"
+    ></u-tabs-swiper>
+    <!-- 教育经历 -->
+    <template v-if="tabsCurrent === 0">
+      <view class="school-item" v-for="(x, xIndex) in educationList" :key="xIndex">
+        <!-- 学校logo -->
+        <view class="school-logo">
+          <u-avatar
+            size="80"
+            :src="$u.http.config.imgUrl + x.school.logo.slice(1)"
+          ></u-avatar
+        ></view>
+        <view class="school-msg">
+          <view class="school-name">{{ x.school.name }}</view>
+          <view class="school-desc"
+            >{{ x.startYear }}年入学 {{ x.major }} {{ x.educationStr }}</view
+          >
+        </view>
+        <view class="school-time"> {{ x.startYear + "-" + x.endYear }} </view>
+      </view>
+     <!--  <u-empty
+        v-if="!educationList.length"
+        text="暂无数据"
+        mode="list"
+        style="margin-top: 100rpx"
+      ></u-empty> -->
+      <no-data v-if="!educationList.length" text="暂无数据" ></no-data
+        >
+    </template>
+    <!-- 工作经历 -->
+    <template v-if="tabsCurrent === 1">
+      <view
+        class="work-item"
+        v-for="(x, xIndex) in workInfoList"
+        :key="xIndex"
+        @click="editWorkFn(x)"
+      >
+        <view class="work-msg">
+          <text class="work-name">{{ x.corporateName }}</text>
+          <text class="work-job">{{ x.corporatePosition }}</text>
+          <view class="work-img">
+            <image
+              style="width: 20rpx; height: 25rpx; margin-left: 30rpx"
+              src="/static/common/img/row_right.png"
+            />
+          </view>
+        </view>
+        <view class="work-date">
+          {{ x.startTime.slice(0, 7).replaceAll("-", "年") + "月" }} 至
+          {{ x.endTime.slice(0, 7).replaceAll("-", "年") + "月" }}
+        </view>
+        <view class="work-desc">{{ x.wordDesc || "-" }}</view>
+      </view>
+      <view style="padding-top: 100rpx">
+      <no-data v-if="!workInfoList.length" text="暂无数据" ></no-data
+        >
+    </view>
+    </template>
+    <!-- 项目经历 -->
+    <template v-if="tabsCurrent === 2">
+      <view
+        class="work-item"
+        v-for="(x, xIndex) in projectInfoList"
+        :key="xIndex"
+        @click="editProFn(x)"
+      >
+        <view class="work-msg">
+          <text class="work-name">{{ x.projectName }}</text>
+          <text class="work-job">{{ x.projectPosition }}</text>
+          <view class="work-img">
+            <image
+              style="width: 20rpx; height: 25rpx; margin-left: 30rpx"
+              src="/static/common/img/row_right.png"
+            />
+          </view>
+        </view>
+        <view class="work-date">
+          {{ x.startTime.slice(0, 7).replaceAll("-", "年") + "月" }} 至
+          {{ x.endTime.slice(0, 7).replaceAll("-", "年") + "月" }}
+        </view>
+        <view class="work-desc">{{ x.projectDesc }}</view>
+      </view>
+      <view style="padding-top: 100rpx">
+        <no-data v-if="!projectInfoList.length" text="暂无数据" ></no-data
+      ></view>
+    </template>
+    <!-- 线  -->
+    <view style="height: 200rpx"></view>
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button
+        v-if="tabsCurrent === 0"
+        style="width: 80%"
+        shape="circle"
+        type="primary"
+        @click="addEduFn"
+        >添加教育经历</u-button
+      >
+      <u-button
+        v-if="tabsCurrent === 1"
+        style="width: 80%"
+        shape="circle"
+        type="primary"
+        @click="addWorkFn"
+        >添加工作经历</u-button
+      >
+      <u-button
+        v-if="tabsCurrent === 2"
+        style="width: 80%;"
+        shape="circle"
+        type="primary"
+        @click="addProFn"
+        >添加项目经历</u-button
+      >
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+import NoData from '@/components/NoData.vue';
+export default {
+  components:{
+    NoData
+  },
+  data() {
+    return {
+      tabsCurrent: 0,
+      tabList: [
+        {
+          name: "教育经历",
+        },
+        {
+          name: "工作经历",
+        },
+        {
+          name: "项目经历",
+        },
+      ],
+      baseMsg: {
+        id: "00dea3ba-dadb-4403-bf10-17c4b9682c94",
+        logo: "/upload/20230223/1677116584712.jpg",
+        school: "南昌理工学院",
+        certifyStatus: 1,
+        major: "计算机科学与技术",
+        college: "计算机信息工程学院",
+        startYear: "2025",
+        endYear: "2029",
+        educationStr: "本科",
+        isSelected: true,
+      },
+      // 教育经历
+      educationList: [],
+      // 工作经历
+      workInfoList: [],
+      // 项目经历
+      projectInfoList: [],
+      queryParams: {
+        type: 0,
+      },
+      // 获取个人职业
+      workFieldName:'',
+    };
+  },
+  onLoad(e) {
+    // Object.assign(this.queryParams, e);
+    // this.tabsCurrent = Number(this.queryParams.type);
+  },
+  onShow() {
+    this.getListFn();
+    this.getSchoolFn();
+    // 获取个人职业
+    this.getWorkNameFn();
+  },
+  methods: {
+    async getWorkNameFn(){
+      const res = await this.$u.apiList.GetWorkFile();
+      console.log(res,'res--职业列表');
+      this.workFieldName = res.find(x=>x.id === this.vuex_user.workFieldId)?.workFieldName;
+    },
+    goPageFn() {
+      uni.switchTab({
+        url: "/pages/my/my/my",
+      });
+    },
+    // 获取教育经历
+    async getSchoolFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.MyEducations(req);
+      console.log(res, "res--");
+      const findRow = res.find((x) => x.isSelected === true);
+      if (!findRow) {
+        /* uni.showToast({
+          title: "未查询到当前教育经历",
+          icon: "none",
+        }); */
+        this.$refs.uToast.show({
+          title: "未查询到当前教育经历",
+          type: "error",
+        });
+        return;
+      }
+      Object.assign(this.baseMsg, findRow);
+      this.baseMsg.name = this.vuex_user.name;
+      console.log(findRow, "findRow--");
+    },
+    tabsChange(i) {
+      // console.log(i, "i");
+      if (this.tabsCurrent !== i) {
+        this.tabsCurrent = i;
+        this.getListFn();
+      }
+    },
+    // 获取教育经历
+    async getListFn() {
+      const req = {
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.ResumeUserApi(req);
+      console.log(res, "res--");
+      this.educationList = res.educationList;
+      this.workInfoList = res.workInfoList;
+      this.projectInfoList = res.projectInfoList;
+    },
+    //#region 教育经历相关
+    // 添加教育经历
+    addEduFn() {
+      this.$u.route({
+        url: "pages/my/AddEducation/AddEducation",
+      });
+    },
+    //#endregion
+    //#region 工作经历相关
+    // 获取工作经历
+    getWorkFn() {},
+    // 添加工作经历
+    addWorkFn() {
+      uni.navigateTo({
+        url: "/pages/my/personalResume/workPage?type=add",
+      });
+    },
+    // 编辑工作经历
+    editWorkFn(row) {
+      localStorage.setItem("workRow", JSON.stringify(row));
+      uni.navigateTo({
+        url: `/pages/my/personalResume/workPage?type=edit&id=${row.id}`,
+      });
+    },
+    //#endregion
+    //#region 项目经历相关
+    // 获取项目经历
+    getProFn() {},
+    // 添加项目经历
+    addProFn() {
+      uni.navigateTo({
+        url: "/pages/my/personalResume/proPage?type=add",
+      });
+    },
+    // 编辑项目经历
+    editProFn(row) {
+      localStorage.setItem("workRow", JSON.stringify(row));
+      uni.navigateTo({
+        url: "/pages/my/personalResume/proPage?type=edit&id=" + row.id,
+      });
+    },
+    //#endregion
+  },
+  computed: {
+    workFieldName() {
+      // return this.vuex_user?.workField?.workFieldName;
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.base-box {
+  display: flex;
+  min-height: 300rpx;
+  background-color: white;
+  padding-top: 20rpx;
+  .base-left {
+    width: 150rpx;
+    // border: 1px solid red;
+    display: flex;
+    justify-content: center;
+  }
+  .base-right {
+    flex: 1;
+    // border: 1px solid blue;
+    padding-left: 20rpx;
+    .base-item {
+      line-height: 60rpx;
+      color: rgba(0,0,0,0.4);
+      .base-name {
+        font-size: 30rpx;
+        color: black;
+      }
+      .base-status {
+        margin-left: 20rpx;
+        background-color: rgba(54, 110, 244,0.1);
+        color: #3db5fb;
+        padding:5rpx 15rpx;
+        border-radius: 30rpx;
+        font-size: 24rpx;
+      }
+    }
+  }
+}
+// 教育经历
+.school-item {
+  border: 1px solid #f6f7fa;
+  background-color: white;
+  display: flex;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  height: 148rpx;
+  align-items: center;
+  .school-logo {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100rpx;
+  }
+  .school-msg {
+    flex: 1;
+    display: flex;
+    justify-content: space-around;
+    flex-direction: column;
+    padding-top: 10rpx;
+    padding-bottom: 10rpx;
+    padding-left: 20rpx;
+    .school-name {
+      font-size: 32rpx;
+      color: black;
+    }
+    .school-desc {
+      font-size: 24rpx;
+      color:#999999;
+      margin-top: 20rpx;
+    }
+  }
+  .school-time {
+    padding-bottom: 40rpx;
+    font-size: 24rpx;
+    color:#999999;
+    // border: 1px solid blue;
+  }
+}
+// 工作经历
+.work-item {
+  background-color: white;
+  padding: 30rpx;
+  border: 1px solid #f6f7fa;
+  .work-msg {
+    display: flex;
+    align-items: center;
+    .work-name {
+      font-size: 32rpx;
+      color: black;
+      // border: 1px solid green;
+      width: 440rpx;
+      white-space: nowrap; /* 防止文本换行 */
+      overflow: hidden; /* 隐藏超出部分 */
+      text-overflow: ellipsis; /* 显示省略号 */
+    }
+    .work-job {
+      // border: 1px solid blue;
+      color: #999999;
+      width: 200rpx;
+      white-space: nowrap; /* 防止文本换行 */
+      overflow: hidden; /* 隐藏超出部分 */
+      text-overflow: ellipsis; /* 显示省略号 */
+    }
+    .work-img {
+      // border: 1px solid yellow;
+    }
+  }
+  .work-date {
+    color: #999999;
+    margin-top: 20rpx;
+  }
+  .work-desc {
+    color: #666666;
+    margin-top: 15rpx;
+    word-break: break-all;
+    display: -webkit-box;
+  -webkit-line-clamp: 5; /* 限制在 5 行 */
+  -webkit-box-orient: vertical;
+  overflow: hidden; /* 超出部分隐藏 */
+  text-overflow: ellipsis; /* 显示省略号 */
+  }
+}
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: white;
+}
+</style>
diff --git a/pages/my/personalResume/personalResume.vue b/pages/my/personalResume/personalResume.vue
new file mode 100644
index 0000000..00dd948
--- /dev/null
+++ b/pages/my/personalResume/personalResume.vue
@@ -0,0 +1,73 @@
+<template>
+  <view>
+    <u-navbar title="个人简历"></u-navbar>
+    <view class="item-box">
+      <view class="make-box" @click="makeFn">
+        <image src="/static/common/img/resume.svg" style="width: 40rpx; height: 40rpx" />
+        <text style="margin-left: 10rpx"> 制作在线简历 </text>
+      </view>
+      <view class="upload-box" @click="uploadFn">
+        <image src="/static/common/img/upload.svg" style="width: 40rpx; height: 40rpx" />
+        <text style="margin-left: 10rpx"> 上传附件简历 </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    router() {
+      uni.navigateBack({
+        delta: 1,
+      });
+    },
+    // 制作在线简历
+    makeFn() {
+      uni.navigateTo({
+        url: "/pages/my/personalResume/online",
+      });
+    },
+    // 上传个人简历
+    uploadFn() {
+      uni.navigateTo({
+        url: "/pages/my/fileAcc/fileAcc",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.item-box {
+  margin-top: 200rpx;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  .make-box {
+    background-color: #3CB5FB;
+    height: 100rpx;
+    line-height: 100rpx;
+    color: white;
+    text-align: center;
+    border-radius: 50rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .upload-box {
+    margin-top: 60rpx;
+    background-color: #08CC8B;
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    color: white;
+    border-radius: 50rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
diff --git a/pages/my/personalResume/proPage.vue b/pages/my/personalResume/proPage.vue
new file mode 100644
index 0000000..018b4db
--- /dev/null
+++ b/pages/my/personalResume/proPage.vue
@@ -0,0 +1,374 @@
+<template>
+  <view style="width: 100vw; overflow-x: hidden">
+    <u-navbar title="项目经历"></u-navbar>
+    <!-- 项目名称 -->
+    <view class="item-line">
+      <text class="line-label must"> 项目名称</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" maxlength="20"
+        v-model="formData.projectName" placeholder="请输入" />
+    </view>
+    <!-- 项目开始时间 -->
+    <view class="item-line item-date" @click="dateStartShowFn">
+      <text class="line-label must"> 项目开始时间</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" v-model="formData.startTime"
+        @click.native="dateStartShowFn" placeholder="请选择" disabled />
+      <view class="img">
+        <image style="width: 15rpx; height: 25rpx; margin-left: 30rpx" src="/static/common/img/row_right.png" />
+      </view>
+      <!-- 点击盒子 -->
+      <view class="input-mask"></view>
+    </view>
+    <!-- 项目结束时间 -->
+    <view class="item-line item-date" @click="dateEndShowFn">
+      <text class="line-label must"> 项目结束时间</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" v-model="formData.endTime"
+        @click.native="dateEndShowFn" placeholder="请选择" disabled />
+      <view class="img">
+        <image style="width: 15rpx; height: 25rpx; margin-left: 30rpx" src="/static/common/img/row_right.png" />
+      </view>
+      <!-- 点击盒子 -->
+      <view class="input-mask"></view>
+    </view>
+    <!-- 担任角色 -->
+    <view class="item-line">
+      <text class="line-label must"> 担任角色</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" maxlength="20"
+        v-model="formData.projectPosition" placeholder="请输入" />
+    </view>
+    <!-- 工作内容 -->
+    <view class="item-text">
+      <u-input type="textarea" height="200" maxlength="500" :border="false" v-model="formData.projectDesc"
+        placeholder="责任描述：请输入内容,字数限制500字以内" />
+    </view>
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button style="width: 80%" shape="circle" type="primary" @click="addFn"
+        v-if="queryParams.type === 'add'">提交</u-button>
+      <template v-if="queryParams.type === 'edit'">
+        <u-button style="width: 40%" shape="circle" type="error" @click="deleteFn">
+          删除
+        </u-button>
+        <u-button style="width: 40%" shape="circle" type="primary" @click="editFn">
+          保存
+        </u-button>
+      </template>
+    </view>
+    <!-- 开始日期 -->
+    <u-picker v-model="dateStartShow" mode="time" :params="{
+      year: true,
+      month: true,
+    }" @confirm="startChangeFn"></u-picker>
+    <!-- 离职日期 -->
+    <u-picker v-model="dateEndShow" mode="time" :params="{
+      year: true,
+      month: true,
+    }" @confirm="endChangeFn"></u-picker>
+    <u-top-tips ref="uTips" :navbar-height="50"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      formData: {
+        projectName: "", //项目名称
+        startTime: "", //2025-01
+        endTime: "", //2025-02
+        projectPosition: "", //职位
+        projectDesc: "", //工作内容
+        id: "",
+      },
+      inputStyle: {
+        lineHeight: "90rpx",
+        height: "90rpx",
+        width: "400rpx",
+      },
+      dateStartShow: false,
+      dateEndShow: false,
+      queryParams: {
+        type: "add",
+      },
+    };
+  },
+  onLoad(e) {
+    Object.assign(this.queryParams, e);
+    if (e.type === "edit") {
+      let currentRow = JSON.parse(localStorage.getItem("workRow"));
+      console.log(currentRow, "currentRow");
+      Object.assign(this.formData, currentRow);
+      this.formData.startTime = currentRow.startTime.slice(0, 7);
+      this.formData.endTime = currentRow.endTime.slice(0, 7);
+    }
+  },
+  methods: {
+    // 打开起始日期
+    dateStartShowFn() {
+      this.dateStartShow = true;
+    },
+    // 起始日期确认结果
+    startChangeFn(val) {
+      console.log(val, "start");
+      this.formData.startTime = val.year + "-" + val.month;
+    },
+    // 打开离职日期
+    dateEndShowFn() {
+      this.dateEndShow = true;
+    },
+    // 离职日期确认结果
+    endChangeFn(val) {
+      console.log(val, "end");
+      this.formData.endTime = val.year + "-" + val.month;
+    },
+    // 删除
+    async deleteFn() {
+      uni.showModal({
+        // title: "提示",
+        content: `确定删除此项目经历？`,
+        success: async (res) => {
+          if (res.confirm) {
+            const req = {
+              id: this.formData.id,
+            };
+            const res = await this.$u.apiList.DelProjectInfoApi(req);
+            console.log(res, "res--");
+            /* uni.showToast({
+              title: "删除成功",
+              duration: 2000,
+            }); */
+            this.$refs.uToast.show({
+              title: "删除成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              /* uni.redirectTo({
+                url: "/pages/my/personalResume/online?type=2",
+              }); */
+              uni.navigateBack({
+                delta: 1, // 返回上一级页面
+              });
+            }, 1000);
+          }
+          if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    validate() {
+      return new Promise((res, rej) => {
+        if (!this.formData.projectName) {
+          // this.$tips("项目名称不能为空", "error");
+          this.$refs.uToast.show({
+            title: "项目名称不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        if (!this.formData.startTime) {
+          // this.$tips("项目开始时间不能为空", "error");
+          this.$refs.uToast.show({
+            title: "项目开始时间不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        if (!this.formData.endTime) {
+          // this.$tips("项目结束时间不能为空", "error");
+          this.$refs.uToast.show({
+            title: "项目结束时间不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        if (!this.formData.projectPosition) {
+          // this.$tips("担任角色不能为空", "error");
+          this.$refs.uToast.show({
+            title: "担任角色不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        // if (!this.formData.projectDesc) {
+        //   this.$tips("工作内容不能为空", "error");
+        //   rej(false);
+        //   return;
+        // }
+        // 离职时间应该大于入职时间
+        if (new Date(this.formData.startTime) > new Date(this.formData.endTime)) {
+          // this.$tips("项目开始时间不应大于项目结束时间", "error");
+          this.$refs.uToast.show({
+            title: "项目开始时间不应大于项目结束时间",
+            type: "error",
+          });
+
+          rej(false);
+          return;
+        }
+        res(true);
+      });
+    },
+    // 增加
+    async addFn() {
+      console.log("%c%s", "color:red", "发起请求");
+      const result = await this.validate().catch((e) => e);
+      console.log(result, "result--");
+      if (result === false) {
+        return;
+      }
+      const req = {
+        projectName: this.formData.projectName,
+        projectDesc: this.formData.projectDesc,
+        projectPosition: this.formData.projectPosition,
+        startTime: this.formData.startTime,
+        endTime: this.formData.endTime,
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.AddProjectInfoApi(req);
+      console.log(res, "res--");
+      /* uni.showToast({
+        title: "提交成功",
+        duration: 2000,
+      }); */
+      this.$refs.uToast.show({
+        title: "提交成功",
+        type: "success",
+      });
+      setTimeout(() => {
+        /* uni.redirectTo({
+          url: "/pages/my/personalResume/online?type=2",
+        }); */
+        uni.navigateBack({
+          delta: 1, // 返回上一级页面
+        });
+      }, 1000);
+    },
+    // 保存
+    async editFn() {
+      console.log("%c%s", "color:red", "发起请求");
+      const result = await this.validate().catch((e) => e);
+      console.log(result, "result--");
+      if (result === false) {
+        return;
+      }
+      const req = {
+        projectName: this.formData.projectName,
+        projectDesc: this.formData.projectDesc,
+        startTime: this.formData.startTime,
+        endTime: this.formData.endTime,
+        projectPosition: this.formData.projectPosition,
+        id: this.formData.id,
+      };
+      const res = await this.$u.apiList.UpdateProjectInfoApi(req);
+      console.log(res, "res--");
+      /* uni.showToast({
+        title: "保存成功",
+        duration: 2000,
+      }); */
+      this.$refs.uToast.show({
+        title: "保存成功",
+        type: "success",
+      });
+      setTimeout(() => {
+        /* uni.redirectTo({
+          url: "/pages/my/personalResume/online?type=2",
+        }); */
+        uni.navigateBack({
+          delta: 1, // 返回上一级页面
+        });
+      }, 1000);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 必填的样式
+.must {
+  position: relative;
+
+  &::before {
+    content: "*";
+    color: red;
+    position: absolute;
+    top: -10rpx;
+    right: -17rpx;
+    transform: scale(0.8);
+    /* 相对于父元素的左上角定位 */
+  }
+}
+
+// 单行样式
+.item-line {
+  text-align: left;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  font-size: 30rpx;
+  line-height: 90rpx;
+  height: 90rpx;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #f1f2f6;
+  background-color: white;
+
+  .line-label {
+    // font-size: 30rpx;
+    color: black;
+  }
+
+  .line-value {
+    // font-weight: 700;
+    color: #969696;
+  }
+}
+
+// 返校日期
+.item-date {
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  font-size: 30rpx;
+  line-height: 90rpx;
+  height: 90rpx;
+  display: flex;
+  position: relative;
+  background-color: white;
+
+  .input-mask {
+    position: absolute;
+    width: 100%;
+    height: 90rpx;
+    // background-color: red;
+  }
+
+  .img {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 15rpx;
+    // padding-right: 30rpx;
+  }
+}
+
+.item-text {
+  background-color: white;
+  padding: 30rpx;
+}
+
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: white;
+}
+</style>
diff --git a/pages/my/personalResume/workPage.vue b/pages/my/personalResume/workPage.vue
new file mode 100644
index 0000000..9e89171
--- /dev/null
+++ b/pages/my/personalResume/workPage.vue
@@ -0,0 +1,375 @@
+<template>
+  <view style="width: 100vw;height: 100vh; overflow-x: hidden;background: #fff;">
+    <u-navbar title="工作经历"></u-navbar>
+    <!-- 公司名称 -->
+    <view class="item-line">
+      <text class="line-label must"> 公司名称</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" maxlength="20"
+        v-model="formData.corporateName" placeholder="请输入" />
+    </view>
+    <!-- 入职时间 -->
+    <view class="item-line item-date" @click="dateStartShowFn">
+      <text class="line-label must"> 入职时间</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" v-model="formData.startTime"
+        @click.native="dateStartShowFn" placeholder="请选择" disabled />
+      <view class="img">
+        <image style="width: 15rpx; height: 25rpx; margin-left: 10rpx" src="/static/common/img/row_right.png" />
+      </view>
+      <!-- 点击盒子 -->
+      <view class="input-mask"></view>
+    </view>
+    <!-- 离职时间 -->
+    <view class="item-line item-date" @click="dateEndShowFn">
+      <text class="line-label must"> 离职时间</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" v-model="formData.endTime"
+        @click.native="dateEndShowFn" placeholder="请选择" disabled />
+      <view class="img">
+        <image style="width: 15rpx; height: 25rpx; margin-left: 10rpx" src="/static/common/img/row_right.png" />
+      </view>
+      <!-- 点击盒子 -->
+      <view class="input-mask"></view>
+    </view>
+    <!-- 公司职位 -->
+    <view class="item-line">
+      <text class="line-label must"> 公司职位</text>
+      <u-input :custom-style="inputStyle" type="text" input-align="right" :border="false" maxlength="20"
+        v-model="formData.corporatePosition" placeholder="请输入" />
+    </view>
+    <!-- 工作内容 -->
+    <view class="item-text">
+      <u-input type="textarea" height="200" maxlength="500" :border="false" v-model="formData.wordDesc"
+        placeholder="工作责任描述：请输入内容,字数限制500字以内" />
+    </view>
+    <!-- 按钮 -->
+    <view class="btn-box">
+      <u-button style="width: 80%" shape="circle" type="primary" @click="addFn"
+        v-if="queryParams.type === 'add'">保存</u-button>
+      <template v-if="queryParams.type === 'edit'">
+        <u-button style="width: 40%" shape="square" type="error" @click="deleteFn">
+          删除
+        </u-button>
+        <u-button style="width: 40%" shape="square" type="primary" @click="editFn">
+          保存
+        </u-button>
+      </template>
+    </view>
+    <!-- 开始日期 -->
+    <u-picker v-model="dateStartShow" mode="time" :params="{
+      year: true,
+      month: true,
+    }" @confirm="startChangeFn"></u-picker>
+    <!-- 离职日期 -->
+    <u-picker v-model="dateEndShow" mode="time" :params="{
+      year: true,
+      month: true,
+    }" @confirm="endChangeFn"></u-picker>
+    <u-top-tips ref="uTips" :navbar-height="50"></u-top-tips>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      formData: {
+        corporateName: "",
+        startTime: "", //2025-01
+        endTime: "", //2025-02
+        corporatePosition: "", //职位
+        wordDesc: "", //工作内容
+        id: "",
+      },
+      inputStyle: {
+        lineHeight: "120rpx",
+        height: "120rpx",
+        width: "400rpx",
+      },
+      dateStartShow: false,
+      dateEndShow: false,
+      queryParams: {
+        type: "add",
+      },
+    };
+  },
+  onLoad(e) {
+    Object.assign(this.queryParams, e);
+    if (e.type === "edit") {
+      let currentRow = JSON.parse(localStorage.getItem("workRow"));
+      console.log(currentRow, "currentRow");
+      Object.assign(this.formData, currentRow);
+      this.formData.startTime = currentRow.startTime.slice(0, 7);
+      this.formData.endTime = currentRow.endTime.slice(0, 7);
+    }
+  },
+  methods: {
+    // 打开起始日期
+    dateStartShowFn() {
+      this.dateStartShow = true;
+    },
+    // 起始日期确认结果
+    startChangeFn(val) {
+      console.log(val, "start");
+      this.formData.startTime = val.year + "-" + val.month;
+    },
+    // 打开离职日期
+    dateEndShowFn() {
+      this.dateEndShow = true;
+    },
+    // 离职日期确认结果
+    endChangeFn(val) {
+      console.log(val, "end");
+      this.formData.endTime = val.year + "-" + val.month;
+    },
+    // 删除
+    async deleteFn() {
+      uni.showModal({
+        // title: "提示",
+        content: `确定删除此工作经历？`,
+        success: async (res) => {
+          if (res.confirm) {
+            const req = {
+              id: this.formData.id,
+            };
+            const res = await this.$u.apiList.DelWorkInfoApi(req);
+            console.log(res, "res--");
+            /* uni.showToast({
+              title: "删除成功",
+              duration: 2000,
+            }); */
+            this.$refs.uToast.show({
+              title: "删除成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              /* uni.redirectTo({
+                url: "/pages/my/personalResume/online?type=1",
+              }); */
+              uni.navigateBack({
+                delta: 1, // 返回上一级页面
+              });
+            }, 1000);
+          }
+          if (res.cancel) {
+            // console.log('用户点击取消');
+          }
+        },
+      });
+    },
+    validate() {
+      return new Promise((res, rej) => {
+        if (!this.formData.corporateName) {
+          // this.$tips("公司名称不能为空", "error");
+          this.$refs.uToast.show({
+            title: "公司名称不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        if (!this.formData.startTime) {
+          // this.$tips("入职时间不能为空", "error");
+          this.$refs.uToast.show({
+            title: "入职时间不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        if (!this.formData.endTime) {
+          // this.$tips("离职时间不能为空", "error");
+          this.$refs.uToast.show({
+            title: "离职时间不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        if (!this.formData.corporatePosition) {
+          // this.$tips("公司职位不能为空", "error");
+          this.$refs.uToast.show({
+            title: "公司职位不能为空",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        // if (!this.formData.wordDesc) {
+        //   this.$tips("工作内容不能为空", "error");
+        //   rej(false);
+        //   return;
+        // }
+        // 离职时间应该大于入职时间
+        if (new Date(this.formData.startTime) > new Date(this.formData.endTime)) {
+          // this.$tips("入职时间不应大于离职时间", "error");
+          this.$refs.uToast.show({
+            title: "入职时间不应大于离职时间",
+            type: "error",
+          });
+          rej(false);
+          return;
+        }
+        res(true);
+      });
+    },
+    // 增加
+    async addFn() {
+      console.log("%c%s", "color:red", "发起请求");
+      const result = await this.validate().catch((e) => e);
+      console.log(result, "result--");
+      if (result === false) {
+        return;
+      }
+      const req = {
+        corporateName: this.formData.corporateName,
+        wordDesc: this.formData.wordDesc,
+        corporatePosition: this.formData.corporatePosition,
+        startTime: this.formData.startTime,
+        endTime: this.formData.endTime,
+        userId: this.vuex_user.id,
+      };
+      const res = await this.$u.apiList.AddWordInfoApi(req);
+      console.log(res, "res--");
+      /* uni.showToast({
+        title: "提交成功",
+        duration: 2000,
+      }); */
+      this.$refs.uToast.show({
+        title: "提交成功",
+        type: "success",
+      });
+      setTimeout(() => {
+        /* uni.redirectTo({
+          url: "/pages/my/personalResume/online?type=1",
+        }); */
+        uni.navigateBack({
+          delta: 1, // 返回上一级页面
+        });
+      }, 1000);
+    },
+    // 保存
+    async editFn() {
+      console.log("%c%s", "color:red", "发起请求");
+      const result = await this.validate().catch((e) => e);
+      console.log(result, "result--");
+      if (result === false) {
+        return;
+      }
+      const req = {
+        corporateName: this.formData.corporateName,
+        wordDesc: this.formData.wordDesc,
+        startTime: this.formData.startTime,
+        endTime: this.formData.endTime,
+        corporatePosition: this.formData.corporatePosition,
+        id: this.formData.id,
+      };
+      const res = await this.$u.apiList.UpdateWorkInfoApi(req);
+      console.log(res, "res--");
+      /* uni.showToast({
+        title: "保存成功",
+        duration: 2000,
+      }); */
+      this.$refs.uToast.show({
+        title: "保存成功",
+        type: "success",
+      });
+      setTimeout(() => {
+        /* uni.redirectTo({
+          url: "/pages/my/personalResume/online?type=1",
+        }); */
+        uni.navigateBack({
+          delta: 1, // 返回上一级页面
+        });
+      }, 1000);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 必填的样式
+.must {
+  position: relative;
+
+  &::before {
+    content: "*";
+    color: red;
+    position: absolute;
+    top: -10rpx;
+    right: -17rpx;
+    transform: scale(0.8);
+    /* 相对于父元素的左上角定位 */
+  }
+}
+
+// 单行样式
+.item-line {
+  text-align: left;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  font-size: 30rpx;
+  line-height: 120rpx;
+  height: 120rpx;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #f1f2f6;
+  background-color: white;
+
+  .line-label {
+    // font-size: 30rpx;
+    color: black;
+  }
+
+  .line-value {
+    // font-weight: 700;
+    color: #969696;
+  }
+}
+
+// 返校日期
+.item-date {
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  font-size: 30rpx;
+  line-height: 120rpx;
+  height: 120rpx;
+  display: flex;
+  position: relative;
+  background-color: white;
+
+  .input-mask {
+    position: absolute;
+    width: 100%;
+    height: 120rpx;
+    // background-color: red;
+  }
+
+  .img {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 15rpx;
+    padding-top: 4rpx;
+    margin-left: 5rpx;
+    // padding-right: 30rpx;
+  }
+}
+
+.item-text {
+  background-color: white;
+  padding: 30rpx;
+}
+
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: white;
+}
+</style>
diff --git a/pages/my/shoolAuthentication/shoolAuthentication.vue b/pages/my/shoolAuthentication/shoolAuthentication.vue
new file mode 100644
index 0000000..1248600
--- /dev/null
+++ b/pages/my/shoolAuthentication/shoolAuthentication.vue
@@ -0,0 +1,491 @@
+<template>
+	<view style="background-color: rgb(246, 247, 250); height: 100%">
+		<u-navbar title="教育经历认证"></u-navbar>
+		<view class="content">
+			<view class="form">
+				<view class="flex-col group">
+					<view class="flex-col section_2">
+						<view class="flex-col group_5">
+							<view class="flex-row group_6">
+								<text class="text_15">真实姓名</text>
+								<u-input class="input" v-model="user.name" :custom-style="inputStyle" :type="'text'"
+									:border="false" placeholder="请输入" inputAlign="right" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+	
+			<view class="file">
+				<view class="flex-col section_4">
+					<view class="title-tips">
+								<view class="title">上传证明</view>
+								<view class="tips"><text class="red-tips">*</text>上传学生证、毕业证、录取通知书、校园卡，所有上传信息仅供校友身份的认证</view>
+							</view>
+					<view class="flex-row equal-division" style="margin-top: 0">
+						<view class="flex-col equal-division-item">
+							<!-- <view class="flex-row">
+								<text :class="user.imgType==0?'text_11':'text_12'" @click="handleSelect(0)">学生证</text>
+								<text :class="user.imgType==1?'text_11':'text_12'" @click="handleSelect(1)">毕业证</text>
+								<text :class="user.imgType==2?'text_11':'text_12'" @click="handleSelect(2)">录取通知书</text>
+								<text :class="user.imgType==3?'text_11':'text_12'" @click="handleSelect(3)">校园卡</text>
+							</view> -->
+							
+							<view class="flex-col section_5">
+								<u-upload :header='header' :action="$u.http.config.baseUrl+action" @on-success="onSuccess"
+									:max-size="5 * 1024 * 1024" @on-change='onChange' @on-error='onError' upload-text='' max-count="1"
+									ref="uUpload" :auto-upload="true" width="640"
+             					 height="396">
+									<template #addBtn>
+										<image :src="StudentCard" mode="widthFix"></image>
+									</template>
+								</u-upload>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="flex-col group_9">
+					<u-button class="button" type="primary" :disabled="!state" :plain="!state" @click="commitAuth"
+						:throttle-time='1000'>{{state?'提交认证':'提交中'}}</u-button>
+				</view>
+
+
+		<!-- 提示 -->
+		<u-top-tips ref="uTips" :navbar-height="0"></u-top-tips>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import uUpload from '../../../uview-ui/components/u-upload/u-upload.vue';
+	import StudentCard from '@/static/common/img/StudentCard.png'
+	export default {
+		components: {
+			uUpload
+		},
+		data() {
+			return {
+				// input 样式
+				inputStyle: {
+					lineHeight: "0.5rem",
+					height: "0.5rem",
+					width: "1.5rem",
+				},
+				action: '/app/User/File',
+				user: {
+					name: '',
+					imageFile: '',
+					imgType: 0,
+					educationId: '',
+					userId: '',
+				},
+				header: {
+					Authorization: ""
+				},
+				state: true,
+				StudentCard:StudentCard
+			};
+		},
+		onLoad(e) {
+			if (!e.educationId) {
+				this.$u.route({
+					url: "pages/my/ShoolList/ShoolList"
+				})
+			}
+			this.user.educationId = e.educationId
+			this.user.name = this.vuex_user.name ? this.vuex_user.name : ''
+
+		},
+		onShow() {
+			if (!this.user.educationId || !this.user.name) {
+				this.$u.route({
+					url: "pages/my/ShoolList/ShoolList"
+				})
+			}
+		},
+		created() {
+			this.header.Authorization = "Bearer " + this.vuex_token
+		},
+		methods: {
+			commitAuth() {
+				if (!this.user.educationId) {
+					/* uni.showToast({
+						title: "提交错误",
+						duration: 2000,
+					}); */
+					this.$refs.uToast.show({
+						title: "提交错误",
+						type: "error",
+					});
+					setTimeout(() => {
+						this.$u.route({
+							url: "pages/my/ShoolList/ShoolList"
+						})
+					}, 1000)
+					return;
+				}
+
+				if (!this.state) {
+					this.tips("请勿重复提交", "error");
+					return;
+				}
+				// console.log(file)
+				let _this = this
+				if (!this.user.name) {
+					this.tips("请输入真实姓名", "error");
+					return;
+				}
+				var reg = new RegExp("^[\u4e00-\u9fa5]{0,}$", "g");
+				if (!reg.test(this.user.name)) {
+					// this.$tips("请输入正确的真实姓名", "error");
+					this.$refs.uToast.show({
+						title: '请输入正确的真实姓名!',
+						type: "error",
+					});
+					
+					return;
+				}
+				
+				if (!this.user.imageFile ) {
+					this.tips("请上传文件", "error");
+					return
+				}
+
+				this.state = false;
+				// uni.showLoading({
+				// 	title: '提交中...'
+				// })
+				// setTimeout(() => {
+				// 	this.state = true;
+				// 	uni.hideLoading()
+				// 	uni.showToast({
+				// 		title: "提交失败",
+				// 		duration: 2000,
+				// 	});
+				// }, 10000)
+				this.user.userId = this.vuex_user.id
+				this.$u.apiList.SubmitAttestationXY(this.user).then((res) => {
+					this.state = true;
+					uni.hideLoading()
+					/* uni.showToast({
+						title: "已提交",
+						duration: 2000,
+					}); */
+					this.$refs.uToast.show({
+						title: "已提交",
+						type: "success",
+					});
+					setTimeout(() => {
+						this.$u.route({
+							url: "pages/my/ShoolList/ShoolList"
+						})
+					}, 1000)
+					this.user.name = "";
+					this.$refs.uUpload.clear()
+				})
+			},
+			handleSelect(i) {
+				this.user.imgType = i;
+			},
+			// 提示
+			tips(title, type, time) {
+				this.$refs.uToast.show({
+					title: title ? title : "",
+					type: type ? type : "success",
+					duration: time ? time + "" : "1000",
+				});
+			},
+			onSuccess(res) {
+				this.user.imageFile = res.data
+			},
+			onChange(res){
+				if(res.errMsg.indexOf('fail')>=0){
+					this.user.imageFile=''
+				}
+			},
+			onError() {
+				this.tips("文件上传错误", "error");
+			},
+			//返回上一级
+			router() {
+				this.$u.route({
+					url: 'pages/my/ShoolList/ShoolList'
+				});
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.file {
+		
+
+		.section_4 {
+			margin-top: 0.06rem;
+			// padding: 0.17rem 0.17rem 0.07rem 0.23rem;
+			background-color: rgb(255, 255, 255);
+
+			.text_11 {
+				color: #fff;
+				font-size: 0.15rem;
+				white-space: nowrap;
+				padding: 0.05rem 0.05rem;
+				background-color: #2e9bff;
+				border-radius: 0.05rem;
+				margin-right: 0.1rem;
+				border: 1px solid #fff;
+			}
+
+			.text_12 {
+				color: #2e9bff;
+				font-size: 0.15rem;
+				white-space: nowrap;
+				padding: 0.05rem 0.05rem;
+				background-color: #fff;
+				border-radius: 0.05rem;
+				margin-right: 0.1rem;
+				border: 1px solid #2e9bff;
+			}
+
+			.equal-division {
+				margin-top: 0.13rem;
+				color: rgb(46, 155, 255);
+				font-size: 0.12rem;
+				line-height: 0.16rem;
+				white-space: nowrap;
+
+				.equal-division-item {
+					flex: 1 1 1.6rem;
+					max-width: 100%;
+
+					.section_5 {
+						// border-radius: 0.05rem;
+						// border: 1px dotted #66b5ff;
+						margin-top: 0.1rem;
+
+						::v-deep .u-upload>view {
+							width: 100% !important;
+
+						}
+
+						::v-deep.u-list-item {
+							width: 100% !important;
+							margin: 0;
+						}
+					}
+
+					.text_16 {
+						margin-top: 0.055rem;
+						align-self: center;
+					}
+				}
+
+				.equal-division-item_1 {
+					max-width: 48.5%;
+					margin-left: 0.14rem;
+					flex: 1 1 1.6rem;
+
+					.text_11 {
+						margin-bottom: 0.13rem;
+					}
+
+					.section_6 {
+						padding: 0.17rem 0.27rem 0.14rem 0.29rem;
+						border-radius: 0.05rem;
+						border: 1px dotted #66b5ff;
+					}
+
+					.text_19 {
+						margin-top: 0.05rem;
+						align-self: center;
+					}
+				}
+
+				.top-section {
+					padding: 0.12rem 0 0.1rem;
+					border-radius: 0.05rem;
+					background: #eff7ff;
+
+					.image_6 {
+						width: 0.22rem;
+						height: 0.17rem;
+					}
+
+					.text_12 {
+						margin-left: 0.075rem;
+						margin-top: 0.015rem;
+					}
+				}
+
+				.bottom-section {
+					margin-top: 0.1rem;
+					padding: 0.09rem 0.17rem 0.13rem;
+					border-radius: 0.05rem;
+					background: #eff7ff;
+
+					.image_8 {
+						margin-right: 0.08rem;
+						width: 0.23rem;
+						height: 0.17rem;
+					}
+
+					.text_14 {
+						margin-top: 0.015rem;
+					}
+				}
+			}
+		}
+	}
+	.group_6{
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.form {
+		.headerImg {
+			padding-bottom: 0.05rem;
+		}
+
+		.section_2>view>view {
+			// margin-left: 0.21rem;
+			padding: 0 !important;
+			border-bottom: 0.01rem solid #edeeef;
+			position: relative;
+		}
+
+		.section_2>view>view .input,
+		.section_2>view>view text {
+			line-height: 0.5rem;
+		}
+
+		.section_2>view>view .input {
+			// padding-right: 0.2rem !important;
+		}
+
+		.section_2>view>view text {
+			margin-right: 0.1rem;
+			min-width: 0.91rem;
+			white-space: nowrap;
+		}
+
+		.section_2>view>view image {
+			position: absolute;
+			top: 50%;
+			right: 0.14rem;
+			transform: translateY(-50%);
+		}
+
+		.image_3 {
+			width: 0.075rem;
+			height: 0.13rem;
+		}
+
+		.group {
+			flex: 1 1 auto;
+			overflow-y: auto;
+		}
+
+		.section_2 {
+			padding: 0.055rem 0 0 0;
+			background-color: rgb(255, 255, 255);
+		}
+
+		.group_16 {
+			margin-top: 0.21rem;
+			padding: 0 0.02rem;
+		}
+
+		.button_1,
+		.button {
+			padding: 0.13rem 0;
+			color: rgb(255, 255, 255);
+			font-size: 0.15rem;
+			line-height: 0.14rem;
+			letter-spacing: 0.03rem;
+			white-space: nowrap;
+			background-color: rgb(46, 155, 255);
+			border-radius: 0.1rem;
+			width: 3.1rem;
+			margin: 0 auto;
+		}
+
+		.button_1 {
+			margin-top: 0.1rem;
+			color: rgb(55, 59, 72);
+			background-color: rgb(255, 255, 255);
+			border: solid 0.01rem rgba(160, 162, 172, 0.33);
+			margin-bottom: 0.2rem;
+		}
+
+		.view_1 {
+			margin-left: 0.02rem;
+		}
+
+		.text_15 {
+			color: rgb(55, 59, 72);
+			font-size: 0.15rem;
+			line-height: 0.16rem;
+			white-space: nowrap;
+		}
+
+		.image_2 {
+			width: 0.6rem;
+			height: 0.6rem;
+			border-radius: 50%;
+			overflow: hidden;
+		}
+
+		.image_4 {
+			margin-right: 0.15rem;
+			margin-top: 0.28rem;
+		}
+	}
+	.group_9 {
+			background-color: rgb(246, 247, 250);
+			padding-bottom: 0.2rem;
+			position: fixed;
+			bottom: 180rpx;
+			left: 0;
+			right: 0;
+
+			.button {
+				width: 700rpx;
+				margin: 0 auto;
+				padding: 0.12rem 0;
+				color: rgb(255, 255, 255);
+				font-size: 32rpx;
+				line-height: 0.16rem;
+				letter-spacing: 0.03rem;
+				white-space: nowrap;
+				// background-color: rgb(60, 181, 251);
+				border-radius: 50rpx;
+				
+			}
+		}
+	.content {
+		width: calc(100% - 60rpx);
+		margin: 24rpx auto;
+		padding: 24rpx 32rpx;
+		background: #fff;
+		border-radius: 32rpx;
+	}
+	.title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: rgba(0,0,0,0.9);
+	}
+	.tips{
+		font-size: 24rpx;
+		color: #7f7f7f;
+		margin-top: 20rpx;
+	}
+	.red-tips{
+		color: #EF3920;
+	}
+	::v-deep .u-add-wrap {
+		display: none !important;
+		}
+</style>
diff --git a/pages/my/wishlist/addwishlist.vue b/pages/my/wishlist/addwishlist.vue
new file mode 100644
index 0000000..5dd4b41
--- /dev/null
+++ b/pages/my/wishlist/addwishlist.vue
@@ -0,0 +1,189 @@
+<template>
+  <view class="body">
+    <u-navbar :custom-back="router" title="添加心愿"></u-navbar>
+    <view class="form">
+      <view class="formItem">
+        <view class="title">标题</view>
+        <view class="input">
+          <u-input v-model="title" :maxlength="20" placeholder="请输入标题，不超过20字" type="type"/>
+        </view>
+      </view>
+      <view class="formItem">
+        <view class="title">内容</view>
+        <view class="input">
+          <u-input v-model="content" :auto-height="true" :height="500" :maxlength="500"
+                   placeholder="请输入内容，内容不超过500字"
+                   type="textarea"/>
+        </view>
+      </view>
+      <view v-if="doYouWantToEnableAnonymity" class="formItem noBorder">
+        <view class="input">
+          <u-checkbox-group>
+            <u-checkbox v-model="anonymous">匿名</u-checkbox>
+          </u-checkbox-group>
+        </view>
+      </view>
+    </view>
+    <view class="btn-box">
+        <u-button type="primary" shape="circle" @click="submit" style="width: 80%;">提交</u-button>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      title: '',
+      content: '',
+      anonymous: false,
+      doYouWantToEnableAnonymity: false,
+      schoolId:'',
+    };
+  },
+ async onLoad() {
+    await this.getSchool();
+    this.$u.api.CheckNM({
+      schoolId: this.schoolId
+    }).then(res => {
+      if (res.data=== true||res=== true) {
+        
+        this.doYouWantToEnableAnonymity = true;
+      }else{
+
+        this.doYouWantToEnableAnonymity = false;
+      }
+    })
+  },
+  methods: {
+    router() {
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+            // 获取学校
+    async getSchool() {
+        const req = {
+          userId: this.vuex_user.id,
+        };
+        const res = await this.$u.apiList.MyEducations(req);
+        console.log(res,'res---');
+        const findRow = res.find(x=>x.isSelected === true)
+        if(findRow){
+          this.schoolId = findRow.schoolId
+        }
+        console.log(this.schoolId, 'this.schoolId--')
+        // this.schoolId = res.filter(function (x) {
+        //   return x.isSelected === true
+        // })[0]?.schoolId
+    },
+    submit() {
+      if (this.title == '') {
+        /* uni.showToast({
+          title: '标题不能为空',
+          icon: 'none'
+        }); */
+        this.$refs.uToast.show({
+          title: '标题不能为空',
+          type: 'error'
+        });
+        return;
+      }
+      if (this.content == '') {
+        /* uni.showToast({
+          title: '内容不能为空',
+          icon: 'none'
+        }); */
+        this.$refs.uToast.show({
+          title: '内容不能为空',
+          type: 'error'
+        });
+        return;
+      }
+      uni.showLoading({
+        title: '提交中'
+      });
+
+      this.$u.api.PushWishDan({
+        userId: this.vuex_user.id,
+        title: this.title,
+        context: this.content,
+        isNM: this.anonymous,
+        // schoolId: this.vuex_user.schoolId
+        schoolId: this.schoolId
+      }).then(res => {
+        uni.hideLoading();
+       /*  uni.showToast({
+          title: '提交成功',
+          icon: 'none'
+        }); */
+        this.$refs.uToast.show({
+          title: '提交成功',
+          type: 'success'
+        });
+        setTimeout(() => {
+          uni.navigateBack({
+            delta: 1
+          });
+        }, 1000);
+
+      }).catch(e=>{
+        /* uni.showToast({
+          title: e.error || '提交失败',
+          icon: 'none'
+        }); */
+        this.$refs.uToast.show({
+          title: e.error || '提交失败',
+          type: 'error'
+        });
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.body {
+  height: 100vh;
+  background-color: #FFFFFF;
+}
+
+.form {
+  padding: 0 24rpx;
+
+  .formItem {
+    padding: 24rpx 0 0;
+    border-bottom: 0.01rem solid #EEEEEE;
+
+    .title {
+      font-weight: 400;
+      font-size: 0.16rem;
+      color: #000000;
+      line-height: 0.24rem;
+    }
+
+    .input {
+      font-weight: 400;
+      font-size: 0.16rem;
+      color: rgba(0, 0, 0, 0.4);
+    }
+  }
+}
+
+.noBorder {
+  border: none !important;
+}
+// 按钮
+.btn-box {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  height: 150rpx;
+  border-top: 1px solid #f1f2f6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: white;
+}
+</style>
diff --git a/pages/my/wishlist/leftIcon.png b/pages/my/wishlist/leftIcon.png
new file mode 100644
index 0000000..004de66
Binary files /dev/null and b/pages/my/wishlist/leftIcon.png differ
diff --git a/pages/my/wishlist/wishlist.vue b/pages/my/wishlist/wishlist.vue
new file mode 100644
index 0000000..6cc4edf
--- /dev/null
+++ b/pages/my/wishlist/wishlist.vue
@@ -0,0 +1,296 @@
+<template>
+  <view class="body">
+    <u-navbar :custom-back="router" title="心愿单"></u-navbar>
+    <view class="userinfo">
+      <view class="flex-col justify-center items-center ">
+        <u-avatar :src="$u.http.config.imgUrl+vuex_user.head" size="172"></u-avatar>
+        <view class="info">
+          <text class="name">{{ vuex_user.userName }}{{ schoolInfo.startYear?' ('+schoolInfo.startYear+')':'' }}</text>
+        </view>
+        <view class="school-info">
+          <text>{{ schoolInfo.college?schoolInfo.college +'-'+schoolInfo.major+' · '+schoolInfo.educationStr:schoolInfo.school }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="list">
+      <view class="title flex-row items-center">
+        <img alt="" class="leftIcon" src="./leftIcon.png" srcset="">
+        <text class="text">我的心愿</text>
+      </view>
+      <view class="list-box">
+        <scroll-view :scroll-top="0" :scroll-with-animation="true" :style="{height:`calc(100vh - 3.29rem)`}" class="scroll-view"
+                     scroll-y="true" @scrolltolower="scrolltolower">
+          <view v-for="(item,index) in wishList" class="item" :key="index">
+            <view class="top flex-col">
+              <view class="flex-row items-center">
+                <text class="title">{{item.wishTitle}}</text>
+                <u-tag v-if="item.isNM" text="匿名"></u-tag>
+              </view>
+              <text class="time">{{item.createTime}}</text>
+            </view>
+            <view class="content">
+              <text>
+                <u-read-more :toggle="true" show-height="185">
+                  <rich-text :nodes="item.wishContext"></rich-text>
+                </u-read-more>
+              </text>
+            </view>
+            <view class="bottom flex-row  justify-end">
+              <!-- <text class="delete" @click="onDelWish(item,index)">删除</text> -->
+              <image style="width: 40rpx;height: 40rpx;" src="/static/common/img/delete.svg" @click="onDelWish(item,index)"></image>
+            </view>
+          </view>
+          <view v-if="!wishList.length" >
+            <!-- <u-empty  text="暂无数据" mode="list"></u-empty> -->
+             <no-data></no-data>
+          </view>
+          <u-divider v-if="isbottom&&wishList.length>3" style="padding: 10px 0;">到底了</u-divider>
+        </scroll-view>
+      </view>
+      <view style="margin-top: .08rem;">
+        <u-button type="primary" shape="circle"  @click="toAddWishlist">添加心愿</u-button>
+      </view>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+
+import NoData from 'components/NoData.vue'
+export default {
+  components:{
+    NoData
+  },
+  data() {
+    return {
+      wishList: [],
+      totalCount: 0,
+      PageIndex: 1,
+      PageSize: 10,
+      isbottom: false,
+      schoolId:'',
+      schoolInfo: {},
+    };
+  },
+  onLoad() {
+    this.getSchool();
+  },
+ async onShow() {
+
+   await this.getSchool();
+    this.PageIndex=1
+    this.getList()
+  },
+  methods: {
+        // 获取学校
+    async getSchool() {
+        const req = {
+          userId: this.vuex_user.id,
+        };
+        const res = await this.$u.apiList.MyEducations(req);
+        console.log(res,'res---');
+        const findRow = res.find(x=>x.isSelected === true)
+        this.schoolInfo = findRow || {};
+        if(findRow){
+          this.schoolId = findRow.schoolId
+        }
+        console.log(this.schoolId, 'this.schoolId--')
+        // this.schoolId = res.filter(function (x) {
+        //   return x.isSelected === true
+        // })[0]?.schoolId
+    },
+    router() {
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+    // 获取心愿单列表
+    getList() {
+      if(this.PageIndex==1){
+        this.wishList=[]
+      }
+      this.$u.api.GetWishListAsync_mobile({
+        PageIndex: this.PageIndex,
+        PageSize: this.PageSize,
+        UserId: this.vuex_user.id,
+        schoolId: this.schoolId
+      }).then(res => {
+        this.wishList = this.wishList.concat(res.wishList)
+        this.totalCount = res.totalCount
+        if (this.totalCount <= this.wishList.length) {
+          this.isbottom = true
+        }
+      })
+    },
+    // 滚动触底
+    scrolltolower() {
+      if (this.totalCount > 0 && this.totalCount > this.wishList.length) {
+        this.PageIndex++;
+        this.getList()
+      }
+    },
+    // 删除心愿单
+    onDelWish(item, index) {
+      uni.showModal({
+        // title: '提示',
+        content: '确定删除该心愿吗？',
+        success: (res) => {
+
+          if (res.confirm) {
+            this.$u.api.DeleteWish({
+              id: item.id
+            }).then(() => {
+              this.wishList.splice(index, 1)
+              /* uni.showToast({
+                title: '删除成功',
+                icon: 'none'
+              }) */
+              this.$refs.uToast.show({
+                title: '删除成功',
+                type: 'success'
+              });
+            })
+          }
+        }
+      })
+    },
+    toAddWishlist() {
+      uni.navigateTo({
+        url: '/pages/my/wishlist/addwishlist'
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.body {
+  background-image: url("/static/common/img/wishlistBackImg.png");
+  background-size: 100% 3rem;
+  background-repeat: no-repeat;
+  height: 100vh;
+}
+
+.userinfo {
+  padding-top: .2rem;
+  padding-bottom: .3rem;
+
+  .name {
+    font-size: 0.16rem;
+    color: rgba(0, 0, 0, 0.9);
+    line-height: 0.28rem;
+    font-weight: bold;
+    padding: .05rem 0;
+    letter-spacing: 0.01rem;
+    display: block;
+  }
+}
+
+.list {
+  background: #FFFFFF;
+  box-shadow: 0rem -0.06rem 0.15rem 0rem rgba(0, 0, 0, 0.1);
+  border-radius: 0.16rem 0.16rem 0 0;
+  padding: .24rem .16rem 0.26rem .16rem;
+
+  > .title {
+    .leftIcon {
+      width: 0.31rem;
+      height: 0.24rem;
+    }
+
+    .text {
+      font-weight: 500;
+      font-size: 40rpx;
+      color: #000000;
+      line-height: 0.24rem;
+      margin-left: 0.05rem;
+    }
+  }
+
+  .list-box {
+    height: calc(100vh - 3.59rem);
+    overflow-y: scroll;
+    margin-top: .16rem;
+
+    .item {
+      margin-top: .16rem;
+      background: #F7F6F9;
+      border-radius: 0.08rem 0.08rem 0.08rem 0.08rem;
+      padding: .13rem;
+
+      &:first-child {
+        margin-top: 0;
+      }
+
+      &:last-child {
+        margin-bottom: .16rem;
+      }
+
+      .top {
+        border-bottom: 0.01rem solid #DBD8E1;
+
+        .title {
+          font-weight: 400;
+          font-size: 0.16rem;
+          color: #000000;
+          line-height: 0.24rem;
+          margin-right: 5px;
+          width: fit-content;
+          max-width: 80%;
+        }
+
+        .time {
+          font-size: 0.12rem;
+          color: rgba(0, 0, 0, 0.4);
+          line-height: 0.24rem;
+        }
+      }
+
+      .content {
+        margin-top: 0.05rem;
+
+        text {
+          font-size: 0.14rem;
+          color: rgba(0, 0, 0, 0.6);
+          line-height: 0.2rem;
+        }
+      }
+
+      .bottom {
+        margin-top: .08rem;
+
+        .delete {
+          font-size: 0.14rem;
+          color: #0A84FF;
+          line-height: 0.22rem;
+        }
+      }
+    }
+  }
+}
+.school-info{
+  font-weight: 400;
+font-size: 24rpx;
+color: rgba(0,0,0,0.6);
+}
+
+::v-deep .u-navbar {
+  background-color: transparent !important;
+}
+::v-deep .u-border-bottom:after {
+  display: none;
+}
+::v-deep .u-content__showmore-wrap {
+  background-image: linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #F7F6F9 60%) !important;
+  padding-top: 90rpx !important;
+  margin-top: -90rpx !important;
+}
+::v-deep .u-content__show-more {
+  background-image: none !important;
+}
+::v-deep .u-content {
+  text-indent: 0em !important;
+  font-size: 28rpx !important;
+}
+</style>
diff --git a/pages/webview/index.vue b/pages/webview/index.vue
new file mode 100644
index 0000000..f54be6c
--- /dev/null
+++ b/pages/webview/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <view>
+    <u-navbar :title="title" :border-bottom="false"></u-navbar>
+    <web-view :src="url" @message="handleMessage"></web-view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      url: "",
+      title: "",
+    };
+  },
+  onLoad(options) {
+    // 接收传入的URL参数
+
+    if (options.data) {
+      const data = JSON.parse(decodeURIComponent(options.data));
+      this.url = data.url;
+      this.title = data.name;
+    }
+  },
+  methods: {
+    handleMessage(event) {
+      // 处理web-view发送的消息
+      console.log("来自网页的消息", event.detail);
+    },
+  },
+};
+</script>
diff --git a/static/common/css/font.css b/static/common/css/font.css
new file mode 100644
index 0000000..c5d2715
--- /dev/null
+++ b/static/common/css/font.css
@@ -0,0 +1,4 @@
+@font-face {
+    font-family: 'pingfang';
+    src: url(./pingfang.mini3.otf);
+}
diff --git a/static/common/css/pingfang.mini1.otf b/static/common/css/pingfang.mini1.otf
new file mode 100644
index 0000000..b03fdc5
Binary files /dev/null and b/static/common/css/pingfang.mini1.otf differ
diff --git a/static/common/css/pingfang.mini2.otf b/static/common/css/pingfang.mini2.otf
new file mode 100644
index 0000000..3594c29
Binary files /dev/null and b/static/common/css/pingfang.mini2.otf differ
diff --git a/static/common/css/pingfang.mini3.otf b/static/common/css/pingfang.mini3.otf
new file mode 100644
index 0000000..a177d15
Binary files /dev/null and b/static/common/css/pingfang.mini3.otf differ
diff --git a/static/common/css/pingfang.otf b/static/common/css/pingfang.otf
new file mode 100644
index 0000000..f40327f
Binary files /dev/null and b/static/common/css/pingfang.otf differ
diff --git a/static/common/css/readme.txt b/static/common/css/readme.txt
new file mode 100644
index 0000000..8aba2ba
--- /dev/null
+++ b/static/common/css/readme.txt
@@ -0,0 +1,12 @@
+应字体过大分出3个版本
+原版 pingfang.otf  10.3MB
+包含一、二、三级通用规范汉字8105常用字 pingfang.mini1.otf  2.58MB
+包含一、二级通用规范汉字6500常用字 pingfang.mini2.otf  2.09MB
+只包含一级通用规范汉字3500常用字 pingfang.mini3.otf  1.05MB
+
+一级字表  3500字
+https://baike.baidu.com/item/%E4%B8%80%E7%BA%A7%E5%AD%97
+二级字表  3000字
+https://baike.baidu.com/item/%E4%BA%8C%E7%BA%A7%E5%AD%97
+三级字表  1605字
+https://baike.baidu.com/item/%E4%B8%89%E7%BA%A7%E5%AD%97
\ No newline at end of file
diff --git a/static/common/icon/icon-1.png b/static/common/icon/icon-1.png
new file mode 100644
index 0000000..52ba237
Binary files /dev/null and b/static/common/icon/icon-1.png differ
diff --git a/static/common/icon/icon-10.png b/static/common/icon/icon-10.png
new file mode 100644
index 0000000..f43cb99
Binary files /dev/null and b/static/common/icon/icon-10.png differ
diff --git a/static/common/icon/icon-11.png b/static/common/icon/icon-11.png
new file mode 100644
index 0000000..ffc5e79
Binary files /dev/null and b/static/common/icon/icon-11.png differ
diff --git a/static/common/icon/icon-12.png b/static/common/icon/icon-12.png
new file mode 100644
index 0000000..a1e2722
Binary files /dev/null and b/static/common/icon/icon-12.png differ
diff --git a/static/common/icon/icon-13.png b/static/common/icon/icon-13.png
new file mode 100644
index 0000000..2918039
Binary files /dev/null and b/static/common/icon/icon-13.png differ
diff --git a/static/common/icon/icon-14.png b/static/common/icon/icon-14.png
new file mode 100644
index 0000000..6c27452
Binary files /dev/null and b/static/common/icon/icon-14.png differ
diff --git a/static/common/icon/icon-2.png b/static/common/icon/icon-2.png
new file mode 100644
index 0000000..d517b94
Binary files /dev/null and b/static/common/icon/icon-2.png differ
diff --git a/static/common/icon/icon-3.png b/static/common/icon/icon-3.png
new file mode 100644
index 0000000..f8fb1a6
Binary files /dev/null and b/static/common/icon/icon-3.png differ
diff --git a/static/common/icon/icon-4.png b/static/common/icon/icon-4.png
new file mode 100644
index 0000000..58b8690
Binary files /dev/null and b/static/common/icon/icon-4.png differ
diff --git a/static/common/icon/icon-5.png b/static/common/icon/icon-5.png
new file mode 100644
index 0000000..4253e33
Binary files /dev/null and b/static/common/icon/icon-5.png differ
diff --git a/static/common/icon/icon-6.png b/static/common/icon/icon-6.png
new file mode 100644
index 0000000..74579fa
Binary files /dev/null and b/static/common/icon/icon-6.png differ
diff --git a/static/common/icon/icon-7.png b/static/common/icon/icon-7.png
new file mode 100644
index 0000000..9d59b14
Binary files /dev/null and b/static/common/icon/icon-7.png differ
diff --git a/static/common/icon/icon-8.png b/static/common/icon/icon-8.png
new file mode 100644
index 0000000..df07d4b
Binary files /dev/null and b/static/common/icon/icon-8.png differ
diff --git a/static/common/icon/icon-9.png b/static/common/icon/icon-9.png
new file mode 100644
index 0000000..f9de8dc
Binary files /dev/null and b/static/common/icon/icon-9.png differ
diff --git a/static/common/icon/min-icon-1.png b/static/common/icon/min-icon-1.png
new file mode 100644
index 0000000..dd79144
Binary files /dev/null and b/static/common/icon/min-icon-1.png differ
diff --git a/static/common/icon/min-icon-10.png b/static/common/icon/min-icon-10.png
new file mode 100644
index 0000000..361eb05
Binary files /dev/null and b/static/common/icon/min-icon-10.png differ
diff --git a/static/common/icon/min-icon-11.png b/static/common/icon/min-icon-11.png
new file mode 100644
index 0000000..66fc8d3
Binary files /dev/null and b/static/common/icon/min-icon-11.png differ
diff --git a/static/common/icon/min-icon-12.png b/static/common/icon/min-icon-12.png
new file mode 100644
index 0000000..a165c04
Binary files /dev/null and b/static/common/icon/min-icon-12.png differ
diff --git a/static/common/icon/min-icon-13.png b/static/common/icon/min-icon-13.png
new file mode 100644
index 0000000..e0b5cda
Binary files /dev/null and b/static/common/icon/min-icon-13.png differ
diff --git a/static/common/icon/min-icon-14.png b/static/common/icon/min-icon-14.png
new file mode 100644
index 0000000..787cdc0
Binary files /dev/null and b/static/common/icon/min-icon-14.png differ
diff --git a/static/common/icon/min-icon-2.png b/static/common/icon/min-icon-2.png
new file mode 100644
index 0000000..5850818
Binary files /dev/null and b/static/common/icon/min-icon-2.png differ
diff --git a/static/common/icon/min-icon-3.png b/static/common/icon/min-icon-3.png
new file mode 100644
index 0000000..80d5155
Binary files /dev/null and b/static/common/icon/min-icon-3.png differ
diff --git a/static/common/icon/min-icon-4.png b/static/common/icon/min-icon-4.png
new file mode 100644
index 0000000..ea3079a
Binary files /dev/null and b/static/common/icon/min-icon-4.png differ
diff --git a/static/common/icon/min-icon-5.png b/static/common/icon/min-icon-5.png
new file mode 100644
index 0000000..2dc1301
Binary files /dev/null and b/static/common/icon/min-icon-5.png differ
diff --git a/static/common/icon/min-icon-6.png b/static/common/icon/min-icon-6.png
new file mode 100644
index 0000000..715c40b
Binary files /dev/null and b/static/common/icon/min-icon-6.png differ
diff --git a/static/common/icon/min-icon-7.png b/static/common/icon/min-icon-7.png
new file mode 100644
index 0000000..56d7a41
Binary files /dev/null and b/static/common/icon/min-icon-7.png differ
diff --git a/static/common/icon/min-icon-8.png b/static/common/icon/min-icon-8.png
new file mode 100644
index 0000000..858ed87
Binary files /dev/null and b/static/common/icon/min-icon-8.png differ
diff --git a/static/common/icon/min-icon-9.png b/static/common/icon/min-icon-9.png
new file mode 100644
index 0000000..42e600f
Binary files /dev/null and b/static/common/icon/min-icon-9.png differ
diff --git a/static/common/img/16462770928974838161.png b/static/common/img/16462770928974838161.png
new file mode 100644
index 0000000..2b0cbc1
Binary files /dev/null and b/static/common/img/16462770928974838161.png differ
diff --git a/static/common/img/16466166399439803895.png b/static/common/img/16466166399439803895.png
new file mode 100644
index 0000000..163998d
Binary files /dev/null and b/static/common/img/16466166399439803895.png differ
diff --git a/static/common/img/16466166400468141735.png b/static/common/img/16466166400468141735.png
new file mode 100644
index 0000000..24c9bb9
Binary files /dev/null and b/static/common/img/16466166400468141735.png differ
diff --git a/static/common/img/16466166410428220572.png b/static/common/img/16466166410428220572.png
new file mode 100644
index 0000000..d6ae41c
Binary files /dev/null and b/static/common/img/16466166410428220572.png differ
diff --git a/static/common/img/16466166424139703844.png b/static/common/img/16466166424139703844.png
new file mode 100644
index 0000000..139d5a8
Binary files /dev/null and b/static/common/img/16466166424139703844.png differ
diff --git a/static/common/img/16480040186931842252.png b/static/common/img/16480040186931842252.png
new file mode 100644
index 0000000..1fbf00f
Binary files /dev/null and b/static/common/img/16480040186931842252.png differ
diff --git a/static/common/img/16486275579950463634.png b/static/common/img/16486275579950463634.png
new file mode 100644
index 0000000..6bde7ea
Binary files /dev/null and b/static/common/img/16486275579950463634.png differ
diff --git a/static/common/img/16486275582930866915.png b/static/common/img/16486275582930866915.png
new file mode 100644
index 0000000..e36f43a
Binary files /dev/null and b/static/common/img/16486275582930866915.png differ
diff --git a/static/common/img/16486275583591942621.png b/static/common/img/16486275583591942621.png
new file mode 100644
index 0000000..40e5b33
Binary files /dev/null and b/static/common/img/16486275583591942621.png differ
diff --git a/static/common/img/16486275583636337201.png b/static/common/img/16486275583636337201.png
new file mode 100644
index 0000000..1c27d19
Binary files /dev/null and b/static/common/img/16486275583636337201.png differ
diff --git a/static/common/img/16486282410596443868.png b/static/common/img/16486282410596443868.png
new file mode 100644
index 0000000..5173a45
Binary files /dev/null and b/static/common/img/16486282410596443868.png differ
diff --git a/static/common/img/16486282410612625532.png b/static/common/img/16486282410612625532.png
new file mode 100644
index 0000000..76df7fd
Binary files /dev/null and b/static/common/img/16486282410612625532.png differ
diff --git a/static/common/img/16486291276444032321.png b/static/common/img/16486291276444032321.png
new file mode 100644
index 0000000..96b6bef
Binary files /dev/null and b/static/common/img/16486291276444032321.png differ
diff --git a/static/common/img/16486889538940144558 (1).png b/static/common/img/16486889538940144558 (1).png
new file mode 100644
index 0000000..f45bb68
Binary files /dev/null and b/static/common/img/16486889538940144558 (1).png differ
diff --git a/static/common/img/16486889538940144558.png b/static/common/img/16486889538940144558.png
new file mode 100644
index 0000000..f45bb68
Binary files /dev/null and b/static/common/img/16486889538940144558.png differ
diff --git a/static/common/img/16486889538992004733.png b/static/common/img/16486889538992004733.png
new file mode 100644
index 0000000..7dbdcd4
Binary files /dev/null and b/static/common/img/16486889538992004733.png differ
diff --git a/static/common/img/16530269846087107196.png b/static/common/img/16530269846087107196.png
new file mode 100644
index 0000000..a1bd12d
Binary files /dev/null and b/static/common/img/16530269846087107196.png differ
diff --git a/static/common/img/16535374500735010318.png b/static/common/img/16535374500735010318.png
new file mode 100644
index 0000000..28946b2
Binary files /dev/null and b/static/common/img/16535374500735010318.png differ
diff --git a/static/common/img/16535374500948048054.png b/static/common/img/16535374500948048054.png
new file mode 100644
index 0000000..147fb54
Binary files /dev/null and b/static/common/img/16535374500948048054.png differ
diff --git a/static/common/img/16535374508974128453.png b/static/common/img/16535374508974128453.png
new file mode 100644
index 0000000..aa3df38
Binary files /dev/null and b/static/common/img/16535374508974128453.png differ
diff --git a/static/common/img/16535374509810688026.png b/static/common/img/16535374509810688026.png
new file mode 100644
index 0000000..7743e3d
Binary files /dev/null and b/static/common/img/16535374509810688026.png differ
diff --git a/static/common/img/16535374509868908590.png b/static/common/img/16535374509868908590.png
new file mode 100644
index 0000000..42a9e41
Binary files /dev/null and b/static/common/img/16535374509868908590.png differ
diff --git a/static/common/img/Faculty.png b/static/common/img/Faculty.png
new file mode 100644
index 0000000..7219488
Binary files /dev/null and b/static/common/img/Faculty.png differ
diff --git a/static/common/img/FacultyBj.png b/static/common/img/FacultyBj.png
new file mode 100644
index 0000000..7fa25e4
Binary files /dev/null and b/static/common/img/FacultyBj.png differ
diff --git a/static/common/img/ServiceIcon1.png b/static/common/img/ServiceIcon1.png
new file mode 100644
index 0000000..a3576be
Binary files /dev/null and b/static/common/img/ServiceIcon1.png differ
diff --git a/static/common/img/ServiceIcon2.png b/static/common/img/ServiceIcon2.png
new file mode 100644
index 0000000..780e045
Binary files /dev/null and b/static/common/img/ServiceIcon2.png differ
diff --git a/static/common/img/ServiceIcon3.png b/static/common/img/ServiceIcon3.png
new file mode 100644
index 0000000..52faf06
Binary files /dev/null and b/static/common/img/ServiceIcon3.png differ
diff --git a/static/common/img/ServiceIcon4.png b/static/common/img/ServiceIcon4.png
new file mode 100644
index 0000000..d5d49da
Binary files /dev/null and b/static/common/img/ServiceIcon4.png differ
diff --git a/static/common/img/StudentCard.png b/static/common/img/StudentCard.png
new file mode 100644
index 0000000..4efc163
Binary files /dev/null and b/static/common/img/StudentCard.png differ
diff --git a/static/common/img/add-circle.png b/static/common/img/add-circle.png
new file mode 100644
index 0000000..0d42bbc
Binary files /dev/null and b/static/common/img/add-circle.png differ
diff --git a/static/common/img/add.svg b/static/common/img/add.svg
new file mode 100644
index 0000000..b0d5397
--- /dev/null
+++ b/static/common/img/add.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="add">
+<g id="vuesax/linear/add">
+<g id="add_2">
+<path id="Vector" d="M6 12L18 12" stroke="black" stroke-opacity="0.9" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_2" d="M12 6L12 18" stroke="black" stroke-opacity="0.9" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/static/common/img/admin.png b/static/common/img/admin.png
new file mode 100644
index 0000000..1e3c277
Binary files /dev/null and b/static/common/img/admin.png differ
diff --git a/static/common/img/adminBj.png b/static/common/img/adminBj.png
new file mode 100644
index 0000000..6557f9f
Binary files /dev/null and b/static/common/img/adminBj.png differ
diff --git a/static/common/img/adminHeaderImg.png b/static/common/img/adminHeaderImg.png
new file mode 100644
index 0000000..ea913d3
Binary files /dev/null and b/static/common/img/adminHeaderImg.png differ
diff --git a/static/common/img/adminIcon.png b/static/common/img/adminIcon.png
new file mode 100644
index 0000000..05304e7
Binary files /dev/null and b/static/common/img/adminIcon.png differ
diff --git a/static/common/img/back-to-location.png b/static/common/img/back-to-location.png
new file mode 100644
index 0000000..719f6b7
Binary files /dev/null and b/static/common/img/back-to-location.png differ
diff --git a/static/common/img/change1.png b/static/common/img/change1.png
new file mode 100644
index 0000000..68c98d5
Binary files /dev/null and b/static/common/img/change1.png differ
diff --git a/static/common/img/changeCard.png b/static/common/img/changeCard.png
new file mode 100644
index 0000000..3e98b0e
Binary files /dev/null and b/static/common/img/changeCard.png differ
diff --git a/static/common/img/chats.png b/static/common/img/chats.png
new file mode 100644
index 0000000..b316648
Binary files /dev/null and b/static/common/img/chats.png differ
diff --git a/static/common/img/close.png b/static/common/img/close.png
new file mode 100644
index 0000000..1d59777
Binary files /dev/null and b/static/common/img/close.png differ
diff --git a/static/common/img/del.svg b/static/common/img/del.svg
new file mode 100644
index 0000000..13afd1f
--- /dev/null
+++ b/static/common/img/del.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1736729917480" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4254" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M687.603949 656.994302 541.10027 510.457878 687.603949 363.943966c8.829086-8.840342 8.829086-23.122627 0-31.961946-8.850575-8.840342-23.13286-8.840342-31.962969 0L509.138324 478.495932 362.623389 331.980997c-8.840342-8.818853-23.122627-8.818853-31.962969 0-8.840342 8.840342-8.840342 23.144116 0 31.984459l146.493445 146.514935L330.638931 656.994302c-8.819876 8.830109-8.819876 23.133883 0 31.962969 8.840342 8.829086 23.144116 8.829086 31.984459 0l146.514935-146.514935 146.502655 146.514935c8.830109 8.829086 23.112394 8.829086 31.962969 0C696.433034 680.129208 696.45657 665.824411 687.603949 656.994302z" fill="#5D5D5D" p-id="4255"></path><path d="M938.362063 510.457878c0-237.061161-192.174857-429.234995-429.247274-429.234995-237.062184 0-429.246251 192.173834-429.246251 429.234995 0 237.083673 192.185091 429.257507 429.246251 429.257507 97.345072 0 186.435133-33.110095 258.440074-87.677898 2.958378-3.354398 4.900613-7.636934 4.900613-12.449543 0-10.506285-8.521071-19.026332-19.027355-19.026332-5.431709 0-10.287297 2.162246-13.752212 5.826705l-0.2415 0c-64.456011 47.414893-143.745868 75.800383-229.876528 75.800383-214.679407 0-388.730489-174.073594-388.730489-388.719232 0-214.688617 174.051081-388.718209 388.730489-388.718209 214.688617 0 388.697743 174.029592 388.697743 388.718209 0 65.548902-15.386432 127.277802-44.081984 181.490517l0 0.309038c-0.508583 1.811252-1.104147 3.576455-1.104147 5.519714 0 10.507308 8.520047 19.028379 19.028379 19.028379 8.18952 0 15.054881-5.254677 17.703197-12.494569l0 0.132006C920.349827 648.38625 938.362063 581.536726 938.362063 510.457878z" fill="#5D5D5D" p-id="4256"></path></svg>
\ No newline at end of file
diff --git a/static/common/img/delete.png b/static/common/img/delete.png
new file mode 100644
index 0000000..7f9b758
Binary files /dev/null and b/static/common/img/delete.png differ
diff --git a/static/common/img/delete.svg b/static/common/img/delete.svg
new file mode 100644
index 0000000..777ab03
--- /dev/null
+++ b/static/common/img/delete.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="delete">
+<g id="union">
+<path d="M6 12V6H7V12H6Z" fill="#3CB5FB"/>
+<path d="M9 6V12H10V6H9Z" fill="#3CB5FB"/>
+<path d="M10.5 3H14V4H13V14C13 14.5523 12.5523 15 12 15H4C3.44772 15 3 14.5523 3 14V4H2V3H5.5L5.5 1.8C5.5 1.35817 5.85817 1 6.3 1H9.7C10.1418 1 10.5 1.35817 10.5 1.8V3ZM6.5 3H9.5L9.5 2L6.5 2V3ZM4 4V14H12V4H4Z" fill="#3CB5FB"/>
+</g>
+</g>
+</svg>
diff --git a/static/common/img/empty.png b/static/common/img/empty.png
new file mode 100644
index 0000000..b9cb379
Binary files /dev/null and b/static/common/img/empty.png differ
diff --git a/static/common/img/enterprise.png b/static/common/img/enterprise.png
new file mode 100644
index 0000000..582ce69
Binary files /dev/null and b/static/common/img/enterprise.png differ
diff --git a/static/common/img/enterpriseBj.png b/static/common/img/enterpriseBj.png
new file mode 100644
index 0000000..ce7591e
Binary files /dev/null and b/static/common/img/enterpriseBj.png differ
diff --git a/static/common/img/exchangeBjImg.png b/static/common/img/exchangeBjImg.png
new file mode 100644
index 0000000..b531228
Binary files /dev/null and b/static/common/img/exchangeBjImg.png differ
diff --git a/static/common/img/female.png b/static/common/img/female.png
new file mode 100644
index 0000000..4ff0992
Binary files /dev/null and b/static/common/img/female.png differ
diff --git a/static/common/img/graduate.png b/static/common/img/graduate.png
new file mode 100644
index 0000000..7ab5fdd
Binary files /dev/null and b/static/common/img/graduate.png differ
diff --git a/static/common/img/handDelete.png b/static/common/img/handDelete.png
new file mode 100644
index 0000000..96a6e4d
Binary files /dev/null and b/static/common/img/handDelete.png differ
diff --git a/static/common/img/headerImg.png b/static/common/img/headerImg.png
new file mode 100644
index 0000000..d657e0e
Binary files /dev/null and b/static/common/img/headerImg.png differ
diff --git a/static/common/img/homepage/activity-default.png b/static/common/img/homepage/activity-default.png
new file mode 100644
index 0000000..9549489
Binary files /dev/null and b/static/common/img/homepage/activity-default.png differ
diff --git a/static/common/img/homepage/avatar.png b/static/common/img/homepage/avatar.png
new file mode 100644
index 0000000..c36c352
Binary files /dev/null and b/static/common/img/homepage/avatar.png differ
diff --git a/static/common/img/homepage/avatar2.png b/static/common/img/homepage/avatar2.png
new file mode 100644
index 0000000..17802c4
Binary files /dev/null and b/static/common/img/homepage/avatar2.png differ
diff --git a/static/common/img/homepage/avatar3.png b/static/common/img/homepage/avatar3.png
new file mode 100644
index 0000000..e8e9b03
Binary files /dev/null and b/static/common/img/homepage/avatar3.png differ
diff --git a/static/common/img/homepage/banner.jpg b/static/common/img/homepage/banner.jpg
new file mode 100644
index 0000000..96a0390
Binary files /dev/null and b/static/common/img/homepage/banner.jpg differ
diff --git a/static/common/img/homepage/comment.png b/static/common/img/homepage/comment.png
new file mode 100644
index 0000000..4e0b9f8
Binary files /dev/null and b/static/common/img/homepage/comment.png differ
diff --git a/static/common/img/homepage/frame.png b/static/common/img/homepage/frame.png
new file mode 100644
index 0000000..1c20447
Binary files /dev/null and b/static/common/img/homepage/frame.png differ
diff --git a/static/common/img/homepage/icon-back.png b/static/common/img/homepage/icon-back.png
new file mode 100644
index 0000000..10110dc
Binary files /dev/null and b/static/common/img/homepage/icon-back.png differ
diff --git a/static/common/img/homepage/icon-close-circle.png b/static/common/img/homepage/icon-close-circle.png
new file mode 100644
index 0000000..41412da
Binary files /dev/null and b/static/common/img/homepage/icon-close-circle.png differ
diff --git a/static/common/img/homepage/icon-delete.png b/static/common/img/homepage/icon-delete.png
new file mode 100644
index 0000000..6252a14
Binary files /dev/null and b/static/common/img/homepage/icon-delete.png differ
diff --git a/static/common/img/homepage/icon-expand.png b/static/common/img/homepage/icon-expand.png
new file mode 100644
index 0000000..5481876
Binary files /dev/null and b/static/common/img/homepage/icon-expand.png differ
diff --git a/static/common/img/homepage/icon-follow.png b/static/common/img/homepage/icon-follow.png
new file mode 100644
index 0000000..8796785
Binary files /dev/null and b/static/common/img/homepage/icon-follow.png differ
diff --git a/static/common/img/homepage/icon-message.png b/static/common/img/homepage/icon-message.png
new file mode 100644
index 0000000..c4bc696
Binary files /dev/null and b/static/common/img/homepage/icon-message.png differ
diff --git a/static/common/img/homepage/icon-refresh.png b/static/common/img/homepage/icon-refresh.png
new file mode 100644
index 0000000..45fb990
Binary files /dev/null and b/static/common/img/homepage/icon-refresh.png differ
diff --git a/static/common/img/homepage/icon-send.png b/static/common/img/homepage/icon-send.png
new file mode 100644
index 0000000..e5de14e
Binary files /dev/null and b/static/common/img/homepage/icon-send.png differ
diff --git a/static/common/img/homepage/icon_DL.png b/static/common/img/homepage/icon_DL.png
new file mode 100644
index 0000000..9261b3f
Binary files /dev/null and b/static/common/img/homepage/icon_DL.png differ
diff --git a/static/common/img/homepage/icon_DL_gray.png b/static/common/img/homepage/icon_DL_gray.png
new file mode 100644
index 0000000..fbf5871
Binary files /dev/null and b/static/common/img/homepage/icon_DL_gray.png differ
diff --git a/static/common/img/homepage/icon_全部服务.png b/static/common/img/homepage/icon_全部服务.png
new file mode 100644
index 0000000..1ba0c3c
Binary files /dev/null and b/static/common/img/homepage/icon_全部服务.png differ
diff --git a/static/common/img/homepage/icon_办事指南.png b/static/common/img/homepage/icon_办事指南.png
new file mode 100644
index 0000000..3686434
Binary files /dev/null and b/static/common/img/homepage/icon_办事指南.png differ
diff --git a/static/common/img/homepage/icon_办事指南_gray.png b/static/common/img/homepage/icon_办事指南_gray.png
new file mode 100644
index 0000000..ec923cc
Binary files /dev/null and b/static/common/img/homepage/icon_办事指南_gray.png differ
diff --git a/static/common/img/homepage/icon_助力母校.png b/static/common/img/homepage/icon_助力母校.png
new file mode 100644
index 0000000..3403e99
Binary files /dev/null and b/static/common/img/homepage/icon_助力母校.png differ
diff --git a/static/common/img/homepage/icon_助力母校_gray.png b/static/common/img/homepage/icon_助力母校_gray.png
new file mode 100644
index 0000000..0f1dec8
Binary files /dev/null and b/static/common/img/homepage/icon_助力母校_gray.png differ
diff --git a/static/common/img/homepage/icon_勤工俭学.png b/static/common/img/homepage/icon_勤工俭学.png
new file mode 100644
index 0000000..a44ef13
Binary files /dev/null and b/static/common/img/homepage/icon_勤工俭学.png differ
diff --git a/static/common/img/homepage/icon_勤工俭学_gray.png b/static/common/img/homepage/icon_勤工俭学_gray.png
new file mode 100644
index 0000000..3a5be74
Binary files /dev/null and b/static/common/img/homepage/icon_勤工俭学_gray.png differ
diff --git a/static/common/img/homepage/icon_南小翼.png b/static/common/img/homepage/icon_南小翼.png
new file mode 100644
index 0000000..1ef422f
Binary files /dev/null and b/static/common/img/homepage/icon_南小翼.png differ
diff --git a/static/common/img/homepage/icon_南小翼_gray.png b/static/common/img/homepage/icon_南小翼_gray.png
new file mode 100644
index 0000000..d510aef
Binary files /dev/null and b/static/common/img/homepage/icon_南小翼_gray.png differ
diff --git a/static/common/img/homepage/icon_图书借阅.png b/static/common/img/homepage/icon_图书借阅.png
new file mode 100644
index 0000000..b36f76a
Binary files /dev/null and b/static/common/img/homepage/icon_图书借阅.png differ
diff --git a/static/common/img/homepage/icon_图书借阅_gray.png b/static/common/img/homepage/icon_图书借阅_gray.png
new file mode 100644
index 0000000..5ee6720
Binary files /dev/null and b/static/common/img/homepage/icon_图书借阅_gray.png differ
diff --git a/static/common/img/homepage/icon_就业帮助.png b/static/common/img/homepage/icon_就业帮助.png
new file mode 100644
index 0000000..c09d6bd
Binary files /dev/null and b/static/common/img/homepage/icon_就业帮助.png differ
diff --git a/static/common/img/homepage/icon_就业帮助_gray.png b/static/common/img/homepage/icon_就业帮助_gray.png
new file mode 100644
index 0000000..f32c755
Binary files /dev/null and b/static/common/img/homepage/icon_就业帮助_gray.png differ
diff --git a/static/common/img/homepage/icon_心愿单.png b/static/common/img/homepage/icon_心愿单.png
new file mode 100644
index 0000000..711acc4
Binary files /dev/null and b/static/common/img/homepage/icon_心愿单.png differ
diff --git a/static/common/img/homepage/icon_心愿单_gray.png b/static/common/img/homepage/icon_心愿单_gray.png
new file mode 100644
index 0000000..17e1d0e
Binary files /dev/null and b/static/common/img/homepage/icon_心愿单_gray.png differ
diff --git a/static/common/img/homepage/icon_报修.png b/static/common/img/homepage/icon_报修.png
new file mode 100644
index 0000000..2f57146
Binary files /dev/null and b/static/common/img/homepage/icon_报修.png differ
diff --git a/static/common/img/homepage/icon_报修_gray.png b/static/common/img/homepage/icon_报修_gray.png
new file mode 100644
index 0000000..fb9ebb1
Binary files /dev/null and b/static/common/img/homepage/icon_报修_gray.png differ
diff --git a/static/common/img/homepage/icon_查询档案.png b/static/common/img/homepage/icon_查询档案.png
new file mode 100644
index 0000000..5a21217
Binary files /dev/null and b/static/common/img/homepage/icon_查询档案.png differ
diff --git a/static/common/img/homepage/icon_查询档案_gray.png b/static/common/img/homepage/icon_查询档案_gray.png
new file mode 100644
index 0000000..fd207a6
Binary files /dev/null and b/static/common/img/homepage/icon_查询档案_gray.png differ
diff --git a/static/common/img/homepage/icon_校友会组织.png b/static/common/img/homepage/icon_校友会组织.png
new file mode 100644
index 0000000..9d01d40
Binary files /dev/null and b/static/common/img/homepage/icon_校友会组织.png differ
diff --git a/static/common/img/homepage/icon_校友会组织_gray.png b/static/common/img/homepage/icon_校友会组织_gray.png
new file mode 100644
index 0000000..8e53679
Binary files /dev/null and b/static/common/img/homepage/icon_校友会组织_gray.png differ
diff --git a/static/common/img/homepage/icon_校友卡.png b/static/common/img/homepage/icon_校友卡.png
new file mode 100644
index 0000000..a079290
Binary files /dev/null and b/static/common/img/homepage/icon_校友卡.png differ
diff --git a/static/common/img/homepage/icon_校友名片.png b/static/common/img/homepage/icon_校友名片.png
new file mode 100644
index 0000000..f9e45d0
Binary files /dev/null and b/static/common/img/homepage/icon_校友名片.png differ
diff --git a/static/common/img/homepage/icon_校友名片_gray.png b/static/common/img/homepage/icon_校友名片_gray.png
new file mode 100644
index 0000000..6353f07
Binary files /dev/null and b/static/common/img/homepage/icon_校友名片_gray.png differ
diff --git a/static/common/img/homepage/icon_校友活动.png b/static/common/img/homepage/icon_校友活动.png
new file mode 100644
index 0000000..33ced0d
Binary files /dev/null and b/static/common/img/homepage/icon_校友活动.png differ
diff --git a/static/common/img/homepage/icon_校友活动_gray.png b/static/common/img/homepage/icon_校友活动_gray.png
new file mode 100644
index 0000000..4871006
Binary files /dev/null and b/static/common/img/homepage/icon_校友活动_gray.png differ
diff --git a/static/common/img/homepage/icon_校园跑.png b/static/common/img/homepage/icon_校园跑.png
new file mode 100644
index 0000000..dd5e06d
Binary files /dev/null and b/static/common/img/homepage/icon_校园跑.png differ
diff --git a/static/common/img/homepage/icon_校园跑_gray.png b/static/common/img/homepage/icon_校园跑_gray.png
new file mode 100644
index 0000000..267da8e
Binary files /dev/null and b/static/common/img/homepage/icon_校园跑_gray.png differ
diff --git a/static/common/img/homepage/icon_活动报名.png b/static/common/img/homepage/icon_活动报名.png
new file mode 100644
index 0000000..7e59ea6
Binary files /dev/null and b/static/common/img/homepage/icon_活动报名.png differ
diff --git a/static/common/img/homepage/icon_活动报名_gray.png b/static/common/img/homepage/icon_活动报名_gray.png
new file mode 100644
index 0000000..8d967e6
Binary files /dev/null and b/static/common/img/homepage/icon_活动报名_gray.png differ
diff --git a/static/common/img/homepage/icon_电子校友卡.png b/static/common/img/homepage/icon_电子校友卡.png
new file mode 100644
index 0000000..cec4531
Binary files /dev/null and b/static/common/img/homepage/icon_电子校友卡.png differ
diff --git a/static/common/img/homepage/icon_电子校友卡_gray.png b/static/common/img/homepage/icon_电子校友卡_gray.png
new file mode 100644
index 0000000..12c2fec
Binary files /dev/null and b/static/common/img/homepage/icon_电子校友卡_gray.png differ
diff --git a/static/common/img/homepage/icon_缴费.png b/static/common/img/homepage/icon_缴费.png
new file mode 100644
index 0000000..0bf20d3
Binary files /dev/null and b/static/common/img/homepage/icon_缴费.png differ
diff --git a/static/common/img/homepage/icon_缴费_gray.png b/static/common/img/homepage/icon_缴费_gray.png
new file mode 100644
index 0000000..1b8b5fd
Binary files /dev/null and b/static/common/img/homepage/icon_缴费_gray.png differ
diff --git a/static/common/img/homepage/icon_网上购电.png b/static/common/img/homepage/icon_网上购电.png
new file mode 100644
index 0000000..b40fd74
Binary files /dev/null and b/static/common/img/homepage/icon_网上购电.png differ
diff --git a/static/common/img/homepage/icon_网上购电_gray.png b/static/common/img/homepage/icon_网上购电_gray.png
new file mode 100644
index 0000000..d2ebccb
Binary files /dev/null and b/static/common/img/homepage/icon_网上购电_gray.png differ
diff --git a/static/common/img/homepage/icon_迎新.png b/static/common/img/homepage/icon_迎新.png
new file mode 100644
index 0000000..3d59635
Binary files /dev/null and b/static/common/img/homepage/icon_迎新.png differ
diff --git a/static/common/img/homepage/icon_迎新_gray.png b/static/common/img/homepage/icon_迎新_gray.png
new file mode 100644
index 0000000..3b7ec8e
Binary files /dev/null and b/static/common/img/homepage/icon_迎新_gray.png differ
diff --git a/static/common/img/homepage/icon_返校预约.png b/static/common/img/homepage/icon_返校预约.png
new file mode 100644
index 0000000..4fc887c
Binary files /dev/null and b/static/common/img/homepage/icon_返校预约.png differ
diff --git a/static/common/img/homepage/icon_返校预约_gray.png b/static/common/img/homepage/icon_返校预约_gray.png
new file mode 100644
index 0000000..c568f07
Binary files /dev/null and b/static/common/img/homepage/icon_返校预约_gray.png differ
diff --git a/static/common/img/homepage/icon_选课.png b/static/common/img/homepage/icon_选课.png
new file mode 100644
index 0000000..b35c8ef
Binary files /dev/null and b/static/common/img/homepage/icon_选课.png differ
diff --git a/static/common/img/homepage/icon_选课_gray.png b/static/common/img/homepage/icon_选课_gray.png
new file mode 100644
index 0000000..be1659c
Binary files /dev/null and b/static/common/img/homepage/icon_选课_gray.png differ
diff --git a/static/common/img/homepage/image-photo1.png b/static/common/img/homepage/image-photo1.png
new file mode 100644
index 0000000..df4cf87
Binary files /dev/null and b/static/common/img/homepage/image-photo1.png differ
diff --git a/static/common/img/homepage/image-photo2.png b/static/common/img/homepage/image-photo2.png
new file mode 100644
index 0000000..643ea84
Binary files /dev/null and b/static/common/img/homepage/image-photo2.png differ
diff --git a/static/common/img/homepage/image-photo3.png b/static/common/img/homepage/image-photo3.png
new file mode 100644
index 0000000..67e8f6f
Binary files /dev/null and b/static/common/img/homepage/image-photo3.png differ
diff --git a/static/common/img/homepage/image-topic-avatar.png b/static/common/img/homepage/image-topic-avatar.png
new file mode 100644
index 0000000..f00d985
Binary files /dev/null and b/static/common/img/homepage/image-topic-avatar.png differ
diff --git a/static/common/img/homepage/image-topic-bg.png b/static/common/img/homepage/image-topic-bg.png
new file mode 100644
index 0000000..681b411
Binary files /dev/null and b/static/common/img/homepage/image-topic-bg.png differ
diff --git a/static/common/img/homepage/like-active.png b/static/common/img/homepage/like-active.png
new file mode 100644
index 0000000..f8a6bb0
Binary files /dev/null and b/static/common/img/homepage/like-active.png differ
diff --git a/static/common/img/homepage/like.png b/static/common/img/homepage/like.png
new file mode 100644
index 0000000..6e6689a
Binary files /dev/null and b/static/common/img/homepage/like.png differ
diff --git a/static/common/img/homepage/message.png b/static/common/img/homepage/message.png
new file mode 100644
index 0000000..1bae5eb
Binary files /dev/null and b/static/common/img/homepage/message.png differ
diff --git a/static/common/img/homepage/person-selected.png b/static/common/img/homepage/person-selected.png
new file mode 100644
index 0000000..5443640
Binary files /dev/null and b/static/common/img/homepage/person-selected.png differ
diff --git a/static/common/img/homepage/person.png b/static/common/img/homepage/person.png
new file mode 100644
index 0000000..b5124b2
Binary files /dev/null and b/static/common/img/homepage/person.png differ
diff --git a/static/common/img/homepage/released-selected.png b/static/common/img/homepage/released-selected.png
new file mode 100644
index 0000000..d55831b
Binary files /dev/null and b/static/common/img/homepage/released-selected.png differ
diff --git a/static/common/img/homepage/released.png b/static/common/img/homepage/released.png
new file mode 100644
index 0000000..6f16869
Binary files /dev/null and b/static/common/img/homepage/released.png differ
diff --git a/static/common/img/homepage/reply.png b/static/common/img/homepage/reply.png
new file mode 100644
index 0000000..3c076bb
Binary files /dev/null and b/static/common/img/homepage/reply.png differ
diff --git a/static/common/img/homepage/star.png b/static/common/img/homepage/star.png
new file mode 100644
index 0000000..cf83699
Binary files /dev/null and b/static/common/img/homepage/star.png differ
diff --git a/static/common/img/homepage/trash.png b/static/common/img/homepage/trash.png
new file mode 100644
index 0000000..78fedc2
Binary files /dev/null and b/static/common/img/homepage/trash.png differ
diff --git a/static/common/img/icon-happy-face.png b/static/common/img/icon-happy-face.png
new file mode 100644
index 0000000..9ed9571
Binary files /dev/null and b/static/common/img/icon-happy-face.png differ
diff --git a/static/common/img/icon-lineRounded.png b/static/common/img/icon-lineRounded.png
new file mode 100644
index 0000000..f63e2b9
Binary files /dev/null and b/static/common/img/icon-lineRounded.png differ
diff --git a/static/common/img/icon.png b/static/common/img/icon.png
new file mode 100644
index 0000000..aa3df38
Binary files /dev/null and b/static/common/img/icon.png differ
diff --git a/static/common/img/img.svg b/static/common/img/img.svg
new file mode 100644
index 0000000..e9e6591
--- /dev/null
+++ b/static/common/img/img.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1736730032577" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7247" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M906.666667 160v704h-768v-704h768z m-167.061334 366.4l-216.405333 180.096-140.565333-110.890667L202.666667 741.141333V800h640v-188.117333l-103.061334-85.482667zM842.666667 224h-640v434.837333l179.477333-145.130666 139.968 110.421333 217.450667-180.906667 103.104 85.504V224z m-437.333334 42.666667a96 96 0 1 1 0 192 96 96 0 0 1 0-192z m0 64a32 32 0 1 0 0 64 32 32 0 0 0 0-64z" fill="#1677FF" p-id="7248"></path></svg>
\ No newline at end of file
diff --git a/static/common/img/infoCircle.png b/static/common/img/infoCircle.png
new file mode 100644
index 0000000..d530808
Binary files /dev/null and b/static/common/img/infoCircle.png differ
diff --git a/static/common/img/interactionhiderimg.png b/static/common/img/interactionhiderimg.png
new file mode 100644
index 0000000..783914e
Binary files /dev/null and b/static/common/img/interactionhiderimg.png differ
diff --git a/static/common/img/location.png b/static/common/img/location.png
new file mode 100644
index 0000000..0fcec47
Binary files /dev/null and b/static/common/img/location.png differ
diff --git a/static/common/img/location.svg b/static/common/img/location.svg
new file mode 100644
index 0000000..b846af3
--- /dev/null
+++ b/static/common/img/location.svg
@@ -0,0 +1,8 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Line Rounded/Pin">
+<g id="Element">
+<path d="M14.7886 7.06226C14.7886 10.814 8.92652 14.8002 8.92652 14.8002C8.92652 14.8002 3.06445 10.814 3.06445 7.06226C3.06445 3.77951 5.81849 1.2002 8.92652 1.2002C12.0345 1.2002 14.7886 3.77951 14.7886 7.06226Z" stroke="black" stroke-opacity="0.6" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.92654 9.17261C10.0921 9.17261 11.0369 8.22778 11.0369 7.06227C11.0369 5.89676 10.0921 4.95192 8.92654 4.95192C7.76103 4.95192 6.8162 5.89676 6.8162 7.06227C6.8162 8.22778 7.76103 9.17261 8.92654 9.17261Z" stroke="black" stroke-opacity="0.6" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</g>
+</svg>
diff --git a/static/common/img/loginBg.png b/static/common/img/loginBg.png
new file mode 100644
index 0000000..2a64e74
Binary files /dev/null and b/static/common/img/loginBg.png differ
diff --git a/static/common/img/logo.png b/static/common/img/logo.png
new file mode 100644
index 0000000..b5771e2
Binary files /dev/null and b/static/common/img/logo.png differ
diff --git a/static/common/img/male.png b/static/common/img/male.png
new file mode 100644
index 0000000..68db854
Binary files /dev/null and b/static/common/img/male.png differ
diff --git a/static/common/img/map1.png b/static/common/img/map1.png
new file mode 100644
index 0000000..76717b4
Binary files /dev/null and b/static/common/img/map1.png differ
diff --git a/static/common/img/map_center.png b/static/common/img/map_center.png
new file mode 100644
index 0000000..09b9d6c
Binary files /dev/null and b/static/common/img/map_center.png differ
diff --git a/static/common/img/map_click.png b/static/common/img/map_click.png
new file mode 100644
index 0000000..5dcdfad
Binary files /dev/null and b/static/common/img/map_click.png differ
diff --git a/static/common/img/map_icon.png b/static/common/img/map_icon.png
new file mode 100644
index 0000000..fcf9cef
Binary files /dev/null and b/static/common/img/map_icon.png differ
diff --git a/static/common/img/map_new.png b/static/common/img/map_new.png
new file mode 100644
index 0000000..db31a16
Binary files /dev/null and b/static/common/img/map_new.png differ
diff --git a/static/common/img/message/admin.png b/static/common/img/message/admin.png
new file mode 100644
index 0000000..1f77de2
Binary files /dev/null and b/static/common/img/message/admin.png differ
diff --git a/static/common/img/message/attention.png b/static/common/img/message/attention.png
new file mode 100644
index 0000000..ca9c4bd
Binary files /dev/null and b/static/common/img/message/attention.png differ
diff --git a/static/common/img/message/interactive.png b/static/common/img/message/interactive.png
new file mode 100644
index 0000000..ac85dd5
Binary files /dev/null and b/static/common/img/message/interactive.png differ
diff --git a/static/common/img/message/system.png b/static/common/img/message/system.png
new file mode 100644
index 0000000..1a2d25b
Binary files /dev/null and b/static/common/img/message/system.png differ
diff --git a/static/common/img/msgclose.png b/static/common/img/msgclose.png
new file mode 100644
index 0000000..884a693
Binary files /dev/null and b/static/common/img/msgclose.png differ
diff --git a/static/common/img/msgopen.png b/static/common/img/msgopen.png
new file mode 100644
index 0000000..e657918
Binary files /dev/null and b/static/common/img/msgopen.png differ
diff --git a/static/common/img/my/account.png b/static/common/img/my/account.png
new file mode 100644
index 0000000..f9d4771
Binary files /dev/null and b/static/common/img/my/account.png differ
diff --git a/static/common/img/my/agreement.png b/static/common/img/my/agreement.png
new file mode 100644
index 0000000..0e86927
Binary files /dev/null and b/static/common/img/my/agreement.png differ
diff --git a/static/common/img/my/authenticated.png b/static/common/img/my/authenticated.png
new file mode 100644
index 0000000..104c972
Binary files /dev/null and b/static/common/img/my/authenticated.png differ
diff --git a/static/common/img/my/evaluation.png b/static/common/img/my/evaluation.png
new file mode 100644
index 0000000..3734b4a
Binary files /dev/null and b/static/common/img/my/evaluation.png differ
diff --git a/static/common/img/my/my-admin.png b/static/common/img/my/my-admin.png
new file mode 100644
index 0000000..0b999f3
Binary files /dev/null and b/static/common/img/my/my-admin.png differ
diff --git a/static/common/img/my/my-bg.png b/static/common/img/my/my-bg.png
new file mode 100644
index 0000000..56cb5e0
Binary files /dev/null and b/static/common/img/my/my-bg.png differ
diff --git a/static/common/img/my/my-certification.png b/static/common/img/my/my-certification.png
new file mode 100644
index 0000000..7b36950
Binary files /dev/null and b/static/common/img/my/my-certification.png differ
diff --git a/static/common/img/my/my-collection.png b/static/common/img/my/my-collection.png
new file mode 100644
index 0000000..586023d
Binary files /dev/null and b/static/common/img/my/my-collection.png differ
diff --git a/static/common/img/my/my-draft-box.png b/static/common/img/my/my-draft-box.png
new file mode 100644
index 0000000..01d9868
Binary files /dev/null and b/static/common/img/my/my-draft-box.png differ
diff --git a/static/common/img/my/my-education.png b/static/common/img/my/my-education.png
new file mode 100644
index 0000000..b720a38
Binary files /dev/null and b/static/common/img/my/my-education.png differ
diff --git a/static/common/img/my/my-enterprises.png b/static/common/img/my/my-enterprises.png
new file mode 100644
index 0000000..6a0fc18
Binary files /dev/null and b/static/common/img/my/my-enterprises.png differ
diff --git a/static/common/img/my/my-history.png b/static/common/img/my/my-history.png
new file mode 100644
index 0000000..4da9427
Binary files /dev/null and b/static/common/img/my/my-history.png differ
diff --git a/static/common/img/my/my-identity.png b/static/common/img/my/my-identity.png
new file mode 100644
index 0000000..6571822
Binary files /dev/null and b/static/common/img/my/my-identity.png differ
diff --git a/static/common/img/my/my-publish.png b/static/common/img/my/my-publish.png
new file mode 100644
index 0000000..249b83f
Binary files /dev/null and b/static/common/img/my/my-publish.png differ
diff --git a/static/common/img/my/my-resume.png b/static/common/img/my/my-resume.png
new file mode 100644
index 0000000..3fb7459
Binary files /dev/null and b/static/common/img/my/my-resume.png differ
diff --git a/static/common/img/my/my-return-school.png b/static/common/img/my/my-return-school.png
new file mode 100644
index 0000000..94cd4de
Binary files /dev/null and b/static/common/img/my/my-return-school.png differ
diff --git a/static/common/img/my/my-setting.png b/static/common/img/my/my-setting.png
new file mode 100644
index 0000000..645af9f
Binary files /dev/null and b/static/common/img/my/my-setting.png differ
diff --git a/static/common/img/my/my-wish.png b/static/common/img/my/my-wish.png
new file mode 100644
index 0000000..69292d0
Binary files /dev/null and b/static/common/img/my/my-wish.png differ
diff --git a/static/common/img/my/mybg1.png b/static/common/img/my/mybg1.png
new file mode 100644
index 0000000..d7fcff3
Binary files /dev/null and b/static/common/img/my/mybg1.png differ
diff --git a/static/common/img/my/mybg10.png b/static/common/img/my/mybg10.png
new file mode 100644
index 0000000..ec28f26
Binary files /dev/null and b/static/common/img/my/mybg10.png differ
diff --git a/static/common/img/my/mybg11.png b/static/common/img/my/mybg11.png
new file mode 100644
index 0000000..aaeb411
Binary files /dev/null and b/static/common/img/my/mybg11.png differ
diff --git a/static/common/img/my/mybg12.png b/static/common/img/my/mybg12.png
new file mode 100644
index 0000000..70ea7dd
Binary files /dev/null and b/static/common/img/my/mybg12.png differ
diff --git a/static/common/img/my/mybg13.png b/static/common/img/my/mybg13.png
new file mode 100644
index 0000000..360cbf7
Binary files /dev/null and b/static/common/img/my/mybg13.png differ
diff --git a/static/common/img/my/mybg14.png b/static/common/img/my/mybg14.png
new file mode 100644
index 0000000..26dfd1c
Binary files /dev/null and b/static/common/img/my/mybg14.png differ
diff --git a/static/common/img/my/mybg15.png b/static/common/img/my/mybg15.png
new file mode 100644
index 0000000..90639b6
Binary files /dev/null and b/static/common/img/my/mybg15.png differ
diff --git a/static/common/img/my/mybg16.png b/static/common/img/my/mybg16.png
new file mode 100644
index 0000000..935427a
Binary files /dev/null and b/static/common/img/my/mybg16.png differ
diff --git a/static/common/img/my/mybg17.png b/static/common/img/my/mybg17.png
new file mode 100644
index 0000000..79ca872
Binary files /dev/null and b/static/common/img/my/mybg17.png differ
diff --git a/static/common/img/my/mybg18.png b/static/common/img/my/mybg18.png
new file mode 100644
index 0000000..7419d90
Binary files /dev/null and b/static/common/img/my/mybg18.png differ
diff --git a/static/common/img/my/mybg19.png b/static/common/img/my/mybg19.png
new file mode 100644
index 0000000..8226e74
Binary files /dev/null and b/static/common/img/my/mybg19.png differ
diff --git a/static/common/img/my/mybg2.png b/static/common/img/my/mybg2.png
new file mode 100644
index 0000000..ea4538d
Binary files /dev/null and b/static/common/img/my/mybg2.png differ
diff --git a/static/common/img/my/mybg20.png b/static/common/img/my/mybg20.png
new file mode 100644
index 0000000..d8f41b2
Binary files /dev/null and b/static/common/img/my/mybg20.png differ
diff --git a/static/common/img/my/mybg3.png b/static/common/img/my/mybg3.png
new file mode 100644
index 0000000..afaefd1
Binary files /dev/null and b/static/common/img/my/mybg3.png differ
diff --git a/static/common/img/my/mybg4.png b/static/common/img/my/mybg4.png
new file mode 100644
index 0000000..de6eb57
Binary files /dev/null and b/static/common/img/my/mybg4.png differ
diff --git a/static/common/img/my/mybg5.png b/static/common/img/my/mybg5.png
new file mode 100644
index 0000000..9053582
Binary files /dev/null and b/static/common/img/my/mybg5.png differ
diff --git a/static/common/img/my/mybg6.png b/static/common/img/my/mybg6.png
new file mode 100644
index 0000000..4c3cbc3
Binary files /dev/null and b/static/common/img/my/mybg6.png differ
diff --git a/static/common/img/my/mybg7.png b/static/common/img/my/mybg7.png
new file mode 100644
index 0000000..77faba4
Binary files /dev/null and b/static/common/img/my/mybg7.png differ
diff --git a/static/common/img/my/mybg8.png b/static/common/img/my/mybg8.png
new file mode 100644
index 0000000..ac481c6
Binary files /dev/null and b/static/common/img/my/mybg8.png differ
diff --git a/static/common/img/my/mybg9.png b/static/common/img/my/mybg9.png
new file mode 100644
index 0000000..b99b71f
Binary files /dev/null and b/static/common/img/my/mybg9.png differ
diff --git a/static/common/img/my/person.png b/static/common/img/my/person.png
new file mode 100644
index 0000000..68cd7ad
Binary files /dev/null and b/static/common/img/my/person.png differ
diff --git a/static/common/img/my/privacy.png b/static/common/img/my/privacy.png
new file mode 100644
index 0000000..8d75e21
Binary files /dev/null and b/static/common/img/my/privacy.png differ
diff --git a/static/common/img/my/setting.png b/static/common/img/my/setting.png
new file mode 100644
index 0000000..3660005
Binary files /dev/null and b/static/common/img/my/setting.png differ
diff --git a/static/common/img/my/unauthenticated.png b/static/common/img/my/unauthenticated.png
new file mode 100644
index 0000000..14f37ed
Binary files /dev/null and b/static/common/img/my/unauthenticated.png differ
diff --git a/static/common/img/mybackimg.png b/static/common/img/mybackimg.png
new file mode 100644
index 0000000..d7ec223
Binary files /dev/null and b/static/common/img/mybackimg.png differ
diff --git a/static/common/img/noData/error-data.png b/static/common/img/noData/error-data.png
new file mode 100644
index 0000000..5feadb3
Binary files /dev/null and b/static/common/img/noData/error-data.png differ
diff --git a/static/common/img/noData/error-net.png b/static/common/img/noData/error-net.png
new file mode 100644
index 0000000..38728e4
Binary files /dev/null and b/static/common/img/noData/error-net.png differ
diff --git a/static/common/img/noData/maintenance.png b/static/common/img/noData/maintenance.png
new file mode 100644
index 0000000..7ac4d57
Binary files /dev/null and b/static/common/img/noData/maintenance.png differ
diff --git a/static/common/img/noData/no-attachment-resume.png b/static/common/img/noData/no-attachment-resume.png
new file mode 100644
index 0000000..c3e7b33
Binary files /dev/null and b/static/common/img/noData/no-attachment-resume.png differ
diff --git a/static/common/img/noData/no-collection.png b/static/common/img/noData/no-collection.png
new file mode 100644
index 0000000..1b1b564
Binary files /dev/null and b/static/common/img/noData/no-collection.png differ
diff --git a/static/common/img/noData/no-comments.png b/static/common/img/noData/no-comments.png
new file mode 100644
index 0000000..0833c3a
Binary files /dev/null and b/static/common/img/noData/no-comments.png differ
diff --git a/static/common/img/noData/no-content.png b/static/common/img/noData/no-content.png
new file mode 100644
index 0000000..fba7d7a
Binary files /dev/null and b/static/common/img/noData/no-content.png differ
diff --git a/static/common/img/noData/no-data.png b/static/common/img/noData/no-data.png
new file mode 100644
index 0000000..de4b9c9
Binary files /dev/null and b/static/common/img/noData/no-data.png differ
diff --git a/static/common/img/noData/no-file.png b/static/common/img/noData/no-file.png
new file mode 100644
index 0000000..d2768af
Binary files /dev/null and b/static/common/img/noData/no-file.png differ
diff --git a/static/common/img/noData/no-friends.png b/static/common/img/noData/no-friends.png
new file mode 100644
index 0000000..bf90ee3
Binary files /dev/null and b/static/common/img/noData/no-friends.png differ
diff --git a/static/common/img/noData/no-internet.png b/static/common/img/noData/no-internet.png
new file mode 100644
index 0000000..1820a12
Binary files /dev/null and b/static/common/img/noData/no-internet.png differ
diff --git a/static/common/img/noData/no-message.png b/static/common/img/noData/no-message.png
new file mode 100644
index 0000000..434a4f1
Binary files /dev/null and b/static/common/img/noData/no-message.png differ
diff --git a/static/common/img/noData/no-permissions.png b/static/common/img/noData/no-permissions.png
new file mode 100644
index 0000000..e6a0e6e
Binary files /dev/null and b/static/common/img/noData/no-permissions.png differ
diff --git a/static/common/img/noData/no-picture.png b/static/common/img/noData/no-picture.png
new file mode 100644
index 0000000..adc984c
Binary files /dev/null and b/static/common/img/noData/no-picture.png differ
diff --git a/static/common/img/noData/no-search.png b/static/common/img/noData/no-search.png
new file mode 100644
index 0000000..cc9a5a2
Binary files /dev/null and b/static/common/img/noData/no-search.png differ
diff --git a/static/common/img/noDataNew/error-data.png b/static/common/img/noDataNew/error-data.png
new file mode 100644
index 0000000..1be79c6
Binary files /dev/null and b/static/common/img/noDataNew/error-data.png differ
diff --git a/static/common/img/noDataNew/error-net.png b/static/common/img/noDataNew/error-net.png
new file mode 100644
index 0000000..9de7ec4
Binary files /dev/null and b/static/common/img/noDataNew/error-net.png differ
diff --git a/static/common/img/noDataNew/maintenance.png b/static/common/img/noDataNew/maintenance.png
new file mode 100644
index 0000000..386affd
Binary files /dev/null and b/static/common/img/noDataNew/maintenance.png differ
diff --git a/static/common/img/noDataNew/no-attachment-resume.png b/static/common/img/noDataNew/no-attachment-resume.png
new file mode 100644
index 0000000..948dcb4
Binary files /dev/null and b/static/common/img/noDataNew/no-attachment-resume.png differ
diff --git a/static/common/img/noDataNew/no-collection.png b/static/common/img/noDataNew/no-collection.png
new file mode 100644
index 0000000..2067652
Binary files /dev/null and b/static/common/img/noDataNew/no-collection.png differ
diff --git a/static/common/img/noDataNew/no-comments.png b/static/common/img/noDataNew/no-comments.png
new file mode 100644
index 0000000..db72e09
Binary files /dev/null and b/static/common/img/noDataNew/no-comments.png differ
diff --git a/static/common/img/noDataNew/no-content.png b/static/common/img/noDataNew/no-content.png
new file mode 100644
index 0000000..216580d
Binary files /dev/null and b/static/common/img/noDataNew/no-content.png differ
diff --git a/static/common/img/noDataNew/no-data.png b/static/common/img/noDataNew/no-data.png
new file mode 100644
index 0000000..00dc8b0
Binary files /dev/null and b/static/common/img/noDataNew/no-data.png differ
diff --git a/static/common/img/noDataNew/no-file.png b/static/common/img/noDataNew/no-file.png
new file mode 100644
index 0000000..dd84027
Binary files /dev/null and b/static/common/img/noDataNew/no-file.png differ
diff --git a/static/common/img/noDataNew/no-friends.png b/static/common/img/noDataNew/no-friends.png
new file mode 100644
index 0000000..b08e669
Binary files /dev/null and b/static/common/img/noDataNew/no-friends.png differ
diff --git a/static/common/img/noDataNew/no-internet.png b/static/common/img/noDataNew/no-internet.png
new file mode 100644
index 0000000..ad0ebb3
Binary files /dev/null and b/static/common/img/noDataNew/no-internet.png differ
diff --git a/static/common/img/noDataNew/no-message.png b/static/common/img/noDataNew/no-message.png
new file mode 100644
index 0000000..718e338
Binary files /dev/null and b/static/common/img/noDataNew/no-message.png differ
diff --git a/static/common/img/noDataNew/no-permissions.png b/static/common/img/noDataNew/no-permissions.png
new file mode 100644
index 0000000..b720457
Binary files /dev/null and b/static/common/img/noDataNew/no-permissions.png differ
diff --git a/static/common/img/noDataNew/no-picture.png b/static/common/img/noDataNew/no-picture.png
new file mode 100644
index 0000000..65f1874
Binary files /dev/null and b/static/common/img/noDataNew/no-picture.png differ
diff --git a/static/common/img/noDataNew/no-search.png b/static/common/img/noDataNew/no-search.png
new file mode 100644
index 0000000..a293a97
Binary files /dev/null and b/static/common/img/noDataNew/no-search.png differ
diff --git a/static/common/img/pdf.svg b/static/common/img/pdf.svg
new file mode 100644
index 0000000..678098e
--- /dev/null
+++ b/static/common/img/pdf.svg
@@ -0,0 +1,23 @@
+<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="file type" clip-path="url(#clip0_1691_48410)">
+<g id="Container">
+<g id="Document">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M3.6665 0.75C3.11422 0.75 2.6665 1.19772 2.6665 1.75V31.75C2.6665 32.3023 3.11422 32.75 3.6665 32.75H28.3332C28.8855 32.75 29.3332 32.3023 29.3332 31.75V6.08333L23.9998 0.75H3.6665Z" fill="#E4E7EC"/>
+<path id="Intersect" fill-rule="evenodd" clip-rule="evenodd" d="M23.9998 0.75V6.08333H29.3331L23.9998 0.75Z" fill="#98A2B3"/>
+</g>
+<g id="Attachment Format">
+<rect x="1.33325" y="14.0835" width="29.3333" height="13.3333" rx="1" fill="#CC400C"/>
+<g id="PDF">
+<path d="M8.66357 23.6595V17.8413H10.8454C11.2924 17.8413 11.6674 17.9246 11.9704 18.0913C12.2753 18.258 12.5054 18.4871 12.6607 18.7788C12.8179 19.0686 12.8965 19.3981 12.8965 19.7674C12.8965 20.1406 12.8179 20.472 12.6607 20.7618C12.5035 21.0515 12.2715 21.2798 11.9647 21.4464C11.6579 21.6112 11.2801 21.6936 10.8312 21.6936H9.38517V20.8271H10.6891C10.9505 20.8271 11.1645 20.7816 11.3312 20.6907C11.4979 20.5998 11.621 20.4748 11.7005 20.3157C11.7819 20.1566 11.8227 19.9739 11.8227 19.7674C11.8227 19.561 11.7819 19.3792 11.7005 19.222C11.621 19.0648 11.4969 18.9426 11.3283 18.8555C11.1617 18.7665 10.9467 18.722 10.6835 18.722H9.71755V23.6595H8.66357Z" fill="white"/>
+<path d="M15.7836 23.6595H13.812V17.8413H15.8234C16.401 17.8413 16.8972 17.9578 17.312 18.1907C17.7287 18.4218 18.0488 18.7542 18.2722 19.1879C18.4957 19.6216 18.6075 20.1406 18.6075 20.7447C18.6075 21.3508 18.4948 21.8716 18.2694 22.3072C18.0459 22.7428 17.723 23.0771 17.3006 23.3101C16.8802 23.543 16.3745 23.6595 15.7836 23.6595ZM14.866 22.7476H15.7325C16.1378 22.7476 16.4758 22.6737 16.7467 22.526C17.0175 22.3763 17.2211 22.1538 17.3575 21.8584C17.4938 21.561 17.562 21.1898 17.562 20.7447C17.562 20.2996 17.4938 19.9303 17.3575 19.6368C17.2211 19.3413 17.0194 19.1207 16.7524 18.9748C16.4872 18.8271 16.1577 18.7532 15.7637 18.7532H14.866V22.7476Z" fill="white"/>
+<path d="M19.6089 23.6595V17.8413H23.3362V18.7248H20.6629V20.3044H23.0805V21.1879H20.6629V23.6595H19.6089Z" fill="white"/>
+</g>
+</g>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1691_48410">
+<rect width="32" height="32" fill="white" transform="translate(0 0.75)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/static/common/img/picture.png b/static/common/img/picture.png
new file mode 100644
index 0000000..b2e4d85
Binary files /dev/null and b/static/common/img/picture.png differ
diff --git a/static/common/img/qiyeicon.png b/static/common/img/qiyeicon.png
new file mode 100644
index 0000000..b9c7e45
Binary files /dev/null and b/static/common/img/qiyeicon.png differ
diff --git a/static/common/img/refresh.png b/static/common/img/refresh.png
new file mode 100644
index 0000000..45fb990
Binary files /dev/null and b/static/common/img/refresh.png differ
diff --git a/static/common/img/result-error.png b/static/common/img/result-error.png
new file mode 100644
index 0000000..44e1bb7
Binary files /dev/null and b/static/common/img/result-error.png differ
diff --git a/static/common/img/result-success.png b/static/common/img/result-success.png
new file mode 100644
index 0000000..0f2099a
Binary files /dev/null and b/static/common/img/result-success.png differ
diff --git a/static/common/img/resume.svg b/static/common/img/resume.svg
new file mode 100644
index 0000000..7f5f408
--- /dev/null
+++ b/static/common/img/resume.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1736481425548" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5553" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M906.54475 1023.296484H245.559178a31.978015 31.978015 0 0 1 0-63.956031h651.967772V63.95603H254.576978v791.83961a31.978015 31.978015 0 0 1-63.95603 0V56.537131c0-31.210543 24.623072-56.537131 54.93823-56.537131h660.985572c30.315158 0 54.93823 25.326588 54.93823 56.537131v910.158266a55.769658 55.769658 0 0 1-54.93823 56.601087z" p-id="5554" fill="#ffffff"></path><path d="M222.407095 1023.296484H110.03635c-27.053401 0-47.51933-24.623072-47.51933-57.240647V264.650053c0-32.617575 20.401974-57.240647 47.51933-57.240647h25.198676a31.978015 31.978015 0 0 1 0 63.95603h-8.506152L126.47305 959.340453h95.934045a31.978015 31.978015 0 0 1 0 63.956031zM751.963025 481.013303h-351.758166c-35.239773 0-63.95603-28.716258-63.95603-63.95603v-95.934045c0-35.239773 28.716258-63.95603 63.95603-63.95603h351.758166c35.303729 0 63.95603 28.716258 63.956031 63.95603v95.934045c0 35.239773-28.652302 63.95603-63.956031 63.95603z m0-63.95603v31.978015-31.978015z m-351.822122-95.934045v95.934045h351.758166l0.063956-95.934045H400.140903zM767.824121 639.560302H384.08794a31.978015 31.978015 0 0 1 0-63.95603h383.736181a31.978015 31.978015 0 0 1 0 63.95603zM767.824121 767.472363H384.08794a31.978015 31.978015 0 0 1 0-63.95603h383.736181a31.978015 31.978015 0 0 1 0 63.95603z" p-id="5555" fill="#ffffff"></path></svg>
\ No newline at end of file
diff --git a/static/common/img/right-arrow.png b/static/common/img/right-arrow.png
new file mode 100644
index 0000000..a150921
Binary files /dev/null and b/static/common/img/right-arrow.png differ
diff --git a/static/common/img/role1.png b/static/common/img/role1.png
new file mode 100644
index 0000000..06c5d8f
Binary files /dev/null and b/static/common/img/role1.png differ
diff --git a/static/common/img/role2.png b/static/common/img/role2.png
new file mode 100644
index 0000000..d117545
Binary files /dev/null and b/static/common/img/role2.png differ
diff --git a/static/common/img/role3.png b/static/common/img/role3.png
new file mode 100644
index 0000000..065b718
Binary files /dev/null and b/static/common/img/role3.png differ
diff --git a/static/common/img/row_right.png b/static/common/img/row_right.png
new file mode 100644
index 0000000..2abe8a6
Binary files /dev/null and b/static/common/img/row_right.png differ
diff --git a/static/common/img/search.png b/static/common/img/search.png
new file mode 100644
index 0000000..5086ef7
Binary files /dev/null and b/static/common/img/search.png differ
diff --git a/static/common/img/search.svg b/static/common/img/search.svg
new file mode 100644
index 0000000..e400fa3
--- /dev/null
+++ b/static/common/img/search.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Line Rounded/Search">
+<path id="Element" d="M18 18L13.8621 13.8621M2 8.89655C2 5.08769 5.08769 2 8.89655 2C12.7054 2 15.7931 5.08769 15.7931 8.89655C15.7931 12.7054 12.7054 15.7931 8.89655 15.7931C5.08769 15.7931 2 12.7054 2 8.89655Z" stroke="#19213D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/static/common/img/select.png b/static/common/img/select.png
new file mode 100644
index 0000000..a6fd875
Binary files /dev/null and b/static/common/img/select.png differ
diff --git a/static/common/img/setingIcon.png b/static/common/img/setingIcon.png
new file mode 100644
index 0000000..eccbace
Binary files /dev/null and b/static/common/img/setingIcon.png differ
diff --git a/static/common/img/sheet.svg b/static/common/img/sheet.svg
new file mode 100644
index 0000000..93abf1f
--- /dev/null
+++ b/static/common/img/sheet.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1736735498625" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8256" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M395.21211 182.914448c0 62.669318 49.541323 113.472378 110.642936 113.472378 61.093427 0 110.652146-50.80306 110.65214601-113.472378 0-62.685691-49.559742-113.487727-110.65214601-113.487727C444.75241 69.426721 395.21211 120.22978 395.21211 182.914448zM395.21211 523.34693101c0 62.668295 49.541323 113.487727 110.642936 113.48772699 61.093427 0 110.652146-50.820456 110.652146-113.487727 0-62.669318-49.559742-113.472378-110.652146-113.472378C444.75241 409.874553 395.21211 460.67761301 395.21211 523.34693101zM395.21211 841.084529c0 62.686714 49.541323 113.488751 110.642936 113.488751 61.093427 0 110.652146-50.80203599 110.65214601-113.488751 0-62.669318-49.559742-113.471354-110.65214601-113.471354C444.75241 727.614198 395.21211 778.416234 395.21211 841.084529z" p-id="8257" fill="#707070"></path></svg>
\ No newline at end of file
diff --git a/static/common/img/shoolIcon.png b/static/common/img/shoolIcon.png
new file mode 100644
index 0000000..b872a3c
Binary files /dev/null and b/static/common/img/shoolIcon.png differ
diff --git a/static/common/img/student.png b/static/common/img/student.png
new file mode 100644
index 0000000..517f03b
Binary files /dev/null and b/static/common/img/student.png differ
diff --git a/static/common/img/systemHeaderimg.png b/static/common/img/systemHeaderimg.png
new file mode 100644
index 0000000..321f5df
Binary files /dev/null and b/static/common/img/systemHeaderimg.png differ
diff --git a/static/common/img/teacher.png b/static/common/img/teacher.png
new file mode 100644
index 0000000..852b8eb
Binary files /dev/null and b/static/common/img/teacher.png differ
diff --git a/static/common/img/teacherIcon.png b/static/common/img/teacherIcon.png
new file mode 100644
index 0000000..c8c1c27
Binary files /dev/null and b/static/common/img/teacherIcon.png differ
diff --git a/static/common/img/upload.svg b/static/common/img/upload.svg
new file mode 100644
index 0000000..e4f091c
--- /dev/null
+++ b/static/common/img/upload.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1736481409723" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4277" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M153.6 902.656a32.256 32.256 0 0 1 0-64h716.8a32.256 32.256 0 0 1 0 64z m390.656-665.6v494.592a32.256 32.256 0 0 1-64 0V237.056L236.032 481.28a31.744 31.744 0 1 1-45.056-45.056l294.912-295.424a36.864 36.864 0 0 1 51.2 0l294.912 294.912a31.744 31.744 0 0 1-45.056 45.056z" fill="#ffffff" p-id="4278"></path></svg>
\ No newline at end of file
diff --git a/static/common/img/wenjuan.png b/static/common/img/wenjuan.png
new file mode 100644
index 0000000..532f84a
Binary files /dev/null and b/static/common/img/wenjuan.png differ
diff --git a/static/common/img/wishlistBackImg.png b/static/common/img/wishlistBackImg.png
new file mode 100644
index 0000000..b3747dc
Binary files /dev/null and b/static/common/img/wishlistBackImg.png differ
diff --git a/static/common/img/word.svg b/static/common/img/word.svg
new file mode 100644
index 0000000..eeb757b
--- /dev/null
+++ b/static/common/img/word.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1736729953077" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6220" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M791.94 155.36H332.48c-42.23 0-76.54 34.31-76.54 76.54v76.55h-51.03c-28.16 0-51.04 22.87-51.04 51.03v306.37c0 28.15 22.88 51.02 51.04 51.02h51.03v76.54c0 42.24 34.32 76.55 76.54 76.55h459.46c42.23 0 76.54-34.32 76.54-76.54V231.9c0.1-42.24-34.31-76.54-76.54-76.54z m-547.68 298.6h40.28l26.04 93.58h5.7l29.16-93.58h34.45l29.02 93.71h6.24l26.18-93.71h40.41l-40.41 133.72H384.1l-19.53-70.25h-5.43l-19.26 69.98h-55.74l-39.88-133.45zM817.45 793.5c-0.01 14.09-11.42 25.5-25.51 25.51H332.48c-14.09-0.01-25.5-11.43-25.51-25.51v-76.54h204.21c28.15 0 51.03-22.88 51.03-51.03V614.9H740.9c14.09-0.01 25.51-11.43 25.52-25.52-0.02-14.09-11.43-25.5-25.52-25.51H562.21v-51.03H740.9c14.09-0.01 25.51-11.43 25.52-25.52-0.01-14.09-11.43-25.5-25.52-25.52H562.21v-51.03H740.9c14.09-0.01 25.51-11.43 25.52-25.51-0.01-14.09-11.43-25.51-25.52-25.52H562.21c0-28.16-22.89-51.03-51.03-51.03H306.97v-76.54c0.01-14.09 11.43-25.5 25.51-25.52h459.46c14.08 0.01 25.5 11.43 25.51 25.52V793.5z m0 0" fill="#54A0FF" p-id="6221"></path></svg>
\ No newline at end of file
diff --git a/static/common/img/上传个人工作证.png b/static/common/img/上传个人工作证.png
new file mode 100644
index 0000000..bb59589
Binary files /dev/null and b/static/common/img/上传个人工作证.png differ
diff --git a/static/common/img/上传营业执照.png b/static/common/img/上传营业执照.png
new file mode 100644
index 0000000..d937423
Binary files /dev/null and b/static/common/img/上传营业执照.png differ
diff --git a/static/common/img/上传身份证反面.png b/static/common/img/上传身份证反面.png
new file mode 100644
index 0000000..7f90c6e
Binary files /dev/null and b/static/common/img/上传身份证反面.png differ
diff --git a/static/common/img/上传身份证正面.png b/static/common/img/上传身份证正面.png
new file mode 100644
index 0000000..6c4071a
Binary files /dev/null and b/static/common/img/上传身份证正面.png differ
diff --git a/static/common/img/个人工作证.png b/static/common/img/个人工作证.png
new file mode 100644
index 0000000..345ac90
Binary files /dev/null and b/static/common/img/个人工作证.png differ
diff --git a/static/common/img/企业营业执照.png b/static/common/img/企业营业执照.png
new file mode 100644
index 0000000..6a14ed0
Binary files /dev/null and b/static/common/img/企业营业执照.png differ
diff --git a/static/common/img/学生证.png b/static/common/img/学生证.png
new file mode 100644
index 0000000..125263b
Binary files /dev/null and b/static/common/img/学生证.png differ
diff --git a/static/common/img/录取通知书.png b/static/common/img/录取通知书.png
new file mode 100644
index 0000000..8c08aff
Binary files /dev/null and b/static/common/img/录取通知书.png differ
diff --git a/static/common/img/校园卡.png b/static/common/img/校园卡.png
new file mode 100644
index 0000000..88ec73b
Binary files /dev/null and b/static/common/img/校园卡.png differ
diff --git a/static/common/img/毕业证.png b/static/common/img/毕业证.png
new file mode 100644
index 0000000..340e6af
Binary files /dev/null and b/static/common/img/毕业证.png differ
diff --git a/static/common/img/身份证反面.png b/static/common/img/身份证反面.png
new file mode 100644
index 0000000..74f6dcf
Binary files /dev/null and b/static/common/img/身份证反面.png differ
diff --git a/static/common/img/身份证正面.png b/static/common/img/身份证正面.png
new file mode 100644
index 0000000..6c8aca1
Binary files /dev/null and b/static/common/img/身份证正面.png differ
diff --git a/static/common/js/common.js b/static/common/js/common.js
new file mode 100644
index 0000000..a8716f9
--- /dev/null
+++ b/static/common/js/common.js
@@ -0,0 +1,30 @@
+// base64转文件流 
+function base64toFile(dataurl, filename = 'file') {
+    let arr = dataurl.split(',')
+    let mime = arr[0].match(/:(.*?);/)[1]
+    let suffix = mime.split('/')[1]
+    let bstr = atob(arr[1])
+    let n = bstr.length
+    let u8arr = new Uint8Array(n)
+    while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
+    }
+
+    return new File([u8arr], `${filename}.${suffix}`, {
+        type: mime
+    })
+}
+
+// 文件流转base64
+function filetoBase64(file) {
+    let reader = new FileReader(); //实例化文件读取对象
+    reader.readAsDataURL(file); //将文件读取为 DataURL,也就是base64编码
+    reader.onload = (e) => { //文件读取成功完成时触发
+        let dataURL = e.target.result; //获得文件读取成功后的DataURL,也就是base64编码
+        // console.log(dataURL);
+    }
+}
+export default {
+    base64toFile,
+    filetoBase64
+}
\ No newline at end of file
diff --git a/static/common/js/config.js b/static/common/js/config.js
new file mode 100644
index 0000000..200f1db
--- /dev/null
+++ b/static/common/js/config.js
@@ -0,0 +1,18 @@
+export default {
+	//不需要登录的页面,白名单
+	whiteList: [
+		"/pages/login/login/login",
+		"/pages/login/register/register",
+		"/pages/login/confirmPwd/confirmPwd",
+		"/pages/login/ForgetPassword/ForgetPassword",
+		"/pages/my/BackCodeLook/BackCodeLook",
+		"/pages/my/BackSuccess/BackSuccess",
+		//......
+
+		'/pages/webview/index',
+		"/pages/login/recognitionResult/recognitionResult",
+		'/pages/login/recognitionResult/recognitionFailed'
+	],
+	//登录页
+	loginPage:"/pages/login/login/login"
+}
\ No newline at end of file
diff --git a/static/common/js/emoji.js b/static/common/js/emoji.js
new file mode 100644
index 0000000..d7e9281
--- /dev/null
+++ b/static/common/js/emoji.js
@@ -0,0 +1,1422 @@
+export default[
+	"😀",
+	"😁",
+	"😂",
+	"😃",
+	"😄",
+	"😅",
+	"😆",
+	"😇",
+	"😈",
+	"😉",
+	"😊",
+	"😋",
+	"😌",
+	"😍",
+	"😎",
+	"😏",
+	"😐",
+	"😑",
+	"😒",
+	"😓",
+	"😔",
+	"😕",
+	"😖",
+	"😗",
+	"😘",
+	"😙",
+	"😚",
+	"😛",
+	"😜",
+	"😝",
+	"😞",
+	"😟",
+	"😠",
+	"😡",
+	"😢",
+	"😣",
+	"😤",
+	"😥",
+	"😦",
+	"😧",
+	"😨",
+	"😩",
+	"😪",
+	"😫",
+	"😬",
+	"😭",
+	"😮",
+	"😯",
+	"😰",
+	"😱",
+	"😲",
+	"😳",
+	"😴",
+	"😵",
+	"😶",
+	"😷",
+	"😸",
+	"😹",
+	"😺",
+	"😻",
+	"😼",
+	"😽",
+	"😾",
+	"😿",
+	"🙀",
+	"🙁",
+	"🙂",
+	"🙃",
+	"🙄",
+	"#️⃣",
+	"*️⃣",
+	"0️⃣",
+	"1️⃣",
+	"2️⃣",
+	"3️⃣",
+	"4️⃣",
+	"5️⃣",
+	"6️⃣",
+	"7️⃣",
+	"8️⃣",
+	"9️⃣",
+	"©️",
+	"®️",
+	"🀄",
+	"🃏",
+	"🅰️",
+	"🅱️",
+	"🅾️",
+	"🅿️",
+	"🆎",
+	"🆑",
+	"🆒",
+	"🆓",
+	"🆔",
+	"🆕",
+	"🆖",
+	"🆗",
+	"🆘",
+	"🆙",
+	"🆚",
+	"🈁",
+	"🈂️",
+	"🉐",
+	"🉑",
+	"🌀",
+	"🌁",
+	"🌂",
+	"🌃",
+	"🌄",
+	// "🈚",
+	// "🈯",
+	// "🈲",
+	// "🈳",
+	// "🈴",
+	// "🈵",
+	// "🈶",
+	// "🈷️",
+	// "🈸",
+	// "🈹",
+	// "🈺",
+	// "🌅",
+	// "🌆",
+	// "🌇",
+	// "🌈",
+	// "🌉",
+	// "🌊",
+	// "🌋",
+	// "🌌",
+	// "🌍",
+	// "🌎",
+	// "🌏",
+	// "🌐",
+	// "🌑",
+	// "🌒",
+	// "🌓",
+	// "🌔",
+	// "🌕",
+	// "🌖",
+	// "🌗",
+	// "🌘",
+	// "🌙",
+	// "🌚",
+	// "🌛",
+	// "🌜",
+	// "🌝",
+	// "🌞",
+	// "🌟",
+	// "🌠",
+	// "🌡️",
+	// "🌤️",
+	// "🌥️",
+	// "🌦️",
+	// "🌧️",
+	// "🌨️",
+	// "🌩️",
+	// "🌪️",
+	// "🌫️",
+	// "🌬️",
+	// "🌭",
+	// "🌮",
+	// "🌯",
+	// "🌰",
+	// "🌱",
+	// "🌲",
+	// "🌳",
+	// "🌴",
+	// "🌵",
+	// "🌶️",
+	// "🌷",
+	// "🌸",
+	// "🌹",
+	// "🌺",
+	// "🌻",
+	// "🌼",
+	// "🌽",
+	// "🌾",
+	// "🌿",
+	// "🍀",
+	// "🍁",
+	// "🍂",
+	// "🍃",
+	// "🍄",
+	// "🍅",
+	// "🍆",
+	// "🍇",
+	// "🍈",
+	// "🍉",
+	// "🍊",
+	// "🍋",
+	// "🍌",
+	// "🍍",
+	// "🍎",
+	// "🍏",
+	// "🍐",
+	// "🍑",
+	// "🍒",
+	// "🍓",
+	// "🍔",
+	// "🍕",
+	// "🍖",
+	// "🍗",
+	// "🍘",
+	// "🍙",
+	// "🍚",
+	// "🍛",
+	// "🍜",
+	// "🍝",
+	// "🍞",
+	// "🍟",
+	// "🍠",
+	// "🍡",
+	// "🍢",
+	// "🍣",
+	// "🍤",
+	// "🍥",
+	// "🍦",
+	// "🍧",
+	// "🍨",
+	// "🍩",
+	// "🍪",
+	// "🍫",
+	// "🍬",
+	// "🍭",
+	// "🍮",
+	// "🍯",
+	// "🍰",
+	// "🍱",
+	// "🍲",
+	// "🍳",
+	// "🍴",
+	// "🍵",
+	// "🍶",
+	// "🍷",
+	// "🍸",
+	// "🍹",
+	// "🍺",
+	// "🍻",
+	// "🍼",
+	// "🍽️",
+	// "🍾",
+	// "🍿",
+	// "🎀",
+	// "🎁",
+	// "🎂",
+	// "🎃",
+	// "🎄",
+	// "🎅",
+	// "🎆",
+	// "🎇",
+	// "🎈",
+	// "🎉",
+	// "🎊",
+	// "🎋",
+	// "🎌",
+	// "🎍",
+	// "🎎",
+	// "🎏",
+	// "🎐",
+	// "🎑",
+	// "🎒",
+	// "🎓",
+	// "🎖️",
+	// "🎗️",
+	// "🎙️",
+	// "🎚️",
+	// "🎛️",
+	// "🎞️",
+	// "🎟️",
+	// "🎠",
+	// "🎡",
+	// "🎢",
+	// "🎣",
+	// "🎤",
+	// "🎥",
+	// "🎦",
+	// "🎧",
+	// "🎨",
+	// "🎩",
+	// "🎪",
+	// "🎫",
+	// "🎬",
+	// "🎭",
+	// "🎮",
+	// "🎯",
+	// "🎰",
+	// "🎱",
+	// "🎲",
+	// "🎳",
+	// "🎴",
+	// "🎵",
+	// "🎶",
+	// "🎷",
+	// "🎸",
+	// "🎹",
+	// "🎺",
+	// "🎻",
+	// "🎼",
+	// "🎽",
+	// "🎾",
+	// "🎿",
+	// "🏀",
+	// "🏁",
+	// "🏂",
+	// "🏃‍♀️",
+	// "🏃‍♂️",
+	// "🏃",
+	// "🏄‍♀️",
+	// "🏄‍♂️",
+	// "🏄",
+	// "🏅",
+	// "🏆",
+	// "🏇",
+	// "🏈",
+	// "🏉",
+	// "🏊‍♀️",
+	// "🏊‍♂️",
+	// "🏊",
+	// "🏋️‍♀️",
+	// "🏋️‍♂️",
+	// "🏋️",
+	// "🏌️‍♀️",
+	// "🏌️‍♂️",
+	// "🏌️",
+	// "🏍️",
+	// "🏎️",
+	// "🏏",
+	// "🏐",
+	// "🏑",
+	// "🏒",
+	// "🏓",
+	// "🏔️",
+	// "🏕️",
+	// "🏖️",
+	// "🏗️",
+	// "🏘️",
+	// "🏙️",
+	// "🏚️",
+	// "🏛️",
+	// "🏜️",
+	// "🏝️",
+	// "🏞️",
+	// "🏟️",
+	// "🏠",
+	// "🏡",
+	// "🏢",
+	// "🏣",
+	// "🏤",
+	// "🏥",
+	// "🏦",
+	// "🏧",
+	// "🏨",
+	// "🏩",
+	// "🏪",
+	// "🏫",
+	// "🏬",
+	// "🏭",
+	// "🏮",
+	// "🏯",
+	// "🏰",
+	// "🏳️‍🌈",
+	// "🏳️‍⚧️",
+	// "🏳️",
+	// "🏴‍☠️",
+	// "🏴󠁧󠁢󠁥󠁮󠁧󠁿",
+	// "🏴󠁧󠁢󠁳󠁣󠁴󠁿",
+	// "🏴󠁧󠁢󠁷󠁬󠁳󠁿",
+	// "🏴",
+	// "🏵️",
+	// "🏷️",
+	// "🏸",
+	// "🏹",
+	// "🏺",
+	// "🐀",
+	// "🐁",
+	// "🐂",
+	// "🐃",
+	// "🐄",
+	// "🐅",
+	// "🐆",
+	// "🐇",
+	// "🐈‍",
+	// "🐈",
+	// "🐉",
+	// "🐊",
+	// "🐋",
+	// "🐌",
+	// "🐍",
+	// "🐎",
+	// "🐏",
+	// "🐐",
+	// "🐑",
+	// "🐒",
+	// "🐓",
+	// "🐔",
+	// "🐕‍🦺",
+	// "🐕",
+	// "🐖",
+	// "🐗",
+	// "🐘",
+	// "🐙",
+	// "🐚",
+	// "🐛",
+	// "🐜",
+	// "🐝",
+	// "🐞",
+	// "🐟",
+	// "🐠",
+	// "🐡",
+	// "🐢",
+	// "🐣",
+	// "🐤",
+	// "🐥",
+	// "🐦",
+	// "🐧",
+	// "🐨",
+	// "🐩",
+	// "🐪",
+	// "🐫",
+	// "🐬",
+	// "🐭",
+	// "🐮",
+	// "🐯",
+	// "🐰",
+	// "🐱",
+	// "🐲",
+	// "🐳",
+	// "🐴",
+	// "🐵",
+	// "🐶",
+	// "🐷",
+	// "🐸",
+	// "🐹",
+	// "🐺",
+	// "🐻‍",
+	// "❄️",
+	// "🐼",
+	// "🐽",
+	// "🐾",
+	// "🐿️",
+	// "👀",
+	// "👁️‍🗨️",
+	// "👁️",
+	// "👂",
+	// "👃",
+	// "👄",
+	// "👅",
+	// "👆",
+	// "👇",
+	// "👈",
+	// "👉",
+	// "👊",
+	// "👋",
+	// "👌",
+	// "👍",
+	// "👎",
+	// "👏",
+	// "👐",
+	// "👑",
+	// "👒",
+	// "👓",
+	// "👔",
+	// "👕",
+	// "👖",
+	// "👗",
+	// "👘",
+	// "👙",
+	// "👚",
+	// "👛",
+	// "👜",
+	// "👝",
+	// "👞",
+	// "👟",
+	// "👠",
+	// "👡",
+	// "👢",
+	// "👣",
+	// "👤",
+	// "👥",
+	// "👦",
+	// "👧",
+	// "👨‍🌾",
+	// "👨‍🍳",
+	// "👨‍🍼",
+	// "👨‍🎓",
+	// "👨‍🎤",
+	// "👨‍🎨",
+	// "👨‍🏫",
+	// "👨‍🏭",
+	// "👨‍👦‍👦",
+	// "👨‍👦",
+	// "👨‍👧‍👦",
+	// "👨‍👧‍👧",
+	// "👨‍👧",
+	// "👨‍👨‍👦",
+	// "👨‍👨‍👦‍👦",
+	// "👨‍👨‍👧",
+	// "👨‍👨‍👧‍👦",
+	// "👨‍👨‍👧‍👧",
+	// "👨‍👩‍👦",
+	// "👨‍👩‍👦‍👦",
+	// "👨‍👩‍👧",
+	// "👨‍👩‍👧‍👦",
+	// "👨‍👩‍👧‍👧",
+	// "👨‍💻",
+	// "👨‍💼",
+	// "👨‍🔧",
+	// "👨‍🔬",
+	// "👨‍🚀",
+	// "👨‍🚒",
+	// "👨‍🦯",
+	// "👨‍🦰",
+	// "👨‍🦱",
+	// "👨‍🦲",
+	// "👨‍🦳",
+	// "👨‍🦼",
+	// "👨‍🦽",
+	// "👨‍⚕️",
+	// "👨‍⚖️",
+	// "👨‍✈️",
+	// "👨‍❤️‍👨",
+	// "👨‍❤️‍💋‍👨",
+	// "👨",
+	// "👩‍🌾",
+	// "👩‍🍳",
+	// "👩‍🍼",
+	// "👩‍🎓",
+	// "👩‍🎤",
+	// "👩‍🎨",
+	// "👩‍🏫",
+	// "👩‍🏭",
+	// "👩‍👦‍👦",
+	// "👩‍👦",
+	// "👩‍👧‍👦",
+	// "👩‍👧‍👧",
+	// "👩‍👧",
+	// "👩‍👩‍👦",
+	// "👩‍👩‍👦‍👦",
+	// "👩‍👩‍👧",
+	// "👩‍👩‍👧‍👦",
+	// "👩‍👩‍👧‍👧",
+	// "👩‍💻",
+	// "👩‍💼",
+	// "👩‍🔧",
+	// "👩‍🔬",
+	// "👩‍🚀",
+	// "👩‍🚒",
+	// "👩‍🦰",
+	// "👩‍🦱",
+	// "👩‍🦲",
+	// "👩‍🦳",
+	// "👩‍⚕️",
+	// "👩‍⚖️",
+	// "👩‍✈️",
+	// "👩‍❤️‍👨",
+	// "👩‍❤️‍👩",
+	// "👩‍❤️‍💋‍👨",
+	// "👩‍❤️‍💋‍👩",
+	// "👩",
+	// "👪",
+	// "👫",
+	// "👬",
+	// "👭",
+	// "👮‍♀️",
+	// "👮‍♂️",
+	// "👮",
+	// "👯‍♀️",
+	// "👯‍♂️",
+	// "👯",
+	// "‍♀️",
+	// "👰",
+	// "👱‍♀️",
+	// "👱‍♂️",
+	// "👱",
+	// "👲",
+	// "👳‍♀️",
+	// "👳‍♂️",
+	// "👳",
+	// "👴",
+	// "👵",
+	// "👶",
+	// "👷‍♀️",
+	// "👷‍♂️",
+	// "👷",
+	// "👸",
+	// "👹",
+	// "👺",
+	// "👻",
+	// "👼",
+	// "👽",
+	// "👾",
+	// "👿",
+	// "💀",
+	// "💁‍♀️",
+	// "💁‍♂️",
+	// "💁",
+	// "💂‍♀️",
+	// "💂‍♂️",
+	// "💂",
+	// "💃",
+	// "💄",
+	// "💅",
+	// "💆‍♀️",
+	// "💆‍♂️",
+	// "💆",
+	// "💇‍♀️",
+	// "💇‍♂️",
+	// "💇",
+	// "💈",
+	// "💉",
+	// "💊",
+	// "💋",
+	// "💌",
+	// "💍",
+	// "💎",
+	// "💏",
+	// "💐",
+	// "💑",
+	// "💒",
+	// "💓",
+	// "💔",
+	// "💕",
+	// "💖",
+	// "💗",
+	// "💘",
+	// "💙",
+	// "💚",
+	// "💛",
+	// "💜",
+	// "💝",
+	// "💞",
+	// "💟",
+	// "💠",
+	// "💡",
+	// "💢",
+	// "💣",
+	// "💤",
+	// "💥",
+	// "💦",
+	// "💧",
+	// "💨",
+	// "💩",
+	// "💪",
+	// "💫",
+	// "💬",
+	// "💭",
+	// "💮",
+	// "💯",
+	// "💰",
+	// "💱",
+	// "💲",
+	// "💳",
+	// "💴",
+	// "💵",
+	// "💶",
+	// "💷",
+	// "💸",
+	// "💹",
+	// "💺",
+	// "💻",
+	// "💼",
+	// "💽",
+	// "💾",
+	// "💿",
+	// "📀",
+	// "📁",
+	// "📂",
+	// "📃",
+	// "📄",
+	// "📅",
+	// "📆",
+	// "📇",
+	// "📈",
+	// "📉",
+	// "📊",
+	// "📋",
+	// "📌",
+	// "📍",
+	// "📎",
+	// "📏",
+	// "📐",
+	// "📑",
+	// "📒",
+	// "📓",
+	// "📔",
+	// "📕",
+	// "📖",
+	// "📗",
+	// "📘",
+	// "📙",
+	// "📚",
+	// "📛",
+	// "📜",
+	// "📝",
+	// "📞",
+	// "📟",
+	// "📠",
+	// "📡",
+	// "📢",
+	// "📣",
+	// "📤",
+	// "📥",
+	// "📦",
+	// "📧",
+	// "📨",
+	// "📩",
+	// "📪",
+	// "📫",
+	// "📬",
+	// "📭",
+	// "📮",
+	// "📯",
+	// "📰",
+	// "📱",
+	// "📲",
+	// "📳",
+	// "📴",
+	// "📵",
+	// "📶",
+	// "📷",
+	// "📸",
+	// "📹",
+	// "📺",
+	// "📻",
+	// "📼",
+	// "📽️",
+	// "📿",
+	// "🔀",
+	// "🔁",
+	// "🔂",
+	// "🔃",
+	// "🔄",
+	// "🔅",
+	// "🔆",
+	// "🔇",
+	// "🔈",
+	// "🔉",
+	// "🔊",
+	// "🔋",
+	// "🔌",
+	// "🔍",
+	// "🔎",
+	// "🔏",
+	// "🔐",
+	// "🔑",
+	// "🔒",
+	// "🔓",
+	// "🔔",
+	// "🔕",
+	// "🔖",
+	// "🔗",
+	// "🔘",
+	// "🔙",
+	// "🔚",
+	// "🔛",
+	// "🔜",
+	// "🔝",
+	// "🔞",
+	// "🔟",
+	// "🔠",
+	// "🔡",
+	// "🔢",
+	// "🔣",
+	// "🔤",
+	// "🔥",
+	// "🔦",
+	// "🔧",
+	// "🔨",
+	// "🔩",
+	// "🔪",
+	// "🔫",
+	// "🔬",
+	// "🔭",
+	// "🔮",
+	// "🔯",
+	// "🔰",
+	// "🔱",
+	// "🔲",
+	// "🔳",
+	// "🔴",
+	// "🔵",
+	// "🔶",
+	// "🔷",
+	// "🔸",
+	// "🔹",
+	// "🔺",
+	// "🔻",
+	// "🔼",
+	// "🔽",
+	// "🕉️",
+	// "🕊️",
+	// "🕋",
+	// "🕌",
+	// "🕍",
+	// "🕎",
+	// "🕐",
+	// "🕑",
+	// "🕒",
+	// "🕓",
+	// "🕔",
+	// "🕕",
+	// "🕖",
+	// "🕗",
+	// "🕘",
+	// "🕙",
+	// "🕚",
+	// "🕛",
+	// "🕜",
+	// "🕝",
+	// "🕞",
+	// "🕟",
+	// "🕠",
+	// "🕡",
+	// "🕢",
+	// "🕣",
+	// "🕤",
+	// "🕥",
+	// "🕦",
+	// "🕧",
+	// "🕯️",
+	// "🕰️",
+	// "🕳️",
+	// "🕴️",
+	// "🕵️‍♀️",
+	// "🕵️‍♂️",
+	// "🕵️",
+	// "🕶️",
+	// "🕷️",
+	// "🕸️",
+	// "🕹️",
+	// "🕺",
+	// "🖇️",
+	// "🖊️",
+	// "🖋️",
+	// "🖌️",
+	// "🖍️",
+	// "🖐️",
+	// "🖕",
+	// "🖖",
+	// "🖤",
+	// "🖥️",
+	// "🖨️",
+	// "🖱️",
+	// "🖲️",
+	// "🖼️",
+	// "🗂️",
+	// "🗃️",
+	// "🗄️",
+	// "🗑️",
+	// "🗒️",
+	// "🗓️",
+	// "🗜️",
+	// "🗝️",
+	// "🗞️",
+	// "🗡️",
+	// "🗣️",
+	// "🗨️",
+	// "🗯️",
+	// "🗳️",
+	// "🗺️",
+	// "🗻",
+	// "🗼",
+	// "🗽",
+	// "🗾",
+	// "🗿",
+	// "🙅‍♀️",
+	// "🙅‍♂️",
+	// "🙅",
+	// "🙆‍♀️",
+	// "🙆‍♂️",
+	// "🙆",
+	// "🙇‍♀️",
+	// "🙇‍♂️",
+	// "🙇",
+	// "🙈",
+	// "🙉",
+	// "🙊",
+	// "🙋‍♀️",
+	// "🙋‍♂️",
+	// "🙋",
+	// "🙌",
+	// "🙍‍♀️",
+	// "🙍‍♂️",
+	// "🙍",
+	// "🙎‍♀️",
+	// "🙎‍♂️",
+	// "🙎",
+	// "🙏",
+	// "🚀",
+	// "🚁",
+	// "🚂",
+	// "🚃",
+	// "🚄",
+	// "🚅",
+	// "🚆",
+	// "🚇",
+	// "🚈",
+	// "🚉",
+	// "🚊",
+	// "🚋",
+	// "🚌",
+	// "🚍",
+	// "🚎",
+	// "🚏",
+	// "🚐",
+	// "🚑",
+	// "🚒",
+	// "🚓",
+	// "🚔",
+	// "🚕",
+	// "🚖",
+	// "🚗",
+	// "🚘",
+	// "🚙",
+	// "🚚",
+	// "🚛",
+	// "🚜",
+	// "🚝",
+	// "🚞",
+	// "🚟",
+	// "🚠",
+	// "🚡",
+	// "🚢",
+	// "🚣‍♀️",
+	// "🚣‍♂️",
+	// "🚣",
+	// "🚤",
+	// "🚥",
+	// "🚦",
+	// "🚧",
+	// "🚨",
+	// "🚩",
+	// "🚪",
+	// "🚫",
+	// "🚬",
+	// "🚭",
+	// "🚮",
+	// "🚯",
+	// "🚰",
+	// "🚱",
+	// "🚲",
+	// "🚳",
+	// "🚴‍♀️",
+	// "🚴‍♂️",
+	// "🚴",
+	// "🚵‍♀️",
+	// "🚵‍♂️",
+	// "🚵",
+	// "🚶‍♀️",
+	// "🚶‍♂️",
+	// "🚶",
+	// "🚷",
+	// "🚸",
+	// "🚹",
+	// "🚺",
+	// "🚻",
+	// "🚼",
+	// "🚽",
+	// "🚾",
+	// "🚿",
+	// "🛀",
+	// "🛁",
+	// "🛂",
+	// "🛃",
+	// "🛄",
+	// "🛅",
+	// "🛋️",
+	// "🛌",
+	// "🛍️",
+	// "🛎️",
+	// "🛏️",
+	// "🛐",
+	// "🛑",
+	// "🛒",
+	// "🛠️",
+	// "🛡️",
+	// "🛢️",
+	// "🛣️",
+	// "🛤️",
+	// "🛥️",
+	// "🛩️",
+	// "🛫",
+	// "🛬",
+	// "🛰️",
+	// "🛳️",
+	// "🛴",
+	// "🛵",
+	// "🛶",
+	// "🛷",
+	// "🛸",
+	// "🛹",
+	// "🤐",
+	// "🤑",
+	// "🤒",
+	// "🤓",
+	// "🤔",
+	// "🤕",
+	// "🤖",
+	// "🤗",
+	// "🤘",
+	// "🤙",
+	// "🤚",
+	// "🤛",
+	// "🤜",
+	// "🤝",
+	// "🤞",
+	// "🤟",
+	// "🤠",
+	// "🤡",
+	// "🤢",
+	// "🤣",
+	// "🤤",
+	// "🤥",
+	// "🤦‍♀️",
+	// "🤦‍♂️",
+	// "🤦",
+	// "🤧",
+	// "🤨",
+	// "🤩",
+	// "🤪",
+	// "🤫",
+	// "🤬",
+	// "🤭",
+	// "🤮",
+	// "🤯",
+	// "🤰",
+	// "🤱",
+	// "🤲",
+	// "🤳",
+	// "🤴",
+	// "🤵‍♀️",
+	// "🤵‍♂️",
+	// "🤵",
+	// "🤶",
+	// "🤷‍♀️",
+	// "🤷‍♂️",
+	// "🤷",
+	// "🤸‍♀️",
+	// "🤸‍♂️",
+	// "🤸",
+	// "🤹‍♀️",
+	// "🤹‍♂️",
+	// "🤹",
+	// "🤺",
+	// "🤼‍♀️",
+	// "🤼‍♂️",
+	// "🤼",
+	// "🤽‍♀️",
+	// "🤽‍♂️",
+	// "🤽",
+	// "🤾‍♀️",
+	// "🤾‍♂️",
+	// "🤾",
+	// "🥀",
+	// "🥁",
+	// "🥂",
+	// "🥃",
+	// "🥄",
+	// "🥅",
+	// "🥇",
+	// "🥈",
+	// "🥉",
+	// "🥊",
+	// "🥋",
+	// "🥌",
+	// "🥍",
+	// "🥎",
+	// "🥏",
+	// "🥐",
+	// "🥑",
+	// "🥒",
+	// "🥓",
+	// "🥔",
+	// "🥕",
+	// "🥖",
+	// "🥗",
+	// "🥘",
+	// "🥙",
+	// "🥚",
+	// "🥛",
+	// "🥜",
+	// "🥝",
+	// "🥞",
+	// "🥟",
+	// "🥠",
+	// "🥡",
+	// "🥢",
+	// "🥣",
+	// "🥤",
+	// "🥥",
+	// "🥦",
+	// "🥧",
+	// "🥨",
+	// "🥩",
+	// "🥪",
+	// "🥫",
+	// "🥬",
+	// "🥭",
+	// "🥮",
+	// "🥯",
+	// "🥰",
+	// "🥳",
+	// "🥴",
+	// "🥵",
+	// "🥶",
+	// "🥺",
+	// "🥼",
+	// "🥽",
+	// "🥾",
+	// "🥿",
+	// "🦀",
+	// "🦁",
+	// "🦂",
+	// "🦃",
+	// "🦄",
+	// "🦅",
+	// "🦆",
+	// "🦇",
+	// "🦈",
+	// "🦉",
+	// "🦊",
+	// "🦋",
+	// "🦌",
+	// "🦍",
+	// "🦎",
+	// "🦏",
+	// "🦐",
+	// "🦑",
+	// "🦒",
+	// "🦓",
+	// "🦔",
+	// "🦕",
+	// "🦖",
+	// "🦗",
+	// "🦘",
+	// "🦙",
+	// "🦚",
+	// "🦛",
+	// "🦜",
+	// "🦝",
+	// "🦞",
+	// "🦟",
+	// "🦠",
+	// "🦡",
+	// "🦢",
+	// "🦴",
+	// "🦵",
+	// "🦶",
+	// "🦷",
+	// "🦸‍♀️",
+	// "🦸‍♂️",
+	// "🦸",
+	// "🦹‍♀️",
+	// "🦹‍♂️",
+	// "🦹",
+	// "🧀",
+	// "🧁",
+	// "🧂",
+	// "🧐",
+	// "‍🌾",
+	// "‍🍳",
+	// "‍🍼",
+	// "‍🎄",
+	// "‍🎓",
+	// "‍🎤",
+	// "‍🎨",
+	// "‍🏫",
+	// "‍🏭",
+	// "‍💻",
+	// "‍💼",
+	// "‍🔧",
+	// "‍🔬",
+	// "‍🚀",
+	// "‍🚒",
+	// "‍🤝‍🧑",
+	// "‍🦯",
+	// "‍🦰",
+	// "‍🦱",
+	// "‍🦲",
+	// "‍🦳",
+	// "‍🦼",
+	// "‍🦽",
+	// "‍⚕️",
+	// "‍⚖️",
+	// "‍✈️",
+	// "🧑",
+	// "🧒",
+	// "🧓",
+	// "🧔",
+	// "🧕",
+	// "🧖‍♀️",
+	// "🧖‍♂️",
+	// "🧖",
+	// "🧗‍♀️",
+	// "🧗‍♂️",
+	// "🧗",
+	// "🧘‍♀️",
+	// "🧘‍♂️",
+	// "🧘",
+	// "🧙‍♀️",
+	// "🧙‍♂️",
+	// "🧙",
+	// "🧚‍♀️",
+	// "🧚‍♂️",
+	// "🧚",
+	// "🧛‍♀️",
+	// "🧛‍♂️",
+	// "🧛",
+	// "🧜‍♀️",
+	// "🧜‍♂️",
+	// "🧜",
+	// "🧝‍♀️",
+	// "🧝‍♂️",
+	// "🧝",
+	// "🧞‍♀️",
+	// "🧞‍♂️",
+	// "🧞",
+	// "🧟‍♀️",
+	// "🧟‍♂️",
+	// "🧟",
+	// "🧠",
+	// "🧡",
+	// "🧢",
+	// "🧣",
+	// "🧤",
+	// "🧥",
+	// "🧦",
+	// "🧧",
+	// "🧨",
+	// "🧩",
+	// "🧪",
+	// "🧫",
+	// "🧬",
+	// "🧭",
+	// "🧮",
+	// "🧯",
+	// "🧰",
+	// "🧱",
+	// "🧲",
+	// "🧳",
+	// "🧴",
+	// "🧵",
+	// "🧶",
+	// "🧷",
+	// "🧸",
+	// "🧹",
+	// "🧺",
+	// "🧻",
+	// "🧼",
+	// "🧽",
+	// "🧾",
+	// "🧿",
+	// "⁉️",
+	// "™️",
+	// "ℹ️",
+	// "↔️",
+	// "↕️",
+	// "↖️",
+	// "↗️",
+	// "↘️",
+	// "↙️",
+	// "↩️",
+	// "↪️",
+	// "⌚",
+	// "⌛",
+	// "⌨️",
+	// "⏏️",
+	// "⏩",
+	// "⏪",
+	// "⏫",
+	// "⏬",
+	// "⏭️",
+	// "⏮️",
+	// "⏯️",
+	// "⏰",
+	// "⏱️",
+	// "⏲️",
+	// "⏳",
+	// "⏸️",
+	// "⏹️",
+	// "⏺️",
+	// "Ⓜ️",
+	// "▪️",
+	// "▫️",
+	// "▶️",
+	// "◀️",
+	// "◻️",
+	// "◼️",
+	// "◽",
+	// "◾",
+	// "☀️",
+	// "☁️",
+	// "☂️",
+	// "☃️",
+	// "☄️",
+	// "☎️",
+	// "☑️",
+	// "☔",
+	// "☕",
+	// "☘️",
+	// "☝️",
+	// "☠️",
+	// "☢️",
+	// "☣️",
+	// "☦️",
+	// "☪️",
+	// "☮️",
+	// "☯️",
+	// "☸️",
+	// "☹️",
+	// "☺️",
+	// "♀️",
+	// "♂️",
+	// "♈",
+	// "♉",
+	// "♊",
+	// "♋",
+	// "♌",
+	// "♍",
+	// "♎",
+	// "♏",
+	// "♐",
+	// "♑",
+	// "♒",
+	// "♓",
+	// "♟️",
+	// "♠️",
+	// "♣️",
+	// "♥️",
+	// "♦️",
+	// "♨️",
+	// "♻️",
+	// "♾️",
+	// "♿",
+	// "⚒️",
+	// "⚓",
+	// "⚔️",
+	// "⚕️",
+	// "⚖️",
+	// "⚗️",
+	// "⚙️",
+	// "⚛️",
+	// "⚜️",
+	// "⚠️",
+	// "⚡",
+	// "⚧️",
+	// "⚪",
+	// "⚫",
+	// "⚰️",
+	// "⚱️",
+	// "⚽",
+	// "⚾",
+	// "⛄",
+	// "⛅",
+	// "⛈️",
+	// "⛎",
+	// "⛏️",
+	// "⛑️",
+	// "⛓️",
+	// "⛔",
+	// "⛩️",
+	// "⛪",
+	// "⛰️",
+	// "⛱️",
+	// "⛲",
+	// "⛳",
+	// "⛴️",
+	// "⛵",
+	// "⛷️",
+	// "⛸️",
+	// "⛹️‍♀️",
+	// "⛹️‍♂️",
+	// "⛹️",
+	// "⛺",
+	// "⛽",
+	// "✂️",
+	// "✅",
+	// "✈️",
+	// "✉️",
+	// "✊",
+	// "✋",
+	// "✌️",
+	// "✍️",
+	// "✏️",
+	// "✒️",
+	// "✔️",
+	// "✖️",
+	// "✝️",
+	// "✡️",
+	// "✨",
+	// "✳️",
+	// "✴️",
+	// "❄️",
+	// "❇️",
+	// "❌",
+	// "❎",
+	// "❓",
+	// "❔",
+	// "❕",
+	// "❗",
+	// "❣️",
+	// "❤️",
+	// "➕",
+	// "➖",
+	// "➗",
+	// "➡️",
+	// "➰",
+	// "➿",
+	// "⤴️",
+	// "⤵️",
+	// "⬅️",
+	// "⬆️",
+	// "⬇️",
+	// "⬛",
+	// "⬜",
+	// "⭐",
+	// "⭕",
+	// "〰️",
+	// "〽️",
+	// "㊗️",
+	// "㊙️"
+]
diff --git a/static/common/js/jweixin.js b/static/common/js/jweixin.js
new file mode 100644
index 0000000..6002712
--- /dev/null
+++ b/static/common/js/jweixin.js
@@ -0,0 +1,284 @@
+! function(e, n) { "object" == typeof exports && "object" == typeof module ? module.exports = n(e) : "function" == typeof define && (define.amd || define.cmd) ? define(function() { return n(e) }) : n(e, !0) }(window, function(o, e) {
+    function c(n, e, i) { o.WeixinJSBridge ? WeixinJSBridge.invoke(n, r(e), function(e) { a(n, e, i) }) : d(n, i) }
+
+    function i(n, i, t) { o.WeixinJSBridge ? WeixinJSBridge.on(n, function(e) { t && t.trigger && t.trigger(e), a(n, e, i) }) : d(n, t || i) }
+
+    function r(e) { return (e = e || {}).appId = M.appId, e.verifyAppId = M.appId, e.verifySignType = "sha1", e.verifyTimestamp = M.timestamp + "", e.verifyNonceStr = M.nonceStr, e.verifySignature = M.signature, e }
+
+    function n(e) { return { timeStamp: e.timestamp + "", nonceStr: e.nonceStr, package: e.package, paySign: e.paySign, signType: e.signType || "SHA1" } }
+
+    function a(e, n, i) {
+        "openEnterpriseChat" == e && (n.errCode = n.err_code), delete n.err_code, delete n.err_desc, delete n.err_detail;
+        var t = n.errMsg;
+        t || (t = n.err_msg, delete n.err_msg, t = function(e, n) {
+            var i = e,
+                t = f[i];
+            t && (i = t);
+            var o = "ok";
+            if (n) { var r = n.indexOf(":"); "confirm" == (o = n.substring(r + 1)) && (o = "ok"), "failed" == o && (o = "fail"), -1 != o.indexOf("failed_") && (o = o.substring(7)), -1 != o.indexOf("fail_") && (o = o.substring(5)), "access denied" != (o = (o = o.replace(/_/g, " ")).toLowerCase()) && "no permission to execute" != o || (o = "permission denied"), "config" == i && "function not exist" == o && (o = "ok"), "" == o && (o = "fail") }
+            return n = i + ":" + o
+        }(e, t), n.errMsg = t), (i = i || {})._complete && (i._complete(n), delete i._complete), t = n.errMsg || "", M.debug && !i.isInnerInvoke && alert(JSON.stringify(n));
+        var o = t.indexOf(":");
+        switch (t.substring(o + 1)) {
+            case "ok":
+                i.success && i.success(n);
+                break;
+            case "cancel":
+                i.cancel && i.cancel(n);
+                break;
+            default:
+                i.fail && i.fail(n)
+        }
+        i.complete && i.complete(n)
+    }
+
+    function s(e) {
+        if (e) {
+            for (var n = 0, i = e.length; n < i; ++n) {
+                var t = e[n],
+                    o = p[t];
+                o && (e[n] = o)
+            }
+            return e
+        }
+    }
+
+    function d(e, n) {
+        if (!(!M.debug || n && n.isInnerInvoke)) {
+            var i = f[e];
+            i && (e = i), n && n._complete && delete n._complete,
+        }
+    }
+
+    function l() { return (new Date).getTime() }
+
+    function u(e) { I && (o.WeixinJSBridge ? e() : t.addEventListener && t.addEventListener("WeixinJSBridgeReady", e, !1)) }
+    if (!o.jWeixin) {
+        var p = { config: "preVerifyJSAPI", onMenuShareTimeline: "menu:share:timeline", onMenuShareAppMessage: "menu:share:appmessage", onMenuShareQQ: "menu:share:qq", onMenuShareWeibo: "menu:share:weiboApp", onMenuShareQZone: "menu:share:QZone", previewImage: "imagePreview", getLocation: "geoLocation", openProductSpecificView: "openProductViewWithPid", addCard: "batchAddCard", openCard: "batchViewCard", chooseWXPay: "getBrandWCPayRequest", openEnterpriseRedPacket: "getRecevieBizHongBaoRequest", startSearchBeacons: "startMonitoringBeacons", stopSearchBeacons: "stopMonitoringBeacons", onSearchBeacons: "onBeaconsInRange", consumeAndShareCard: "consumedShareCard", openAddress: "editAddress" },
+            f = function() { var e = {}; for (var n in p) e[p[n]] = n; return e }(),
+            t = o.document,
+            m = t.title,
+            g = navigator.userAgent.toLowerCase(),
+            h = navigator.platform.toLowerCase(),
+            v = !(!h.match("mac") && !h.match("win")),
+            S = -1 != g.indexOf("wxdebugger"),
+            I = -1 != g.indexOf("micromessenger"),
+            y = -1 != g.indexOf("android"),
+            _ = -1 != g.indexOf("iphone") || -1 != g.indexOf("ipad"),
+            w = (O = g.match(/micromessenger\/(\d+\.\d+\.\d+)/) || g.match(/micromessenger\/(\d+\.\d+)/)) ? O[1] : "",
+            k = { initStartTime: l(), initEndTime: 0, preVerifyStartTime: 0, preVerifyEndTime: 0 },
+            T = { version: 1, appId: "", initTime: 0, preVerifyTime: 0, networkType: "", isPreVerifyOk: 1, systemType: _ ? 1 : y ? 2 : -1, clientVersion: w, url: encodeURIComponent(location.href) },
+            M = {},
+            P = { _completes: [] },
+            x = { state: 0, data: {} };
+        u(function() { k.initEndTime = l() });
+        var A = !1,
+            V = [],
+            C = {
+                config: function(e) {
+                    d("config", M = e);
+                    var t = !1 !== M.check;
+                    u(function() {
+                        if (t) c(p.config, { verifyJsApiList: s(M.jsApiList) }, function() {
+                            P._complete = function(e) { k.preVerifyEndTime = l(), x.state = 1, x.data = e }, P.success = function(e) { T.isPreVerifyOk = 0 }, P.fail = function(e) { P._fail ? P._fail(e) : x.state = -1 };
+                            var t = P._completes;
+                            return t.push(function() {
+                                ! function(e) {
+                                    if (!(v || S || M.debug || w < "6.0.2" || T.systemType < 0)) {
+                                        var i = new Image;
+                                        T.appId = M.appId, T.initTime = k.initEndTime - k.initStartTime, T.preVerifyTime = k.preVerifyEndTime - k.preVerifyStartTime, C.getNetworkType({
+                                            isInnerInvoke: !0,
+                                            success: function(e) {
+                                                T.networkType = e.networkType;
+                                                var n = "https://open.weixin.qq.com/sdk/report?v=" + T.version + "&o=" + T.isPreVerifyOk + "&s=" + T.systemType + "&c=" + T.clientVersion + "&a=" + T.appId + "&n=" + T.networkType + "&i=" + T.initTime + "&p=" + T.preVerifyTime + "&u=" + T.url;
+                                                i.src = n
+                                            }
+                                        })
+                                    }
+                                }()
+                            }), P.complete = function(e) {
+                                for (var n = 0, i = t.length; n < i; ++n) t[n]();
+                                P._completes = []
+                            }, P
+                        }()), k.preVerifyStartTime = l();
+                        else {
+                            x.state = 1;
+                            for (var e = P._completes, n = 0, i = e.length; n < i; ++n) e[n]();
+                            P._completes = []
+                        }
+                    }), C.invoke || (C.invoke = function(e, n, i) { o.WeixinJSBridge && WeixinJSBridge.invoke(e, r(n), i) }, C.on = function(e, n) { o.WeixinJSBridge && WeixinJSBridge.on(e, n) })
+                },
+                ready: function(e) { 0 != x.state ? e() : (P._completes.push(e), !I && M.debug && e()) },
+                error: function(e) { w < "6.0.2" || (-1 == x.state ? e(x.data) : P._fail = e) },
+                checkJsApi: function(e) {
+                    c("checkJsApi", { jsApiList: s(e.jsApiList) }, (e._complete = function(e) {
+                        if (y) {
+                            var n = e.checkResult;
+                            n && (e.checkResult = JSON.parse(n))
+                        }
+                        e = function(e) {
+                            var n = e.checkResult;
+                            for (var i in n) {
+                                var t = f[i];
+                                t && (n[t] = n[i], delete n[i])
+                            }
+                            return e
+                        }(e)
+                    }, e))
+                },
+                onMenuShareTimeline: function(e) { i(p.onMenuShareTimeline, { complete: function() { c("shareTimeline", { title: e.title || m, desc: e.title || m, img_url: e.imgUrl || "", link: e.link || location.href, type: e.type || "link", data_url: e.dataUrl || "" }, e) } }, e) },
+                onMenuShareAppMessage: function(n) { i(p.onMenuShareAppMessage, { complete: function(e) { "favorite" === e.scene ? c("sendAppMessage", { title: n.title || m, desc: n.desc || "", link: n.link || location.href, img_url: n.imgUrl || "", type: n.type || "link", data_url: n.dataUrl || "" }) : c("sendAppMessage", { title: n.title || m, desc: n.desc || "", link: n.link || location.href, img_url: n.imgUrl || "", type: n.type || "link", data_url: n.dataUrl || "" }, n) } }, n) },
+                onMenuShareQQ: function(e) { i(p.onMenuShareQQ, { complete: function() { c("shareQQ", { title: e.title || m, desc: e.desc || "", img_url: e.imgUrl || "", link: e.link || location.href }, e) } }, e) },
+                onMenuShareWeibo: function(e) { i(p.onMenuShareWeibo, { complete: function() { c("shareWeiboApp", { title: e.title || m, desc: e.desc || "", img_url: e.imgUrl || "", link: e.link || location.href }, e) } }, e) },
+                onMenuShareQZone: function(e) { i(p.onMenuShareQZone, { complete: function() { c("shareQZone", { title: e.title || m, desc: e.desc || "", img_url: e.imgUrl || "", link: e.link || location.href }, e) } }, e) },
+                updateTimelineShareData: function(e) { c("updateTimelineShareData", { title: e.title, link: e.link, imgUrl: e.imgUrl }, e) },
+                updateAppMessageShareData: function(e) { c("updateAppMessageShareData", { title: e.title, desc: e.desc, link: e.link, imgUrl: e.imgUrl }, e) },
+                startRecord: function(e) { c("startRecord", {}, e) },
+                stopRecord: function(e) { c("stopRecord", {}, e) },
+                onVoiceRecordEnd: function(e) { i("onVoiceRecordEnd", e) },
+                playVoice: function(e) { c("playVoice", { localId: e.localId }, e) },
+                pauseVoice: function(e) { c("pauseVoice", { localId: e.localId }, e) },
+                stopVoice: function(e) { c("stopVoice", { localId: e.localId }, e) },
+                onVoicePlayEnd: function(e) { i("onVoicePlayEnd", e) },
+                uploadVoice: function(e) { c("uploadVoice", { localId: e.localId, isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1 }, e) },
+                downloadVoice: function(e) { c("downloadVoice", { serverId: e.serverId, isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1 }, e) },
+                translateVoice: function(e) { c("translateVoice", { localId: e.localId, isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1 }, e) },
+                chooseImage: function(e) { c("chooseImage", { scene: "1|2", count: e.count || 9, sizeType: e.sizeType || ["original", "compressed"], sourceType: e.sourceType || ["album", "camera"] }, (e._complete = function(e) { if (y) { var n = e.localIds; try { n && (e.localIds = JSON.parse(n)) } catch (e) {} } }, e)) },
+                getLocation: function(e) {},
+                previewImage: function(e) { c(p.previewImage, { current: e.current, urls: e.urls }, e) },
+                uploadImage: function(e) { c("uploadImage", { localId: e.localId, isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1 }, e) },
+                downloadImage: function(e) { c("downloadImage", { serverId: e.serverId, isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1 }, e) },
+                getLocalImgData: function(e) {
+                    !1 === A ? (A = !0, c("getLocalImgData", { localId: e.localId }, (e._complete = function(e) {
+                        if (A = !1, 0 < V.length) {
+                            var n = V.shift();
+                            wx.getLocalImgData(n)
+                        }
+                    }, e))) : V.push(e)
+                },
+                getNetworkType: function(e) {
+                    c("getNetworkType", {}, (e._complete = function(e) {
+                        e = function(e) {
+                            var n = e.errMsg;
+                            e.errMsg = "getNetworkType:ok";
+                            var i = e.subtype;
+                            if (delete e.subtype, i) e.networkType = i;
+                            else {
+                                var t = n.indexOf(":"),
+                                    o = n.substring(t + 1);
+                                switch (o) {
+                                    case "wifi":
+                                    case "edge":
+                                    case "wwan":
+                                        e.networkType = o;
+                                        break;
+                                    default:
+                                        e.errMsg = "getNetworkType:fail"
+                                }
+                            }
+                            return e
+                        }(e)
+                    }, e))
+                },
+                openLocation: function(e) { c("openLocation", { latitude: e.latitude, longitude: e.longitude, name: e.name || "", address: e.address || "", scale: e.scale || 28, infoUrl: e.infoUrl || "" }, e) },
+                getLocation: function(e) { c(p.getLocation, { type: (e = e || {}).type || "wgs84" }, (e._complete = function(e) { delete e.type }, e)) },
+                hideOptionMenu: function(e) { c("hideOptionMenu", {}, e) },
+                showOptionMenu: function(e) { c("showOptionMenu", {}, e) },
+                closeWindow: function(e) { c("closeWindow", {}, e = e || {}) },
+                hideMenuItems: function(e) { c("hideMenuItems", { menuList: e.menuList }, e) },
+                showMenuItems: function(e) { c("showMenuItems", { menuList: e.menuList }, e) },
+                hideAllNonBaseMenuItem: function(e) { c("hideAllNonBaseMenuItem", {}, e) },
+                showAllNonBaseMenuItem: function(e) { c("showAllNonBaseMenuItem", {}, e) },
+                scanQRCode: function(e) {
+                    c("scanQRCode", { needResult: (e = e || {}).needResult || 0, scanType: e.scanType || ["qrCode", "barCode"] }, (e._complete = function(e) {
+                        if (_) {
+                            var n = e.resultStr;
+                            if (n) {
+                                var i = JSON.parse(n);
+                                e.resultStr = i && i.scan_code && i.scan_code.scan_result
+                            }
+                        }
+                    }, e))
+                },
+                openAddress: function(e) {
+                    c(p.openAddress, {}, (e._complete = function(e) {
+                        var n;
+                        (n = e).postalCode = n.addressPostalCode, delete n.addressPostalCode, n.provinceName = n.proviceFirstStageName, delete n.proviceFirstStageName, n.cityName = n.addressCitySecondStageName, delete n.addressCitySecondStageName, n.countryName = n.addressCountiesThirdStageName, delete n.addressCountiesThirdStageName, n.detailInfo = n.addressDetailInfo, delete n.addressDetailInfo, e = n
+                    }, e))
+                },
+                openProductSpecificView: function(e) { c(p.openProductSpecificView, { pid: e.productId, view_type: e.viewType || 0, ext_info: e.extInfo }, e) },
+                addCard: function(e) {
+                    for (var n = e.cardList, i = [], t = 0, o = n.length; t < o; ++t) {
+                        var r = n[t],
+                            a = { card_id: r.cardId, card_ext: r.cardExt };
+                        i.push(a)
+                    }
+                    c(p.addCard, { card_list: i }, (e._complete = function(e) {
+                        var n = e.card_list;
+                        if (n) {
+                            for (var i = 0, t = (n = JSON.parse(n)).length; i < t; ++i) {
+                                var o = n[i];
+                                o.cardId = o.card_id, o.cardExt = o.card_ext, o.isSuccess = !!o.is_succ, delete o.card_id, delete o.card_ext, delete o.is_succ
+                            }
+                            e.cardList = n, delete e.card_list
+                        }
+                    }, e))
+                },
+                chooseCard: function(e) { c("chooseCard", { app_id: M.appId, location_id: e.shopId || "", sign_type: e.signType || "SHA1", card_id: e.cardId || "", card_type: e.cardType || "", card_sign: e.cardSign, time_stamp: e.timestamp + "", nonce_str: e.nonceStr }, (e._complete = function(e) { e.cardList = e.choose_card_info, delete e.choose_card_info }, e)) },
+                openCard: function(e) {
+                    for (var n = e.cardList, i = [], t = 0, o = n.length; t < o; ++t) {
+                        var r = n[t],
+                            a = { card_id: r.cardId, code: r.code };
+                        i.push(a)
+                    }
+                    c(p.openCard, { card_list: i }, e)
+                },
+                consumeAndShareCard: function(e) { c(p.consumeAndShareCard, { consumedCardId: e.cardId, consumedCode: e.code }, e) },
+                chooseWXPay: function(e) { c(p.chooseWXPay, n(e), e) },
+                openEnterpriseRedPacket: function(e) { c(p.openEnterpriseRedPacket, n(e), e) },
+                startSearchBeacons: function(e) { c(p.startSearchBeacons, { ticket: e.ticket }, e) },
+                stopSearchBeacons: function(e) { c(p.stopSearchBeacons, {}, e) },
+                onSearchBeacons: function(e) { i(p.onSearchBeacons, e) },
+                openEnterpriseChat: function(e) { c("openEnterpriseChat", { useridlist: e.userIds, chatname: e.groupName }, e) },
+                launchMiniProgram: function(e) {
+                    c("launchMiniProgram", {
+                        targetAppId: e.targetAppId,
+                        path: function(e) {
+                            if ("string" == typeof e && 0 < e.length) {
+                                var n = e.split("?")[0],
+                                    i = e.split("?")[1];
+                                return n += ".html", void 0 !== i ? n + "?" + i : n
+                            }
+                        }(e.path),
+                        envVersion: e.envVersion
+                    }, e)
+                },
+                miniProgram: { navigateBack: function(e) { e = e || {}, u(function() { c("invokeMiniProgramAPI", { name: "navigateBack", arg: { delta: e.delta || 1 } }, e) }) }, navigateTo: function(e) { u(function() { c("invokeMiniProgramAPI", { name: "navigateTo", arg: { url: e.url } }, e) }) }, redirectTo: function(e) { u(function() { c("invokeMiniProgramAPI", { name: "redirectTo", arg: { url: e.url } }, e) }) }, switchTab: function(e) { u(function() { c("invokeMiniProgramAPI", { name: "switchTab", arg: { url: e.url } }, e) }) }, reLaunch: function(e) { u(function() { c("invokeMiniProgramAPI", { name: "reLaunch", arg: { url: e.url } }, e) }) }, postMessage: function(e) { u(function() { c("invokeMiniProgramAPI", { name: "postMessage", arg: e.data || {} }, e) }) }, getEnv: function(e) { u(function() { e({ miniprogram: "miniprogram" === o.__wxjs_environment }) }) } }
+            },
+            L = 1,
+            B = {};
+        return t.addEventListener("error", function(e) {
+            if (!y) {
+                var n = e.target,
+                    i = n.tagName,
+                    t = n.src;
+                if (("IMG" == i || "VIDEO" == i || "AUDIO" == i || "SOURCE" == i) && -1 != t.indexOf("wxlocalresource://")) {
+                    e.preventDefault(), e.stopPropagation();
+                    var o = n["wx-id"];
+                    if (o || (o = L++, n["wx-id"] = o), B[o]) return;
+                    B[o] = !0, wx.ready(function() { wx.getLocalImgData({ localId: t, success: function(e) { n.src = e.localData } }) })
+                }
+            }
+        }, !0), t.addEventListener("load", function(e) {
+            if (!y) {
+                var n = e.target,
+                    i = n.tagName;
+                if (n.src, "IMG" == i || "VIDEO" == i || "AUDIO" == i || "SOURCE" == i) {
+                    var t = n["wx-id"];
+                    t && (B[t] = !1)
+                }
+            }
+        }, !0), e && (o.wx = o.jWeixin = C), C
+    }
+    var O
+});
\ No newline at end of file
diff --git a/static/common/js/router.js b/static/common/js/router.js
new file mode 100644
index 0000000..bf2d8ac
--- /dev/null
+++ b/static/common/js/router.js
@@ -0,0 +1,53 @@
+import config from "./config.js"
+const initApp = function(vm) {
+    /**
+     * 页面跳转拦截器
+     */
+    let that = vm;
+    let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
+    list.forEach(item => { //用遍历的方式分别为,uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器
+        uni.addInterceptor(item, {
+            invoke(e) { // 调用前拦截
+                //获取用户的token
+                // console.log(e)
+                const token = that.vuex_token,
+                    //获取要跳转的页面路径（url去掉"?"和"?"后的参数）
+                    url = e.url.split('?')[0];
+                let notNeed = config.whiteList.includes(url)
+                    // 如果在whiteList里面就不需要登录
+                    // console.log(notNeed)
+
+                if (notNeed) {
+                    return e
+                } else {
+                    //需要登录
+                    if (token == '') {
+                        // uni.showToast({
+                        //     title: '请先登录',
+                        //     icon: 'none'
+                        // })
+                        uni.navigateTo({
+                            url: config.loginPage
+                        })
+                        return false
+                    } else {
+                        return e
+                    }
+                }
+
+            },
+            fail(err) { // 失败回调拦截 
+			console.log(err)
+                // if (Debug) {
+                    // uni.showModal({
+                    //     content: JSON.stringify(err),
+                    //     showCancel: false
+                    // });
+                // }
+            }
+        })
+    })
+}
+export default {
+    initApp: initApp
+}
\ No newline at end of file
diff --git a/static/common/js/touch-emulator.js b/static/common/js/touch-emulator.js
new file mode 100644
index 0000000..9632413
--- /dev/null
+++ b/static/common/js/touch-emulator.js
@@ -0,0 +1,363 @@
+(function(window, document, exportName, undefined) {
+    "use strict";
+
+    var isMultiTouch = false;
+    var multiTouchStartPos;
+    var eventTarget;
+    var touchElements = {};
+
+    // polyfills
+    if(!document.createTouch) {
+        document.createTouch = function(view, target, identifier, pageX, pageY, screenX, screenY, clientX, clientY) {
+            // auto set
+            if(clientX == undefined || clientY == undefined) {
+                clientX = pageX - window.pageXOffset;
+                clientY = pageY - window.pageYOffset;
+            }
+
+            return new Touch(target, identifier, {
+                pageX: pageX,
+                pageY: pageY,
+                screenX: screenX,
+                screenY: screenY,
+                clientX: clientX,
+                clientY: clientY
+            });
+        };
+    }
+
+    if(!document.createTouchList) {
+        document.createTouchList = function() {
+            var touchList = new TouchList();
+            for (var i = 0; i < arguments.length; i++) {
+                touchList[i] = arguments[i];
+            }
+            touchList.length = arguments.length;
+            return touchList;
+        };
+    }
+
+    /**
+     * create an touch point
+     * @constructor
+     * @param target
+     * @param identifier
+     * @param pos
+     * @param deltaX
+     * @param deltaY
+     * @returns {Object} touchPoint
+     */
+    function Touch(target, identifier, pos, deltaX, deltaY) {
+        deltaX = deltaX || 0;
+        deltaY = deltaY || 0;
+
+        this.identifier = identifier;
+        this.target = target;
+        this.clientX = pos.clientX + deltaX;
+        this.clientY = pos.clientY + deltaY;
+        this.screenX = pos.screenX + deltaX;
+        this.screenY = pos.screenY + deltaY;
+        this.pageX = pos.pageX + deltaX;
+        this.pageY = pos.pageY + deltaY;
+    }
+
+    /**
+     * create empty touchlist with the methods
+     * @constructor
+     * @returns touchList
+     */
+    function TouchList() {
+        var touchList = [];
+
+        touchList.item = function(index) {
+            return this[index] || null;
+        };
+
+        // specified by Mozilla
+        touchList.identifiedTouch = function(id) {
+            return this[id + 1] || null;
+        };
+
+        return touchList;
+    }
+
+
+    /**
+     * Simple trick to fake touch event support
+     * this is enough for most libraries like Modernizr and Hammer
+     */
+    function fakeTouchSupport() {
+        var objs = [window, document.documentElement];
+        var props = ['ontouchstart', 'ontouchmove', 'ontouchcancel', 'ontouchend'];
+
+        for(var o=0; o<objs.length; o++) {
+            for(var p=0; p<props.length; p++) {
+                if(objs[o] && objs[o][props[p]] == undefined) {
+                    objs[o][props[p]] = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * we don't have to emulate on a touch device
+     * @returns {boolean}
+     */
+    function hasTouchSupport() {
+        return ("ontouchstart" in window) || // touch events
+               (window.Modernizr && window.Modernizr.touch) || // modernizr
+               (navigator.msMaxTouchPoints || navigator.maxTouchPoints) > 2; // pointer events
+    }
+
+    /**
+     * disable mouseevents on the page
+     * @param ev
+     */
+    function preventMouseEvents(ev) {
+		// 注释启用默认事件
+        // ev.preventDefault();
+        // ev.stopPropagation();
+    }
+
+    /**
+     * only trigger touches when the left mousebutton has been pressed
+     * @param touchType
+     * @returns {Function}
+     */
+    function onMouse(touchType) {
+        return function(ev) {
+            // prevent mouse events
+            preventMouseEvents(ev);
+
+            if (ev.which !== 1) {
+                return;
+            }
+
+            // The EventTarget on which the touch point started when it was first placed on the surface,
+            // even if the touch point has since moved outside the interactive area of that element.
+            // also, when the target doesnt exist anymore, we update it
+            if (ev.type == 'mousedown' || !eventTarget || (eventTarget && !eventTarget.dispatchEvent)) {
+                eventTarget = ev.target;
+            }
+
+            // shiftKey has been lost, so trigger a touchend
+            if (isMultiTouch && !ev.shiftKey) {
+                triggerTouch('touchend', ev);
+                isMultiTouch = false;
+            }
+
+            triggerTouch(touchType, ev);
+
+            // we're entering the multi-touch mode!
+            if (!isMultiTouch && ev.shiftKey) {
+                isMultiTouch = true;
+                multiTouchStartPos = {
+                    pageX: ev.pageX,
+                    pageY: ev.pageY,
+                    clientX: ev.clientX,
+                    clientY: ev.clientY,
+                    screenX: ev.screenX,
+                    screenY: ev.screenY
+                };
+                triggerTouch('touchstart', ev);
+            }
+
+            // reset
+            if (ev.type == 'mouseup') {
+                multiTouchStartPos = null;
+                isMultiTouch = false;
+                eventTarget = null;
+            }
+        }
+    }
+
+    /**
+     * trigger a touch event
+     * @param eventName
+     * @param mouseEv
+     */
+    function triggerTouch(eventName, mouseEv) {
+        var touchEvent = document.createEvent('Event');
+        touchEvent.initEvent(eventName, true, true);
+
+        touchEvent.altKey = mouseEv.altKey;
+        touchEvent.ctrlKey = mouseEv.ctrlKey;
+        touchEvent.metaKey = mouseEv.metaKey;
+        touchEvent.shiftKey = mouseEv.shiftKey;
+
+        touchEvent.touches = getActiveTouches(mouseEv, eventName);
+        touchEvent.targetTouches = getActiveTouches(mouseEv, eventName);
+        touchEvent.changedTouches = getChangedTouches(mouseEv, eventName);
+
+        eventTarget.dispatchEvent(touchEvent);
+    }
+
+    /**
+     * create a touchList based on the mouse event
+     * @param mouseEv
+     * @returns {TouchList}
+     */
+    function createTouchList(mouseEv) {
+        var touchList = new TouchList();
+
+        if (isMultiTouch) {
+            var f = TouchEmulator.multiTouchOffset;
+            var deltaX = multiTouchStartPos.pageX - mouseEv.pageX;
+            var deltaY = multiTouchStartPos.pageY - mouseEv.pageY;
+
+            touchList.push(new Touch(eventTarget, 1, multiTouchStartPos, (deltaX*-1) - f, (deltaY*-1) + f));
+            touchList.push(new Touch(eventTarget, 2, multiTouchStartPos, deltaX+f, deltaY-f));
+        } else {
+            touchList.push(new Touch(eventTarget, 1, mouseEv, 0, 0));
+        }
+
+        return touchList;
+    }
+
+    /**
+     * receive all active touches
+     * @param mouseEv
+     * @returns {TouchList}
+     */
+    function getActiveTouches(mouseEv, eventName) {
+        // empty list
+        if (mouseEv.type == 'mouseup') {
+            return new TouchList();
+        }
+
+        var touchList = createTouchList(mouseEv);
+        if(isMultiTouch && mouseEv.type != 'mouseup' && eventName == 'touchend') {
+            touchList.splice(1, 1);
+        }
+        return touchList;
+    }
+
+    /**
+     * receive a filtered set of touches with only the changed pointers
+     * @param mouseEv
+     * @param eventName
+     * @returns {TouchList}
+     */
+    function getChangedTouches(mouseEv, eventName) {
+        var touchList = createTouchList(mouseEv);
+
+        // we only want to return the added/removed item on multitouch
+        // which is the second pointer, so remove the first pointer from the touchList
+        //
+        // but when the mouseEv.type is mouseup, we want to send all touches because then
+        // no new input will be possible
+        if(isMultiTouch && mouseEv.type != 'mouseup' &&
+            (eventName == 'touchstart' || eventName == 'touchend')) {
+            touchList.splice(0, 1);
+        }
+
+        return touchList;
+    }
+
+    /**
+     * show the touchpoints on the screen
+     */
+    function showTouches(ev) {
+        var touch, i, el, styles;
+
+        // first all visible touches
+        for(i = 0; i < ev.touches.length; i++) {
+            touch = ev.touches[i];
+            el = touchElements[touch.identifier];
+            if(!el) {
+                el = touchElements[touch.identifier] = document.createElement("div");
+                document.body.appendChild(el);
+            }
+
+            styles = TouchEmulator.template(touch);
+            for(var prop in styles) {
+                el.style[prop] = styles[prop];
+            }
+        }
+
+        // remove all ended touches
+        if(ev.type == 'touchend' || ev.type == 'touchcancel') {
+            for(i = 0; i < ev.changedTouches.length; i++) {
+                touch = ev.changedTouches[i];
+                el = touchElements[touch.identifier];
+                if(el) {
+                    el.parentNode.removeChild(el);
+                    delete touchElements[touch.identifier];
+                }
+            }
+        }
+    }
+
+    /**
+     * TouchEmulator initializer
+     */
+    function TouchEmulator() {
+        if (hasTouchSupport()) {
+            return;
+        }
+
+        fakeTouchSupport();
+
+        window.addEventListener("mousedown", onMouse('touchstart'), true);
+        window.addEventListener("mousemove", onMouse('touchmove'), true);
+        window.addEventListener("mouseup", onMouse('touchend'), true);
+
+        window.addEventListener("mouseenter", preventMouseEvents, true);
+        window.addEventListener("mouseleave", preventMouseEvents, true);
+        window.addEventListener("mouseout", preventMouseEvents, true);
+        window.addEventListener("mouseover", preventMouseEvents, true);
+
+        // it uses itself!
+        window.addEventListener("touchstart", showTouches, true);
+        window.addEventListener("touchmove", showTouches, true);
+        window.addEventListener("touchend", showTouches, true);
+        window.addEventListener("touchcancel", showTouches, true);
+    }
+
+    // start distance when entering the multitouch mode
+    TouchEmulator.multiTouchOffset = 75;
+
+    /**
+     * css template for the touch rendering
+     * @param touch
+     * @returns object
+     */
+    TouchEmulator.template = function(touch) {
+        var size = 0;
+        var transform = 'translate('+ (touch.clientX-(size/2)) +'px, '+ (touch.clientY-(size/2)) +'px)';
+        return {
+            position: 'fixed',
+            left: 0,
+            top: 0,
+            background: '#fff',
+            border: 'solid 1px #999',
+            opacity: .6,
+            borderRadius: '100%',
+            height: size + 'px',
+            width: size + 'px',
+            padding: 0,
+            margin: 0,
+            display: 'block',
+            overflow: 'hidden',
+            pointerEvents: 'none',
+            webkitUserSelect: 'none',
+            mozUserSelect: 'none',
+            userSelect: 'none',
+            webkitTransform: transform,
+            mozTransform: transform,
+            transform: transform,
+            zIndex: 100
+        }
+    };
+
+    // export
+    if (typeof define == "function" && define.amd) {
+        define(function() {
+            return TouchEmulator;
+        });
+    } else if (typeof module != "undefined" && module.exports) {
+        module.exports = TouchEmulator;
+    } else {
+        window[exportName] = TouchEmulator;
+    }
+})(window, document, "TouchEmulator");
\ No newline at end of file
diff --git a/static/common/tabbar/AlumniCircle.png b/static/common/tabbar/AlumniCircle.png
new file mode 100644
index 0000000..ec09563
Binary files /dev/null and b/static/common/tabbar/AlumniCircle.png differ
diff --git a/static/common/tabbar/findFriends.png b/static/common/tabbar/findFriends.png
new file mode 100644
index 0000000..5c1e894
Binary files /dev/null and b/static/common/tabbar/findFriends.png differ
diff --git a/static/common/tabbar/index.png b/static/common/tabbar/index.png
new file mode 100644
index 0000000..b016fa1
Binary files /dev/null and b/static/common/tabbar/index.png differ
diff --git a/static/common/tabbar/message.png b/static/common/tabbar/message.png
new file mode 100644
index 0000000..f3f62f5
Binary files /dev/null and b/static/common/tabbar/message.png differ
diff --git a/static/common/tabbar/my.png b/static/common/tabbar/my.png
new file mode 100644
index 0000000..5d1e582
Binary files /dev/null and b/static/common/tabbar/my.png differ
diff --git a/static/common/tabbar/selectAlumniCircle.png b/static/common/tabbar/selectAlumniCircle.png
new file mode 100644
index 0000000..dd61469
Binary files /dev/null and b/static/common/tabbar/selectAlumniCircle.png differ
diff --git a/static/common/tabbar/selectFindFridend.png b/static/common/tabbar/selectFindFridend.png
new file mode 100644
index 0000000..776da53
Binary files /dev/null and b/static/common/tabbar/selectFindFridend.png differ
diff --git a/static/common/tabbar/selectindex.png b/static/common/tabbar/selectindex.png
new file mode 100644
index 0000000..3421b85
Binary files /dev/null and b/static/common/tabbar/selectindex.png differ
diff --git a/static/common/tabbar/selectmessage.png b/static/common/tabbar/selectmessage.png
new file mode 100644
index 0000000..0e9072d
Binary files /dev/null and b/static/common/tabbar/selectmessage.png differ
diff --git a/static/common/tabbar/selectmy.png b/static/common/tabbar/selectmy.png
new file mode 100644
index 0000000..11dab5f
Binary files /dev/null and b/static/common/tabbar/selectmy.png differ
diff --git a/static/uview/common/favicon.ico b/static/uview/common/favicon.ico
new file mode 100644
index 0000000..e0af368
Binary files /dev/null and b/static/uview/common/favicon.ico differ
diff --git a/static/uview/common/logo.png b/static/uview/common/logo.png
new file mode 100644
index 0000000..05b3aed
Binary files /dev/null and b/static/uview/common/logo.png differ
diff --git a/static/uview/example/component.png b/static/uview/example/component.png
new file mode 100644
index 0000000..09bd020
Binary files /dev/null and b/static/uview/example/component.png differ
diff --git a/static/uview/example/component_select.png b/static/uview/example/component_select.png
new file mode 100644
index 0000000..3d704a8
Binary files /dev/null and b/static/uview/example/component_select.png differ
diff --git a/static/uview/example/js.png b/static/uview/example/js.png
new file mode 100644
index 0000000..b904664
Binary files /dev/null and b/static/uview/example/js.png differ
diff --git a/static/uview/example/js_bak.png b/static/uview/example/js_bak.png
new file mode 100644
index 0000000..d280e3d
Binary files /dev/null and b/static/uview/example/js_bak.png differ
diff --git a/static/uview/example/js_select.png b/static/uview/example/js_select.png
new file mode 100644
index 0000000..9411c91
Binary files /dev/null and b/static/uview/example/js_select.png differ
diff --git a/static/uview/example/js_select_bak.png b/static/uview/example/js_select_bak.png
new file mode 100644
index 0000000..2ea6122
Binary files /dev/null and b/static/uview/example/js_select_bak.png differ
diff --git a/static/uview/example/min_button.png b/static/uview/example/min_button.png
new file mode 100644
index 0000000..077eb43
Binary files /dev/null and b/static/uview/example/min_button.png differ
diff --git a/static/uview/example/min_button_select.png b/static/uview/example/min_button_select.png
new file mode 100644
index 0000000..703a8bd
Binary files /dev/null and b/static/uview/example/min_button_select.png differ
diff --git a/static/uview/example/template.png b/static/uview/example/template.png
new file mode 100644
index 0000000..5d27f97
Binary files /dev/null and b/static/uview/example/template.png differ
diff --git a/static/uview/example/template_select.png b/static/uview/example/template_select.png
new file mode 100644
index 0000000..be4b338
Binary files /dev/null and b/static/uview/example/template_select.png differ
diff --git a/store/$u.mixin.js b/store/$u.mixin.js
new file mode 100644
index 0000000..61ae187
--- /dev/null
+++ b/store/$u.mixin.js
@@ -0,0 +1,27 @@
+import { mapState } from 'vuex'
+import store from "@/store"
+
+// 尝试将用户在根目录中的store/index.js的vuex的state变量，全部加载到全局变量中
+let $uStoreKey = [];
+try{
+	$uStoreKey = store.state ? Object.keys(store.state) : [];
+}catch(e){
+	
+}
+
+module.exports = {
+	beforeCreate() {
+		// 将vuex方法挂在到$u中
+		// 使用方法为：如果要修改vuex的state中的user.name变量为"史诗" => this.$u.vuex('user.name', '史诗')
+		// 如果要修改vuex的state的version变量为1.0.1 => this.$u.vuex('version', '1.0.1')
+		this.$u.vuex = (name, value) => {
+			this.$store.commit('$uStore', {
+				name,value
+			})
+		}
+	},
+	computed: {
+		// 将vuex的state中的所有变量，解构到全局混入的mixin中
+		...mapState($uStoreKey)
+	}
+}
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..92c522d
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,113 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+let lifeData = {};
+
+try {
+    // 尝试获取本地是否存在lifeData变量，第一次启动APP时是不存在的
+    lifeData = uni.getStorageSync('lifeData');
+} catch (e) {
+
+}
+
+// 需要永久存储，且下次APP启动需要取出的，在state中的变量名
+let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_msgList', 'vuex_glyType', 'vuex_userLocation','vuex_userInfo','vuex_user_hobby'];
+
+// 保存变量到本地存储中
+const saveLifeData = function (key, value) {
+    // 判断变量名是否在需要存储的数组中
+    if (saveStateKeys.indexOf(key) != -1) {
+        // 获取本地存储的lifeData对象，将变量添加到对象中
+        let tmp = uni.getStorageSync('lifeData');
+        // 第一次打开APP，不存在lifeData变量，故放一个{}空对象
+        tmp = tmp ? tmp : {};
+        tmp[key] = value;
+        // 执行这一步后，所有需要存储的变量，都挂载在本地的lifeData对象中
+        uni.setStorageSync('lifeData', tmp);
+    }
+}
+const store = new Vuex.Store({
+    state: {
+        // 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
+        // 加上vuex_前缀，是防止变量名冲突，也让人一目了然
+        vuex_user: lifeData.vuex_user ? lifeData.vuex_user : '',
+        vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
+        vuex_glyType: lifeData.vuex_glyType ? lifeData.vuex_glyType : '',
+        vuex_userLocation: lifeData.vuex_userLocation ? lifeData.vuex_userLocation : '',
+        vuex_user_hobby:lifeData.vuex_user_hobby?lifeData.vuex_user_hobby:'',
+        vuex_hobby:'',
+        // 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
+        vuex_version: '1.0.1',
+        vuex_msgList: lifeData.vuex_msgList ? lifeData.vuex_msgList : '',
+        // 自定义tabbar数据
+        vuex_iPhone: lifeData.vuex_iPhone ? lifeData.vuex_iPhone : false,
+        // tabbar相关配置
+        vuex_tabbar_config: {
+            activeColor: '#3CB5FB',
+            inactiveColor: '#666666'
+        },
+        vuex_tabbar: [{
+            pagePath: "/pages/home/home/home",
+            iconPath: "/static/common/tabbar/index.png",
+            selectedIconPath: "/static/common/tabbar/selectindex.png",
+            text: "首页"
+        },
+            {
+                pagePath: "/pages/message/msgList/msgList",
+                iconPath: "/static/common/tabbar/message.png",
+                selectedIconPath: "/static/common/tabbar/selectmessage.png",
+                // count: 2, //提示数量
+                isDot: lifeData.vuex_msgList ? true : false, //显示红色小点
+                text: "消息"
+            },
+            {
+                pagePath: "/pages/main/index/index",
+                iconPath: "/static/common/tabbar/findFriends.png",
+                selectedIconPath: "/static/common/tabbar/selectFindFridend.png",
+                text: "找校友"
+            },
+            {
+                pagePath: "/pages/AlumniCircle/alumnus/alumnus",
+                iconPath: "/static/common/tabbar/AlumniCircle.png",
+                selectedIconPath: "/static/common/tabbar/selectAlumniCircle.png",
+                text: "校友圈"
+            },
+
+            {
+                pagePath: "/pages/my/my/my",
+                iconPath: "/static/common/tabbar/my.png",
+                selectedIconPath: "/static/common/tabbar/selectmy.png",
+                text: "我的"
+            }
+        ],
+        vuex_education: [],
+        vuex_schoolName: "",
+        vuex_userInfo: lifeData.vuex_userInfo ? lifeData.vuex_userInfo :''
+    },
+    mutations: {
+        $uStore(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就是一个普通变量的情况
+                state[payload.name] = payload.value;
+                saveKey = payload.name;
+            }
+            // 保存变量到本地，见顶部函数定义
+            saveLifeData(saveKey, state[saveKey])
+        }
+    }
+})
+
+export default store
diff --git a/template.h5.html b/template.h5.html
new file mode 100644
index 0000000..aa677bd
--- /dev/null
+++ b/template.h5.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<!-- <link rel="shortcut icon" type="image/x-icon" href="https://cdn.uviewui.com/uview/common/favicon.ico"> -->
+		<meta name="viewport"
+			content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+		<title>
+			<%= htmlWebpackPlugin.options.title %>
+		</title>
+
+		<!-- <script src="//cdn.jsdelivr.net/npm/eruda"></script> -->
+		<!-- 正式发布的时候使用，开发期间不启用。↓ -->
+<!--		<script src="/static/common/js/touch-emulator.js"></script>-->
+<!--		<script>-->
+<!--			TouchEmulator();-->
+<!--		</script>-->
+<!--		<style>-->
+<!--			::-webkit-scrollbar {-->
+<!--				display: none;-->
+<!--			}-->
+<!--		</style>-->
+		<!-- 正式发布的时候使用，开发期间不启用。↑ -->
+		<link rel="stylesheet" href="<%= BASE_URL %>static/index.css" />
+		<script type="text/javascript">
+			window.onload = function() {
+				getRem(350, 100)
+			};
+			window.onresize = function() {
+				getRem(350, 100)
+			};
+
+			function getRem(pwidth, prem) {
+				var html = document.getElementsByTagName("html")[0];
+				var oWidth = document.body.clientWidth || document.documentElement.clientWidth;
+				html.style.fontSize = oWidth / pwidth * prem + "px";
+			}
+		</script>
+	</head>
+
+	<body>
+		<noscript>
+			<strong>本站点必须要开启JavaScript才能运行</strong>
+		</noscript>
+		<div id="app">
+		</div>
+		<!-- built files will be auto injected -->
+		<script>
+			/*BAIDU_STAT*/
+		</script>
+	</body>
+
+</html>
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..8c223a7
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,7 @@
+/**
+ * 下方引入的为uView UI的集成样式文件，为scss预处理器，其中包含了一些"u-"开头的自定义变量
+ * 使用的时候，请将下面的一行复制到您的uniapp项目根目录的uni.scss中即可
+ * uView自定义的css类名和scss变量，均以"u-"开头，不会造成冲突，请放心使用 
+ */
+@import 'uview-ui/theme.scss';
+
diff --git a/uni_modules/Lyuan-SignalR/changelog.md b/uni_modules/Lyuan-SignalR/changelog.md
new file mode 100644
index 0000000..37d932e
--- /dev/null
+++ b/uni_modules/Lyuan-SignalR/changelog.md
@@ -0,0 +1,12 @@
+## 1.3.5（2021-12-03）
+更新文档，新增链接失败，断开重试示例
+## 1.3.4（2021-12-03）
+更新文档
+## 1.3.3（2021-12-02）
+更新文档，新增链接失败，断开重试示例
+## 1.3.2（2021-12-02）
+更新文档，新增链接失败，断开重试示例
+## 1.3.1（2021-02-26）
+* 更新兼容SSE， LongPolling
+* 更新支持uni_modules，
+* 更新示例项目
diff --git a/uni_modules/Lyuan-SignalR/js_sdk/signalr.js b/uni_modules/Lyuan-SignalR/js_sdk/signalr.js
new file mode 100644
index 0000000..fc56d4b
--- /dev/null
+++ b/uni_modules/Lyuan-SignalR/js_sdk/signalr.js
@@ -0,0 +1,9 @@
+/** 
+ * @overview ASP.NET Core SignalR JavaScript Client.
+ * @version 0.0.0-DEV_BUILD.
+ * @license
+ * Copyright (c) .NET Foundation. All rights reserved.
+ * Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+ */
+(function(global,factory){typeof exports==="object"&&typeof module!=="undefined"?module.exports=factory():typeof define==="function"&&define.amd?define(factory):global.signalR=factory()})(this,function(){"use strict";function unwrapExports(x){return x&&x.__esModule&&Object.prototype.hasOwnProperty.call(x,"default")?x["default"]:x}function createCommonjsModule(fn,module){return module={exports:{}},fn(module,module.exports),module.exports}var extendStatics=function(d,b){extendStatics=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(d,b){d.__proto__=b}||function(d,b){for(var p in b)if(b.hasOwnProperty(p))d[p]=b[p]};return extendStatics(d,b)};function __extends(d,b){extendStatics(d,b);function __(){this.constructor=d}d.prototype=b===null?Object.create(b):(__.prototype=b.prototype,new __)}var __assign=function(){__assign=Object.assign||function __assign(t){for(var s,i=1,n=arguments.length;i<n;i++){s=arguments[i];for(var p in s)if(Object.prototype.hasOwnProperty.call(s,p))t[p]=s[p]}return t};return __assign.apply(this,arguments)};function __rest(s,e){var t={};for(var p in s)if(Object.prototype.hasOwnProperty.call(s,p)&&e.indexOf(p)<0)t[p]=s[p];if(s!=null&&typeof Object.getOwnPropertySymbols==="function")for(var i=0,p=Object.getOwnPropertySymbols(s);i<p.length;i++){if(e.indexOf(p[i])<0&&Object.prototype.propertyIsEnumerable.call(s,p[i]))t[p[i]]=s[p[i]]}return t}function __decorate(decorators,target,key,desc){var c=arguments.length,r=c<3?target:desc===null?desc=Object.getOwnPropertyDescriptor(target,key):desc,d;if(typeof Reflect==="object"&&typeof Reflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);else for(var i=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3?d(r):c>3?d(target,key,r):d(target,key))||r;return c>3&&r&&Object.defineProperty(target,key,r),r}function __param(paramIndex,decorator){return function(target,key){decorator(target,key,paramIndex)}}function __metadata(metadataKey,metadataValue){if(typeof Reflect==="object"&&typeof Reflect.metadata==="function")return Reflect.metadata(metadataKey,metadataValue)}function __awaiter(thisArg,_arguments,P,generator){function adopt(value){return value instanceof P?value:new P(function(resolve){resolve(value)})}return new(P||(P=Promise))(function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator["throw"](value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):adopt(result.value).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())})}function __generator(thisArg,body){var _={label:0,sent:function(){if(t[0]&1)throw t[1];return t[1]},trys:[],ops:[]},f,y,t,g;return g={next:verb(0),throw:verb(1),return:verb(2)},typeof Symbol==="function"&&(g[Symbol.iterator]=function(){return this}),g;function verb(n){return function(v){return step([n,v])}}function step(op){if(f)throw new TypeError("Generator is already executing.");while(_)try{if(f=1,y&&(t=op[0]&2?y["return"]:op[0]?y["throw"]||((t=y["return"])&&t.call(y),0):y.next)&&!(t=t.call(y,op[1])).done)return t;if(y=0,t)op=[op[0]&2,t.value];switch(op[0]){case 0:case 1:t=op;break;case 4:_.label++;return{value:op[1],done:false};case 5:_.label++;y=op[1];op=[0];continue;case 7:op=_.ops.pop();_.trys.pop();continue;default:if(!(t=_.trys,t=t.length>0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]<t[3])){_.label=op[1];break}if(op[0]===6&&_.label<t[1]){_.label=t[1];t=op;break}if(t&&_.label<t[2]){_.label=t[2];_.ops.push(op);break}if(t[2])_.ops.pop();_.trys.pop();continue}op=body.call(thisArg,_)}catch(e){op=[6,e];y=0}finally{f=t=0}if(op[0]&5)throw op[1];return{value:op[0]?op[1]:void 0,done:true}}}function __createBinding(o,m,k,k2){if(k2===undefined)k2=k;o[k2]=m[k]}function __exportStar(m,exports){for(var p in m)if(p!=="default"&&!exports.hasOwnProperty(p))exports[p]=m[p]}function __values(o){var s=typeof Symbol==="function"&&Symbol.iterator,m=s&&o[s],i=0;if(m)return m.call(o);if(o&&typeof o.length==="number")return{next:function(){if(o&&i>=o.length)o=void 0;return{value:o&&o[i++],done:!o}}};throw new TypeError(s?"Object is not iterable.":"Symbol.iterator is not defined.")}function __read(o,n){var m=typeof Symbol==="function"&&o[Symbol.iterator];if(!m)return o;var i=m.call(o),r,ar=[],e;try{while((n===void 0||n-- >0)&&!(r=i.next()).done)ar.push(r.value)}catch(error){e={error:error}}finally{try{if(r&&!r.done&&(m=i["return"]))m.call(i)}finally{if(e)throw e.error}}return ar}function __spread(){for(var ar=[],i=0;i<arguments.length;i++)ar=ar.concat(__read(arguments[i]));return ar}function __spreadArrays(){for(var s=0,i=0,il=arguments.length;i<il;i++)s+=arguments[i].length;for(var r=Array(s),k=0,i=0;i<il;i++)for(var a=arguments[i],j=0,jl=a.length;j<jl;j++,k++)r[k]=a[j];return r}function __await(v){return this instanceof __await?(this.v=v,this):new __await(v)}function __asyncGenerator(thisArg,_arguments,generator){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var g=generator.apply(thisArg,_arguments||[]),i,q=[];return i={},verb("next"),verb("throw"),verb("return"),i[Symbol.asyncIterator]=function(){return this},i;function verb(n){if(g[n])i[n]=function(v){return new Promise(function(a,b){q.push([n,v,a,b])>1||resume(n,v)})}}function resume(n,v){try{step(g[n](v))}catch(e){settle(q[0][3],e)}}function step(r){r.value instanceof __await?Promise.resolve(r.value.v).then(fulfill,reject):settle(q[0][2],r)}function fulfill(value){resume("next",value)}function reject(value){resume("throw",value)}function settle(f,v){if(f(v),q.shift(),q.length)resume(q[0][0],q[0][1])}}function __asyncDelegator(o){var i,p;return i={},verb("next"),verb("throw",function(e){throw e}),verb("return"),i[Symbol.iterator]=function(){return this},i;function verb(n,f){i[n]=o[n]?function(v){return(p=!p)?{value:__await(o[n](v)),done:n==="return"}:f?f(v):v}:f}}function __asyncValues(o){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var m=o[Symbol.asyncIterator],i;return m?m.call(o):(o=typeof __values==="function"?__values(o):o[Symbol.iterator](),i={},verb("next"),verb("throw"),verb("return"),i[Symbol.asyncIterator]=function(){return this},i);function verb(n){i[n]=o[n]&&function(v){return new Promise(function(resolve,reject){v=o[n](v),settle(resolve,reject,v.done,v.value)})}}function settle(resolve,reject,d,v){Promise.resolve(v).then(function(v){resolve({value:v,done:d})},reject)}}function __makeTemplateObject(cooked,raw){if(Object.defineProperty){Object.defineProperty(cooked,"raw",{value:raw})}else{cooked.raw=raw}return cooked}function __importStar(mod){if(mod&&mod.__esModule)return mod;var result={};if(mod!=null)for(var k in mod)if(Object.hasOwnProperty.call(mod,k))result[k]=mod[k];result.default=mod;return result}function __importDefault(mod){return mod&&mod.__esModule?mod:{default:mod}}function __classPrivateFieldGet(receiver,privateMap){if(!privateMap.has(receiver)){throw new TypeError("attempted to get private field on non-instance")}return privateMap.get(receiver)}function __classPrivateFieldSet(receiver,privateMap,value){if(!privateMap.has(receiver)){throw new TypeError("attempted to set private field on non-instance")}privateMap.set(receiver,value);return value}var tslib_1=Object.freeze({__extends:__extends,get __assign(){return __assign},__rest:__rest,__decorate:__decorate,__param:__param,__metadata:__metadata,__awaiter:__awaiter,__generator:__generator,__createBinding:__createBinding,__exportStar:__exportStar,__values:__values,__read:__read,__spread:__spread,__spreadArrays:__spreadArrays,__await:__await,__asyncGenerator:__asyncGenerator,__asyncDelegator:__asyncDelegator,__asyncValues:__asyncValues,__makeTemplateObject:__makeTemplateObject,__importStar:__importStar,__importDefault:__importDefault,__classPrivateFieldGet:__classPrivateFieldGet,__classPrivateFieldSet:__classPrivateFieldSet});var Errors=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var HttpError=function(_super){tslib_1.__extends(HttpError,_super);function HttpError(errorMessage,statusCode){var _newTarget=this.constructor;var _this=this;var trueProto=_newTarget.prototype;_this=_super.call(this,errorMessage)||this;_this.statusCode=statusCode;_this.__proto__=trueProto;return _this}return HttpError}(Error);exports.HttpError=HttpError;var TimeoutError=function(_super){tslib_1.__extends(TimeoutError,_super);function TimeoutError(errorMessage){var _newTarget=this.constructor;if(errorMessage===void 0){errorMessage="A timeout occurred."}var _this=this;var trueProto=_newTarget.prototype;_this=_super.call(this,errorMessage)||this;_this.__proto__=trueProto;return _this}return TimeoutError}(Error);exports.TimeoutError=TimeoutError});unwrapExports(Errors);var Errors_1=Errors.HttpError;var Errors_2=Errors.TimeoutError;var ILogger=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var LogLevel;(function(LogLevel){LogLevel[LogLevel["Trace"]=0]="Trace";LogLevel[LogLevel["Debug"]=1]="Debug";LogLevel[LogLevel["Information"]=2]="Information";LogLevel[LogLevel["Warning"]=3]="Warning";LogLevel[LogLevel["Error"]=4]="Error";LogLevel[LogLevel["Critical"]=5]="Critical";LogLevel[LogLevel["None"]=6]="None"})(LogLevel=exports.LogLevel||(exports.LogLevel={}))});unwrapExports(ILogger);var ILogger_1=ILogger.LogLevel;var HttpClient_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var HttpResponse=function(){function HttpResponse(statusCode,statusText,content){this.statusCode=statusCode;this.statusText=statusText;this.content=content}return HttpResponse}();exports.HttpResponse=HttpResponse;var HttpClient=function(){function HttpClient(){}HttpClient.prototype.get=function(url,options){return this.send(tslib_1.__assign({},options,{method:"GET",url:url}))};HttpClient.prototype.post=function(url,options){return this.send(tslib_1.__assign({},options,{method:"POST",url:url}))};HttpClient.prototype.delete=function(url,options){return this.send(tslib_1.__assign({},options,{method:"DELETE",url:url}))};return HttpClient}();exports.HttpClient=HttpClient;var DefaultHttpClient=function(_super){tslib_1.__extends(DefaultHttpClient,_super);function DefaultHttpClient(logger){var _this=_super.call(this)||this;_this.logger=logger;return _this}DefaultHttpClient.prototype.send=function(request){var _this=this;return new Promise(function(resolve,reject){var headers={"X-Requested-With":"XMLHttpRequest"};var responseType="text";if(request.headers){Object.keys(request.headers).forEach(function(header){headers[header]=request.headers[header]})}if(request.responseType){responseType=request.responseType}uni.request({url:request.url,data:request.content||"",header:headers,method:request.method,responseType:responseType,withCredentials:true,timeout:request.timeout||5e3,success:function(res){if(request.abortSignal){request.abortSignal.onabort=null}var statusText=res.errMsg.split(":")[1];var responseText=JSON.stringify(res.data);if(typeof res.data=="object"){responseText=JSON.stringify(res.data)}else{responseText=res.data}if(res.statusCode>=200&&res.statusCode<300){resolve(new HttpResponse(res.statusCode,statusText,responseText))}else{reject(new Errors.HttpError(responseText,res.statusCode))}},fail:function(res){if(res.errMsg.includes("timeout")){_this.logger.log(ILogger.LogLevel.Warning,"Timeout from HTTP request.");reject(new Errors.TimeoutError)}else{_this.logger.log(ILogger.LogLevel.Warning,"Error from HTTP request. "+res.statusCode+": "+res.errMsg);reject(new Errors.HttpError(res.errMsg,res.statusCode))}},complete:function(){}})})};return DefaultHttpClient}(HttpClient);exports.DefaultHttpClient=DefaultHttpClient});unwrapExports(HttpClient_1);var HttpClient_2=HttpClient_1.HttpResponse;var HttpClient_3=HttpClient_1.HttpClient;var HttpClient_4=HttpClient_1.DefaultHttpClient;var TextMessageFormat_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var TextMessageFormat=function(){function TextMessageFormat(){}TextMessageFormat.write=function(output){return""+output+TextMessageFormat.RecordSeparator};TextMessageFormat.parse=function(input){if(input[input.length-1]!==TextMessageFormat.RecordSeparator){throw new Error("Message is incomplete.")}var messages=input.split(TextMessageFormat.RecordSeparator);messages.pop();return messages};TextMessageFormat.RecordSeparatorCode=30;TextMessageFormat.RecordSeparator=String.fromCharCode(TextMessageFormat.RecordSeparatorCode);return TextMessageFormat}();exports.TextMessageFormat=TextMessageFormat});unwrapExports(TextMessageFormat_1);var TextMessageFormat_2=TextMessageFormat_1.TextMessageFormat;var HandshakeProtocol_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var HandshakeProtocol=function(){function HandshakeProtocol(){}HandshakeProtocol.prototype.writeHandshakeRequest=function(handshakeRequest){return TextMessageFormat_1.TextMessageFormat.write(JSON.stringify(handshakeRequest))};HandshakeProtocol.prototype.parseHandshakeResponse=function(data){var responseMessage;var messageData;var remainingData;if(data instanceof ArrayBuffer){var binaryData=new Uint8Array(data);var separatorIndex=binaryData.indexOf(TextMessageFormat_1.TextMessageFormat.RecordSeparatorCode);if(separatorIndex===-1){throw new Error("Message is incomplete.")}var responseLength=separatorIndex+1;messageData=String.fromCharCode.apply(null,binaryData.slice(0,responseLength));remainingData=binaryData.byteLength>responseLength?binaryData.slice(responseLength).buffer:null}else{var textData=data;var separatorIndex=textData.indexOf(TextMessageFormat_1.TextMessageFormat.RecordSeparator);if(separatorIndex===-1){throw new Error("Message is incomplete.")}var responseLength=separatorIndex+1;messageData=textData.substring(0,responseLength);remainingData=textData.length>responseLength?textData.substring(responseLength):null}var messages=TextMessageFormat_1.TextMessageFormat.parse(messageData);responseMessage=JSON.parse(messages[0]);return[remainingData,responseMessage]};return HandshakeProtocol}();exports.HandshakeProtocol=HandshakeProtocol});unwrapExports(HandshakeProtocol_1);var HandshakeProtocol_2=HandshakeProtocol_1.HandshakeProtocol;var IHubProtocol=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var MessageType;(function(MessageType){MessageType[MessageType["Invocation"]=1]="Invocation";MessageType[MessageType["StreamItem"]=2]="StreamItem";MessageType[MessageType["Completion"]=3]="Completion";MessageType[MessageType["StreamInvocation"]=4]="StreamInvocation";MessageType[MessageType["CancelInvocation"]=5]="CancelInvocation";MessageType[MessageType["Ping"]=6]="Ping";MessageType[MessageType["Close"]=7]="Close"})(MessageType=exports.MessageType||(exports.MessageType={}))});unwrapExports(IHubProtocol);var IHubProtocol_1=IHubProtocol.MessageType;var Loggers=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var NullLogger=function(){function NullLogger(){}NullLogger.prototype.log=function(logLevel,message){};NullLogger.instance=new NullLogger;return NullLogger}();exports.NullLogger=NullLogger});unwrapExports(Loggers);var Loggers_1=Loggers.NullLogger;var Utils=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var Arg=function(){function Arg(){}Arg.isRequired=function(val,name){if(val===null||val===undefined){throw new Error("The '"+name+"' argument is required.")}};Arg.isIn=function(val,values,name){if(!(val in values)){throw new Error("Unknown "+name+" value: "+val+".")}};return Arg}();exports.Arg=Arg;function getDataDetail(data,includeContent){var length=null;if(data instanceof ArrayBuffer){length="Binary data of length "+data.byteLength;if(includeContent){length+=". Content: '"+formatArrayBuffer(data)+"'"}}else if(typeof data==="string"){length="String data of length "+data.length;if(includeContent){length+=". Content: '"+data+"'."}}return length}exports.getDataDetail=getDataDetail;function formatArrayBuffer(data){var view=new Uint8Array(data);var str="";view.forEach(function(num){var pad=num<16?"0":"";str+="0x"+pad+num.toString(16)+" "});return str.substr(0,str.length-1)}exports.formatArrayBuffer=formatArrayBuffer;function sendMessage(logger,transportName,httpClient,url,accessTokenFactory,content,logMessageContent){return tslib_1.__awaiter(this,void 0,void 0,function(){var _a,headers,token,response;return tslib_1.__generator(this,function(_b){switch(_b.label){case 0:return[4,accessTokenFactory()];case 1:token=_b.sent();if(token){headers=(_a={},_a["Authorization"]="Bearer "+token,_a)}logger.log(ILogger.LogLevel.Trace,"("+transportName+" transport) sending data. "+getDataDetail(content,logMessageContent)+".");return[4,httpClient.post(url,{content:content,headers:headers})];case 2:response=_b.sent();logger.log(ILogger.LogLevel.Trace,"("+transportName+" transport) request complete. Response status: "+response.statusCode+".");return[2]}})})}exports.sendMessage=sendMessage;function createLogger(logger){if(logger===undefined){return new ConsoleLogger(ILogger.LogLevel.Information)}if(logger===null){return Loggers.NullLogger.instance}if(logger.log){return logger}return new ConsoleLogger(logger)}exports.createLogger=createLogger;var Subject=function(){function Subject(cancelCallback){this.observers=[];this.cancelCallback=cancelCallback}Subject.prototype.next=function(item){for(var _i=0,_a=this.observers;_i<_a.length;_i++){var observer=_a[_i];observer.next(item)}};Subject.prototype.error=function(err){for(var _i=0,_a=this.observers;_i<_a.length;_i++){var observer=_a[_i];if(observer.error){observer.error(err)}}};Subject.prototype.complete=function(){for(var _i=0,_a=this.observers;_i<_a.length;_i++){var observer=_a[_i];if(observer.complete){observer.complete()}}};Subject.prototype.subscribe=function(observer){this.observers.push(observer);return new SubjectSubscription(this,observer)};return Subject}();exports.Subject=Subject;var SubjectSubscription=function(){function SubjectSubscription(subject,observer){this.subject=subject;this.observer=observer}SubjectSubscription.prototype.dispose=function(){var index=this.subject.observers.indexOf(this.observer);if(index>-1){this.subject.observers.splice(index,1)}if(this.subject.observers.length===0){this.subject.cancelCallback().catch(function(_){})}};return SubjectSubscription}();exports.SubjectSubscription=SubjectSubscription;var ConsoleLogger=function(){function ConsoleLogger(minimumLogLevel){this.minimumLogLevel=minimumLogLevel}ConsoleLogger.prototype.log=function(logLevel,message){if(logLevel>=this.minimumLogLevel){switch(logLevel){case ILogger.LogLevel.Critical:case ILogger.LogLevel.Error:console.error(ILogger.LogLevel[logLevel]+": "+message);break;case ILogger.LogLevel.Warning:console.warn(ILogger.LogLevel[logLevel]+": "+message);break;case ILogger.LogLevel.Information:console.info(ILogger.LogLevel[logLevel]+": "+message);break;default:console.log(ILogger.LogLevel[logLevel]+": "+message);break}}};return ConsoleLogger}();exports.ConsoleLogger=ConsoleLogger});unwrapExports(Utils);var Utils_1=Utils.Arg;var Utils_2=Utils.getDataDetail;var Utils_3=Utils.formatArrayBuffer;var Utils_4=Utils.sendMessage;var Utils_5=Utils.createLogger;var Utils_6=Utils.Subject;var Utils_7=Utils.SubjectSubscription;var Utils_8=Utils.ConsoleLogger;var HubConnection_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var DEFAULT_TIMEOUT_IN_MS=30*1e3;var HubConnection=function(){function HubConnection(connection,logger,protocol){var _this=this;Utils.Arg.isRequired(connection,"connection");Utils.Arg.isRequired(logger,"logger");Utils.Arg.isRequired(protocol,"protocol");this.serverTimeoutInMilliseconds=DEFAULT_TIMEOUT_IN_MS;this.logger=logger;this.protocol=protocol;this.connection=connection;this.handshakeProtocol=new HandshakeProtocol_1.HandshakeProtocol;this.connection.onreceive=function(data){return _this.processIncomingData(data)};this.connection.onclose=function(error){return _this.connectionClosed(error)};this.callbacks={};this.methods={};this.closedCallbacks=[];this.id=0}HubConnection.create=function(connection,logger,protocol){return new HubConnection(connection,logger,protocol)};HubConnection.prototype.start=function(){return tslib_1.__awaiter(this,void 0,void 0,function(){var handshakeRequest;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:handshakeRequest={protocol:this.protocol.name,version:this.protocol.version};this.logger.log(ILogger.LogLevel.Debug,"Starting HubConnection.");this.receivedHandshakeResponse=false;return[4,this.connection.start(this.protocol.transferFormat)];case 1:_a.sent();this.logger.log(ILogger.LogLevel.Debug,"Sending handshake request.");return[4,this.connection.send(this.handshakeProtocol.writeHandshakeRequest(handshakeRequest))];case 2:_a.sent();this.logger.log(ILogger.LogLevel.Information,"Using HubProtocol '"+this.protocol.name+"'.");this.cleanupTimeout();this.configureTimeout();return[2]}})})};HubConnection.prototype.stop=function(){this.logger.log(ILogger.LogLevel.Debug,"Stopping HubConnection.");this.cleanupTimeout();return this.connection.stop()};HubConnection.prototype.stream=function(methodName){var _this=this;var args=[];for(var _i=1;_i<arguments.length;_i++){args[_i-1]=arguments[_i]}var invocationDescriptor=this.createStreamInvocation(methodName,args);var subject=new Utils.Subject(function(){var cancelInvocation=_this.createCancelInvocation(invocationDescriptor.invocationId);var cancelMessage=_this.protocol.writeMessage(cancelInvocation);delete _this.callbacks[invocationDescriptor.invocationId];return _this.connection.send(cancelMessage)});this.callbacks[invocationDescriptor.invocationId]=function(invocationEvent,error){if(error){subject.error(error);return}if(invocationEvent.type===IHubProtocol.MessageType.Completion){if(invocationEvent.error){subject.error(new Error(invocationEvent.error))}else{subject.complete()}}else{subject.next(invocationEvent.item)}};var message=this.protocol.writeMessage(invocationDescriptor);this.connection.send(message).catch(function(e){subject.error(e);delete _this.callbacks[invocationDescriptor.invocationId]});return subject};HubConnection.prototype.send=function(methodName){var args=[];for(var _i=1;_i<arguments.length;_i++){args[_i-1]=arguments[_i]}var invocationDescriptor=this.createInvocation(methodName,args,true);var message=this.protocol.writeMessage(invocationDescriptor);return this.connection.send(message)};HubConnection.prototype.invoke=function(methodName){var _this=this;var args=[];for(var _i=1;_i<arguments.length;_i++){args[_i-1]=arguments[_i]}var invocationDescriptor=this.createInvocation(methodName,args,false);var p=new Promise(function(resolve,reject){_this.callbacks[invocationDescriptor.invocationId]=function(invocationEvent,error){if(error){reject(error);return}if(invocationEvent.type===IHubProtocol.MessageType.Completion){var completionMessage=invocationEvent;if(completionMessage.error){reject(new Error(completionMessage.error))}else{resolve(completionMessage.result)}}else{reject(new Error("Unexpected message type: "+invocationEvent.type))}};var message=_this.protocol.writeMessage(invocationDescriptor);_this.connection.send(message).catch(function(e){reject(e);delete _this.callbacks[invocationDescriptor.invocationId]})});return p};HubConnection.prototype.on=function(methodName,newMethod){if(!methodName||!newMethod){return}methodName=methodName.toLowerCase();if(!this.methods[methodName]){this.methods[methodName]=[]}if(this.methods[methodName].indexOf(newMethod)!==-1){return}this.methods[methodName].push(newMethod)};HubConnection.prototype.off=function(methodName,method){if(!methodName){return}methodName=methodName.toLowerCase();var handlers=this.methods[methodName];if(!handlers){return}if(method){var removeIdx=handlers.indexOf(method);if(removeIdx!==-1){handlers.splice(removeIdx,1);if(handlers.length===0){delete this.methods[methodName]}}}else{delete this.methods[methodName]}};HubConnection.prototype.onclose=function(callback){if(callback){this.closedCallbacks.push(callback)}};HubConnection.prototype.processIncomingData=function(data){this.cleanupTimeout();if(!this.receivedHandshakeResponse){data=this.processHandshakeResponse(data);this.receivedHandshakeResponse=true}if(data){var messages=this.protocol.parseMessages(data,this.logger);for(var _i=0,messages_1=messages;_i<messages_1.length;_i++){var message=messages_1[_i];switch(message.type){case IHubProtocol.MessageType.Invocation:this.invokeClientMethod(message);break;case IHubProtocol.MessageType.StreamItem:case IHubProtocol.MessageType.Completion:var callback=this.callbacks[message.invocationId];if(callback!=null){if(message.type===IHubProtocol.MessageType.Completion){delete this.callbacks[message.invocationId]}callback(message)}break;case IHubProtocol.MessageType.Ping:break;case IHubProtocol.MessageType.Close:this.logger.log(ILogger.LogLevel.Information,"Close message received from server.");this.connection.stop(message.error?new Error("Server returned an error on close: "+message.error):null);break;default:this.logger.log(ILogger.LogLevel.Warning,"Invalid message type: "+message.type);break}}}this.configureTimeout()};HubConnection.prototype.processHandshakeResponse=function(data){var _a;var responseMessage;var remainingData;try{_a=this.handshakeProtocol.parseHandshakeResponse(data),remainingData=_a[0],responseMessage=_a[1]}catch(e){var message="Error parsing handshake response: "+e;this.logger.log(ILogger.LogLevel.Error,message);var error=new Error(message);this.connection.stop(error);throw error}if(responseMessage.error){var message="Server returned handshake error: "+responseMessage.error;this.logger.log(ILogger.LogLevel.Error,message);this.connection.stop(new Error(message))}else{this.logger.log(ILogger.LogLevel.Debug,"Server handshake complete.")}return remainingData};HubConnection.prototype.configureTimeout=function(){var _this=this;if(!this.connection.features||!this.connection.features.inherentKeepAlive){this.timeoutHandle=setTimeout(function(){return _this.serverTimeout()},this.serverTimeoutInMilliseconds)}};HubConnection.prototype.serverTimeout=function(){this.connection.stop(new Error("Server timeout elapsed without receiving a message from the server."))};HubConnection.prototype.invokeClientMethod=function(invocationMessage){var _this=this;var methods=this.methods[invocationMessage.target.toLowerCase()];if(methods){methods.forEach(function(m){return m.apply(_this,invocationMessage.arguments)});if(invocationMessage.invocationId){var message="Server requested a response, which is not supported in this version of the client.";this.logger.log(ILogger.LogLevel.Error,message);this.connection.stop(new Error(message))}}else{this.logger.log(ILogger.LogLevel.Warning,"No client method with the name '"+invocationMessage.target+"' found.")}};HubConnection.prototype.connectionClosed=function(error){var _this=this;var callbacks=this.callbacks;this.callbacks={};Object.keys(callbacks).forEach(function(key){var callback=callbacks[key];callback(undefined,error?error:new Error("Invocation canceled due to connection being closed."))});this.cleanupTimeout();this.closedCallbacks.forEach(function(c){return c.apply(_this,[error])})};HubConnection.prototype.cleanupTimeout=function(){if(this.timeoutHandle){clearTimeout(this.timeoutHandle)}};HubConnection.prototype.createInvocation=function(methodName,args,nonblocking){if(nonblocking){return{arguments:args,target:methodName,type:IHubProtocol.MessageType.Invocation}}else{var id=this.id;this.id++;return{arguments:args,invocationId:id.toString(),target:methodName,type:IHubProtocol.MessageType.Invocation}}};HubConnection.prototype.createStreamInvocation=function(methodName,args){var id=this.id;this.id++;return{arguments:args,invocationId:id.toString(),target:methodName,type:IHubProtocol.MessageType.StreamInvocation}};HubConnection.prototype.createCancelInvocation=function(id){return{invocationId:id,type:IHubProtocol.MessageType.CancelInvocation}};return HubConnection}();exports.HubConnection=HubConnection});unwrapExports(HubConnection_1);var HubConnection_2=HubConnection_1.HubConnection;var ITransport=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var HttpTransportType;(function(HttpTransportType){HttpTransportType[HttpTransportType["None"]=0]="None";HttpTransportType[HttpTransportType["WebSockets"]=1]="WebSockets";HttpTransportType[HttpTransportType["ServerSentEvents"]=2]="ServerSentEvents";HttpTransportType[HttpTransportType["LongPolling"]=4]="LongPolling"})(HttpTransportType=exports.HttpTransportType||(exports.HttpTransportType={}));var TransferFormat;(function(TransferFormat){TransferFormat[TransferFormat["Text"]=1]="Text";TransferFormat[TransferFormat["Binary"]=2]="Binary"})(TransferFormat=exports.TransferFormat||(exports.TransferFormat={}))});unwrapExports(ITransport);var ITransport_1=ITransport.HttpTransportType;var ITransport_2=ITransport.TransferFormat;var AbortController_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var AbortController=function(){function AbortController(){this.isAborted=false}AbortController.prototype.abort=function(){if(!this.isAborted){this.isAborted=true;if(this.onabort){this.onabort()}}};Object.defineProperty(AbortController.prototype,"signal",{get:function(){return this},enumerable:true,configurable:true});Object.defineProperty(AbortController.prototype,"aborted",{get:function(){return this.isAborted},enumerable:true,configurable:true});return AbortController}();exports.AbortController=AbortController});unwrapExports(AbortController_1);var AbortController_2=AbortController_1.AbortController;var LongPollingTransport_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var SHUTDOWN_TIMEOUT=5*1e3;var LongPollingTransport=function(){function LongPollingTransport(httpClient,accessTokenFactory,logger,logMessageContent,shutdownTimeout){this.httpClient=httpClient;this.accessTokenFactory=accessTokenFactory||function(){return null};this.logger=logger;this.pollAbort=new AbortController_1.AbortController;this.logMessageContent=logMessageContent;this.shutdownTimeout=shutdownTimeout||SHUTDOWN_TIMEOUT}Object.defineProperty(LongPollingTransport.prototype,"pollAborted",{get:function(){return this.pollAbort.aborted},enumerable:true,configurable:true});LongPollingTransport.prototype.connect=function(url,transferFormat){return tslib_1.__awaiter(this,void 0,void 0,function(){var pollOptions,token,closeError,pollUrl,response;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:Utils.Arg.isRequired(url,"url");Utils.Arg.isRequired(transferFormat,"transferFormat");Utils.Arg.isIn(transferFormat,ITransport.TransferFormat,"transferFormat");this.url=url;this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) Connecting");if(transferFormat===ITransport.TransferFormat.Binary&&typeof(new XMLHttpRequest).responseType!=="string"){throw new Error("Binary protocols over XmlHttpRequest not implementing advanced features are not supported.")}pollOptions={abortSignal:this.pollAbort.signal,headers:{},timeout:9e4};if(transferFormat===ITransport.TransferFormat.Binary){pollOptions.responseType="arraybuffer"}return[4,this.accessTokenFactory()];case 1:token=_a.sent();this.updateHeaderToken(pollOptions,token);pollUrl=url+"&_="+Date.now();this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) polling: "+pollUrl);return[4,this.httpClient.get(pollUrl,pollOptions)];case 2:response=_a.sent();if(response.statusCode!==200){this.logger.log(ILogger.LogLevel.Error,"(LongPolling transport) Unexpected response code: "+response.statusCode);closeError=new Errors.HttpError(response.statusText,response.statusCode);this.running=false}else{this.running=true}this.poll(this.url,pollOptions,closeError);return[2,Promise.resolve()]}})})};LongPollingTransport.prototype.updateHeaderToken=function(request,token){if(token){request.headers["Authorization"]="Bearer "+token;return}if(request.headers["Authorization"]){delete request.headers["Authorization"]}};LongPollingTransport.prototype.poll=function(url,pollOptions,closeError){return tslib_1.__awaiter(this,void 0,void 0,function(){var token,pollUrl,response,e_1;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:_a.trys.push([0,,8,9]);_a.label=1;case 1:if(!this.running)return[3,7];return[4,this.accessTokenFactory()];case 2:token=_a.sent();this.updateHeaderToken(pollOptions,token);_a.label=3;case 3:_a.trys.push([3,5,,6]);pollUrl=url+"&_="+Date.now();this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) polling: "+pollUrl);return[4,this.httpClient.get(pollUrl,pollOptions)];case 4:response=_a.sent();if(response.statusCode===204){this.logger.log(ILogger.LogLevel.Information,"(LongPolling transport) Poll terminated by server");this.running=false}else if(response.statusCode!==200){this.logger.log(ILogger.LogLevel.Error,"(LongPolling transport) Unexpected response code: "+response.statusCode);closeError=new Errors.HttpError(response.statusText,response.statusCode);this.running=false}else{if(response.content){this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) data received. "+Utils.getDataDetail(response.content,this.logMessageContent));if(this.onreceive){this.onreceive(response.content)}}else{this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) Poll timed out, reissuing.")}}return[3,6];case 5:e_1=_a.sent();if(!this.running){this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) Poll errored after shutdown: "+e_1.message)}else{if(e_1 instanceof Errors.TimeoutError){this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) Poll timed out, reissuing.")}else{closeError=e_1;this.running=false}}return[3,6];case 6:return[3,1];case 7:return[3,9];case 8:this.stopped=true;if(this.shutdownTimer){clearTimeout(this.shutdownTimer)}if(this.onclose){this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) Firing onclose event. Error: "+(closeError||"<undefined>"));this.onclose(closeError)}this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) Transport finished.");return[7];case 9:return[2]}})})};LongPollingTransport.prototype.send=function(data){return tslib_1.__awaiter(this,void 0,void 0,function(){return tslib_1.__generator(this,function(_a){if(!this.running){return[2,Promise.reject(new Error("Cannot send until the transport is connected"))]}return[2,Utils.sendMessage(this.logger,"LongPolling",this.httpClient,this.url,this.accessTokenFactory,data,this.logMessageContent)]})})};LongPollingTransport.prototype.stop=function(){return tslib_1.__awaiter(this,void 0,void 0,function(){var deleteOptions,token,response;var _this=this;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:_a.trys.push([0,,3,4]);this.running=false;this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) sending DELETE request to "+this.url+".");deleteOptions={headers:{}};return[4,this.accessTokenFactory()];case 1:token=_a.sent();this.updateHeaderToken(deleteOptions,token);return[4,this.httpClient.delete(this.url,deleteOptions)];case 2:response=_a.sent();this.logger.log(ILogger.LogLevel.Trace,"(LongPolling transport) DELETE request accepted.");return[3,4];case 3:if(!this.stopped){this.shutdownTimer=setTimeout(function(){_this.logger.log(ILogger.LogLevel.Warning,"(LongPolling transport) server did not terminate after DELETE request, canceling poll.");_this.pollAbort.abort()},this.shutdownTimeout)}return[7];case 4:return[2]}})})};return LongPollingTransport}();exports.LongPollingTransport=LongPollingTransport});unwrapExports(LongPollingTransport_1);var LongPollingTransport_2=LongPollingTransport_1.LongPollingTransport;var ServerSentEventsTransport_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var ServerSentEventsTransport=function(){function ServerSentEventsTransport(httpClient,accessTokenFactory,logger,logMessageContent){this.httpClient=httpClient;this.accessTokenFactory=accessTokenFactory||function(){return null};this.logger=logger;this.logMessageContent=logMessageContent}ServerSentEventsTransport.prototype.connect=function(url,transferFormat){return tslib_1.__awaiter(this,void 0,void 0,function(){var token;var _this=this;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:Utils.Arg.isRequired(url,"url");Utils.Arg.isRequired(transferFormat,"transferFormat");Utils.Arg.isIn(transferFormat,ITransport.TransferFormat,"transferFormat");if(typeof EventSource==="undefined"){throw new Error("'EventSource' is not supported in your environment.")}this.logger.log(ILogger.LogLevel.Trace,"(SSE transport) Connecting");return[4,this.accessTokenFactory()];case 1:token=_a.sent();if(token){url+=(url.indexOf("?")<0?"?":"&")+("access_token="+encodeURIComponent(token))}this.url=url;return[2,new Promise(function(resolve,reject){var opened=false;if(transferFormat!==ITransport.TransferFormat.Text){reject(new Error("The Server-Sent Events transport only supports the 'Text' transfer format"))}var eventSource=new EventSource(url,{withCredentials:true});try{eventSource.onmessage=function(e){if(_this.onreceive){try{_this.logger.log(ILogger.LogLevel.Trace,"(SSE transport) data received. "+Utils.getDataDetail(e.data,_this.logMessageContent)+".");_this.onreceive(e.data)}catch(error){if(_this.onclose){_this.onclose(error)}return}}};eventSource.onerror=function(e){var error=new Error(e.message||"Error occurred");if(opened){_this.close(error)}else{reject(error)}};eventSource.onopen=function(){_this.logger.log(ILogger.LogLevel.Information,"SSE connected to "+_this.url);_this.eventSource=eventSource;opened=true;resolve()}}catch(e){return Promise.reject(e)}})]}})})};ServerSentEventsTransport.prototype.send=function(data){return tslib_1.__awaiter(this,void 0,void 0,function(){return tslib_1.__generator(this,function(_a){if(!this.eventSource){return[2,Promise.reject(new Error("Cannot send until the transport is connected"))]}return[2,Utils.sendMessage(this.logger,"SSE",this.httpClient,this.url,this.accessTokenFactory,data,this.logMessageContent)]})})};ServerSentEventsTransport.prototype.stop=function(){this.close();return Promise.resolve()};ServerSentEventsTransport.prototype.close=function(e){if(this.eventSource){this.eventSource.close();this.eventSource=null;if(this.onclose){this.onclose(e)}}};return ServerSentEventsTransport}();exports.ServerSentEventsTransport=ServerSentEventsTransport});unwrapExports(ServerSentEventsTransport_1);var ServerSentEventsTransport_2=ServerSentEventsTransport_1.ServerSentEventsTransport;var WebSocketTransport_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var WebSocketTransport=function(){function WebSocketTransport(accessTokenFactory,logger,logMessageContent){this.logger=logger;this.accessTokenFactory=accessTokenFactory||function(){return null};this.logMessageContent=logMessageContent}WebSocketTransport.prototype.connect=function(url,transferFormat){return tslib_1.__awaiter(this,void 0,void 0,function(){var token;var _this=this;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:Utils.Arg.isRequired(url,"url");Utils.Arg.isRequired(transferFormat,"transferFormat");Utils.Arg.isIn(transferFormat,ITransport.TransferFormat,"transferFormat");if(typeof WebSocket==="undefined"){throw new Error("'WebSocket' is not supported in your environment.")}this.logger.log(ILogger.LogLevel.Trace,"(WebSockets transport) Connecting");return[4,this.accessTokenFactory()];case 1:token=_a.sent();if(token){url+=(url.indexOf("?")<0?"?":"&")+("access_token="+encodeURIComponent(token))}return[2,new Promise(function(resolve,reject){url=url.replace(/^http/,"ws");var webSocket=uni.connectSocket({url:url,complete:function(){console.log("uniapp websocket connect completed")}});if(transferFormat===ITransport.TransferFormat.Binary){webSocket.binaryType="arraybuffer"}webSocket.onOpen(function(event){_this.logger.log(ILogger.LogLevel.Information,"WebSocket connected to "+url);_this.webSocket=webSocket;resolve()});webSocket.onError(function(event){reject(event.error)});webSocket.onMessage(function(message){_this.logger.log(ILogger.LogLevel.Trace,"(WebSockets transport) data received. "+Utils.getDataDetail(message.data,_this.logMessageContent)+".");if(_this.onreceive){_this.onreceive(message.data)}});webSocket.onClose(function(event){_this.logger.log(ILogger.LogLevel.Trace,"(WebSockets transport) socket closed.");if(_this.onclose){if(event.wasClean===false||event.code!==1e3){_this.onclose(new Error("Websocket closed with status code: "+event.code+" ("+event.reason+")"))}else{_this.onclose()}}})})]}})})};WebSocketTransport.prototype.send=function(data){if(this.webSocket&&this.webSocket.readyState===WebSocket.OPEN){this.logger.log(ILogger.LogLevel.Trace,"(WebSockets transport) sending data. "+Utils.getDataDetail(data,this.logMessageContent)+".");this.webSocket.send({data:data});return Promise.resolve()}return Promise.reject("WebSocket is not in the OPEN state")};WebSocketTransport.prototype.stop=function(){if(this.webSocket){this.webSocket.close();this.webSocket=null}return Promise.resolve()};return WebSocketTransport}();exports.WebSocketTransport=WebSocketTransport});unwrapExports(WebSocketTransport_1);var WebSocketTransport_2=WebSocketTransport_1.WebSocketTransport;var HttpConnection_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var MAX_REDIRECTS=100;var HttpConnection=function(){function HttpConnection(url,options){if(options===void 0){options={}}this.features={};Utils.Arg.isRequired(url,"url");this.logger=Utils.createLogger(options.logger);this.baseUrl=this.resolveUrl(url);options=options||{};options.accessTokenFactory=options.accessTokenFactory||function(){return null};options.logMessageContent=options.logMessageContent||false;this.httpClient=options.httpClient||new HttpClient_1.DefaultHttpClient(this.logger);this.connectionState=2;this.options=options}HttpConnection.prototype.start=function(transferFormat){transferFormat=transferFormat||ITransport.TransferFormat.Binary;Utils.Arg.isIn(transferFormat,ITransport.TransferFormat,"transferFormat");this.logger.log(ILogger.LogLevel.Debug,"Starting connection with transfer format '"+ITransport.TransferFormat[transferFormat]+"'.");if(this.connectionState!==2){return Promise.reject(new Error("Cannot start a connection that is not in the 'Disconnected' state."))}this.connectionState=0;this.startPromise=this.startInternal(transferFormat);return this.startPromise};HttpConnection.prototype.send=function(data){if(this.connectionState!==1){throw new Error("Cannot send data if the connection is not in the 'Connected' State.")}return this.transport.send(data)};HttpConnection.prototype.stop=function(error){return tslib_1.__awaiter(this,void 0,void 0,function(){var e_1;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:this.connectionState=2;_a.label=1;case 1:_a.trys.push([1,3,,4]);return[4,this.startPromise];case 2:_a.sent();return[3,4];case 3:e_1=_a.sent();return[3,4];case 4:if(!this.transport)return[3,6];this.stopError=error;return[4,this.transport.stop()];case 5:_a.sent();this.transport=null;_a.label=6;case 6:return[2]}})})};HttpConnection.prototype.startInternal=function(transferFormat){return tslib_1.__awaiter(this,void 0,void 0,function(){var url,negotiateResponse,redirects,_loop_1,this_1,state_1,e_2;var _this=this;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:url=this.baseUrl;this.accessTokenFactory=this.options.accessTokenFactory;_a.label=1;case 1:_a.trys.push([1,12,,13]);if(!this.options.skipNegotiation)return[3,5];if(!(this.options.transport===ITransport.HttpTransportType.WebSockets))return[3,3];this.transport=this.constructTransport(ITransport.HttpTransportType.WebSockets);return[4,this.transport.connect(url,transferFormat)];case 2:_a.sent();return[3,4];case 3:throw Error("Negotiation can only be skipped when using the WebSocket transport directly.");case 4:return[3,11];case 5:negotiateResponse=null;redirects=0;_loop_1=function(){var accessToken_1;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:return[4,this_1.getNegotiationResponse(url)];case 1:negotiateResponse=_a.sent();if(this_1.connectionState===2){return[2,{value:void 0}]}if(negotiateResponse.url){url=negotiateResponse.url}if(negotiateResponse.accessToken){accessToken_1=negotiateResponse.accessToken;this_1.accessTokenFactory=function(){return accessToken_1}}redirects++;return[2]}})};this_1=this;_a.label=6;case 6:return[5,_loop_1()];case 7:state_1=_a.sent();if(typeof state_1==="object")return[2,state_1.value];_a.label=8;case 8:if(negotiateResponse.url&&redirects<MAX_REDIRECTS)return[3,6];_a.label=9;case 9:if(redirects===MAX_REDIRECTS&&negotiateResponse.url){throw Error("Negotiate redirection limit exceeded.")}return[4,this.createTransport(url,this.options.transport,negotiateResponse,transferFormat)];case 10:_a.sent();_a.label=11;case 11:if(this.transport instanceof LongPollingTransport_1.LongPollingTransport){this.features.inherentKeepAlive=true}this.transport.onreceive=this.onreceive;this.transport.onclose=function(e){return _this.stopConnection(e)};this.changeState(0,1);return[3,13];case 12:e_2=_a.sent();this.logger.log(ILogger.LogLevel.Error,"Failed to start the connection: "+e_2);this.connectionState=2;this.transport=null;throw e_2;case 13:return[2]}})})};HttpConnection.prototype.getNegotiationResponse=function(url){return tslib_1.__awaiter(this,void 0,void 0,function(){var _a,token,headers,negotiateUrl,response,e_3;return tslib_1.__generator(this,function(_b){switch(_b.label){case 0:return[4,this.accessTokenFactory()];case 1:token=_b.sent();if(token){headers=(_a={},_a["Authorization"]="Bearer "+token,_a)}negotiateUrl=this.resolveNegotiateUrl(url);this.logger.log(ILogger.LogLevel.Debug,"Sending negotiation request: "+negotiateUrl);_b.label=2;case 2:_b.trys.push([2,4,,5]);return[4,this.httpClient.post(negotiateUrl,{content:"",headers:headers})];case 3:response=_b.sent();if(response.statusCode!==200){throw Error("Unexpected status code returned from negotiate "+response.statusCode)}return[2,JSON.parse(response.content)];case 4:e_3=_b.sent();this.logger.log(ILogger.LogLevel.Error,"Failed to complete negotiation with the server: "+e_3);throw e_3;case 5:return[2]}})})};HttpConnection.prototype.createConnectUrl=function(url,connectionId){return url+(url.indexOf("?")===-1?"?":"&")+("id="+connectionId)};HttpConnection.prototype.createTransport=function(url,requestedTransport,negotiateResponse,requestedTransferFormat){return tslib_1.__awaiter(this,void 0,void 0,function(){var connectUrl,transports,_i,transports_1,endpoint,transport,ex_1;return tslib_1.__generator(this,function(_a){switch(_a.label){case 0:connectUrl=this.createConnectUrl(url,negotiateResponse.connectionId);if(!this.isITransport(requestedTransport))return[3,2];this.logger.log(ILogger.LogLevel.Debug,"Connection was provided an instance of ITransport, using that directly.");this.transport=requestedTransport;return[4,this.transport.connect(connectUrl,requestedTransferFormat)];case 1:_a.sent();this.changeState(0,1);return[2];case 2:transports=negotiateResponse.availableTransports;_i=0,transports_1=transports;_a.label=3;case 3:if(!(_i<transports_1.length))return[3,9];endpoint=transports_1[_i];this.connectionState=0;transport=this.resolveTransport(endpoint,requestedTransport,requestedTransferFormat);if(!(typeof transport==="number"))return[3,8];this.transport=this.constructTransport(transport);if(!(negotiateResponse.connectionId===null))return[3,5];return[4,this.getNegotiationResponse(url)];case 4:negotiateResponse=_a.sent();connectUrl=this.createConnectUrl(url,negotiateResponse.connectionId);_a.label=5;case 5:_a.trys.push([5,7,,8]);return[4,this.transport.connect(connectUrl,requestedTransferFormat)];case 6:_a.sent();this.changeState(0,1);return[2];case 7:ex_1=_a.sent();this.logger.log(ILogger.LogLevel.Error,"Failed to start the transport '"+ITransport.HttpTransportType[transport]+"': "+ex_1);this.connectionState=2;negotiateResponse.connectionId=null;return[3,8];case 8:_i++;return[3,3];case 9:throw new Error("Unable to initialize any of the available transports.")}})})};HttpConnection.prototype.constructTransport=function(transport){switch(transport){case ITransport.HttpTransportType.WebSockets:return new WebSocketTransport_1.WebSocketTransport(this.accessTokenFactory,this.logger,this.options.logMessageContent);case ITransport.HttpTransportType.ServerSentEvents:return new ServerSentEventsTransport_1.ServerSentEventsTransport(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent);case ITransport.HttpTransportType.LongPolling:return new LongPollingTransport_1.LongPollingTransport(this.httpClient,this.accessTokenFactory,this.logger,this.options.logMessageContent);default:throw new Error("Unknown transport: "+transport+".")}};HttpConnection.prototype.resolveTransport=function(endpoint,requestedTransport,requestedTransferFormat){var transport=ITransport.HttpTransportType[endpoint.transport];if(transport===null||transport===undefined){this.logger.log(ILogger.LogLevel.Debug,"Skipping transport '"+endpoint.transport+"' because it is not supported by this client.")}else{var transferFormats=endpoint.transferFormats.map(function(s){return ITransport.TransferFormat[s]});if(transportMatches(requestedTransport,transport)){if(transferFormats.indexOf(requestedTransferFormat)>=0){if(transport===ITransport.HttpTransportType.WebSockets&&typeof WebSocket==="undefined"||transport===ITransport.HttpTransportType.ServerSentEvents&&typeof EventSource==="undefined"){this.logger.log(ILogger.LogLevel.Debug,"Skipping transport '"+ITransport.HttpTransportType[transport]+"' because it is not supported in your environment.'")}else{this.logger.log(ILogger.LogLevel.Debug,"Selecting transport '"+ITransport.HttpTransportType[transport]+"'");return transport}}else{this.logger.log(ILogger.LogLevel.Debug,"Skipping transport '"+ITransport.HttpTransportType[transport]+"' because it does not support the requested transfer format '"+ITransport.TransferFormat[requestedTransferFormat]+"'.")}}else{this.logger.log(ILogger.LogLevel.Debug,"Skipping transport '"+ITransport.HttpTransportType[transport]+"' because it was disabled by the client.")}}return null};HttpConnection.prototype.isITransport=function(transport){return transport&&typeof transport==="object"&&"connect"in transport};HttpConnection.prototype.changeState=function(from,to){if(this.connectionState===from){this.connectionState=to;return true}return false};HttpConnection.prototype.stopConnection=function(error){return tslib_1.__awaiter(this,void 0,void 0,function(){return tslib_1.__generator(this,function(_a){this.transport=null;error=this.stopError||error;if(error){this.logger.log(ILogger.LogLevel.Error,"Connection disconnected with error '"+error+"'.")}else{this.logger.log(ILogger.LogLevel.Information,"Connection disconnected.")}this.connectionState=2;if(this.onclose){this.onclose(error)}return[2]})})};HttpConnection.prototype.resolveUrl=function(url){if(url.lastIndexOf("https://",0)===0||url.lastIndexOf("http://",0)===0){return url}if(typeof window==="undefined"||!window||!window.document){throw new Error("Cannot resolve '"+url+"'.")}var aTag=window.document.createElement("a");aTag.href=url;this.logger.log(ILogger.LogLevel.Information,"Normalizing '"+url+"' to '"+aTag.href+"'.");return aTag.href};HttpConnection.prototype.resolveNegotiateUrl=function(url){var index=url.indexOf("?");var negotiateUrl=url.substring(0,index===-1?url.length:index);if(negotiateUrl[negotiateUrl.length-1]!=="/"){negotiateUrl+="/"}negotiateUrl+="negotiate";negotiateUrl+=index===-1?"":url.substring(index);return negotiateUrl};return HttpConnection}();exports.HttpConnection=HttpConnection;function transportMatches(requestedTransport,actualTransport){return!requestedTransport||(actualTransport&requestedTransport)!==0}});unwrapExports(HttpConnection_1);var HttpConnection_2=HttpConnection_1.HttpConnection;var JsonHubProtocol_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var JSON_HUB_PROTOCOL_NAME="json";var JsonHubProtocol=function(){function JsonHubProtocol(){this.name=JSON_HUB_PROTOCOL_NAME;this.version=1;this.transferFormat=ITransport.TransferFormat.Text}JsonHubProtocol.prototype.parseMessages=function(input,logger){if(typeof input!=="string"){throw new Error("Invalid input for JSON hub protocol. Expected a string.")}if(!input){return[]}if(logger===null){logger=Loggers.NullLogger.instance}var messages=TextMessageFormat_1.TextMessageFormat.parse(input);var hubMessages=[];for(var _i=0,messages_1=messages;_i<messages_1.length;_i++){var message=messages_1[_i];var parsedMessage=JSON.parse(message);if(typeof parsedMessage.type!=="number"){throw new Error("Invalid payload.")}switch(parsedMessage.type){case IHubProtocol.MessageType.Invocation:this.isInvocationMessage(parsedMessage);break;case IHubProtocol.MessageType.StreamItem:this.isStreamItemMessage(parsedMessage);break;case IHubProtocol.MessageType.Completion:this.isCompletionMessage(parsedMessage);break;case IHubProtocol.MessageType.Ping:break;case IHubProtocol.MessageType.Close:break;default:logger.log(ILogger.LogLevel.Information,"Unknown message type '"+parsedMessage.type+"' ignored.");continue}hubMessages.push(parsedMessage)}return hubMessages};JsonHubProtocol.prototype.writeMessage=function(message){return TextMessageFormat_1.TextMessageFormat.write(JSON.stringify(message))};JsonHubProtocol.prototype.isInvocationMessage=function(message){this.assertNotEmptyString(message.target,"Invalid payload for Invocation message.");if(message.invocationId!==undefined){this.assertNotEmptyString(message.invocationId,"Invalid payload for Invocation message.")}};JsonHubProtocol.prototype.isStreamItemMessage=function(message){this.assertNotEmptyString(message.invocationId,"Invalid payload for StreamItem message.");if(message.item===undefined){throw new Error("Invalid payload for StreamItem message.")}};JsonHubProtocol.prototype.isCompletionMessage=function(message){if(message.result&&message.error){throw new Error("Invalid payload for Completion message.")}if(!message.result&&message.error){this.assertNotEmptyString(message.error,"Invalid payload for Completion message.")}this.assertNotEmptyString(message.invocationId,"Invalid payload for Completion message.")};JsonHubProtocol.prototype.assertNotEmptyString=function(value,errorMessage){if(typeof value!=="string"||value===""){throw new Error(errorMessage)}};return JsonHubProtocol}();exports.JsonHubProtocol=JsonHubProtocol});unwrapExports(JsonHubProtocol_1);var JsonHubProtocol_2=JsonHubProtocol_1.JsonHubProtocol;var HubConnectionBuilder_1=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});var HubConnectionBuilder=function(){function HubConnectionBuilder(){}HubConnectionBuilder.prototype.configureLogging=function(logging){Utils.Arg.isRequired(logging,"logging");if(isLogger(logging)){this.logger=logging}else{this.logger=new Utils.ConsoleLogger(logging)}return this};HubConnectionBuilder.prototype.withUrl=function(url,transportTypeOrOptions){Utils.Arg.isRequired(url,"url");this.url=url;if(typeof transportTypeOrOptions==="object"){this.httpConnectionOptions=transportTypeOrOptions}else{this.httpConnectionOptions={transport:transportTypeOrOptions}}return this};HubConnectionBuilder.prototype.withHubProtocol=function(protocol){Utils.Arg.isRequired(protocol,"protocol");this.protocol=protocol;return this};HubConnectionBuilder.prototype.build=function(){var httpConnectionOptions=this.httpConnectionOptions||{};if(httpConnectionOptions.logger===undefined){httpConnectionOptions.logger=this.logger}if(!this.url){throw new Error("The 'HubConnectionBuilder.withUrl' method must be called before building the connection.")}var connection=new HttpConnection_1.HttpConnection(this.url,httpConnectionOptions);return HubConnection_1.HubConnection.create(connection,this.logger||Loggers.NullLogger.instance,this.protocol||new JsonHubProtocol_1.JsonHubProtocol)};return HubConnectionBuilder}();exports.HubConnectionBuilder=HubConnectionBuilder;function isLogger(logger){return logger.log!==undefined}});unwrapExports(HubConnectionBuilder_1);var HubConnectionBuilder_2=HubConnectionBuilder_1.HubConnectionBuilder;var cjs=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});exports.VERSION="0.0.0-DEV_BUILD";exports.HttpError=Errors.HttpError;exports.TimeoutError=Errors.TimeoutError;exports.DefaultHttpClient=HttpClient_1.DefaultHttpClient;exports.HttpClient=HttpClient_1.HttpClient;exports.HttpResponse=HttpClient_1.HttpResponse;exports.HubConnection=HubConnection_1.HubConnection;exports.HubConnectionBuilder=HubConnectionBuilder_1.HubConnectionBuilder;exports.MessageType=IHubProtocol.MessageType;exports.LogLevel=ILogger.LogLevel;exports.HttpTransportType=ITransport.HttpTransportType;exports.TransferFormat=ITransport.TransferFormat;exports.NullLogger=Loggers.NullLogger;exports.JsonHubProtocol=JsonHubProtocol_1.JsonHubProtocol});unwrapExports(cjs);var cjs_1=cjs.VERSION;var cjs_2=cjs.HttpError;var cjs_3=cjs.TimeoutError;var cjs_4=cjs.DefaultHttpClient;var cjs_5=cjs.HttpClient;var cjs_6=cjs.HttpResponse;var cjs_7=cjs.HubConnection;var cjs_8=cjs.HubConnectionBuilder;var cjs_9=cjs.MessageType;var cjs_10=cjs.LogLevel;var cjs_11=cjs.HttpTransportType;var cjs_12=cjs.TransferFormat;var cjs_13=cjs.NullLogger;var cjs_14=cjs.JsonHubProtocol;var browserIndex=createCommonjsModule(function(module,exports){Object.defineProperty(exports,"__esModule",{value:true});if(!Uint8Array.prototype.indexOf){Object.defineProperty(Uint8Array.prototype,"indexOf",{value:Array.prototype.indexOf,writable:true})}if(!Uint8Array.prototype.slice){Object.defineProperty(Uint8Array.prototype,"slice",{value:Array.prototype.slice,writable:true})}if(!Uint8Array.prototype.forEach){Object.defineProperty(Uint8Array.prototype,"forEach",{value:Array.prototype.forEach,writable:true})}tslib_1.__exportStar(cjs,exports)});var browserIndex$1=unwrapExports(browserIndex);return browserIndex$1});
+//# sourceMappingURL=signalr.min.js.map
\ No newline at end of file
diff --git a/uni_modules/Lyuan-SignalR/package.json b/uni_modules/Lyuan-SignalR/package.json
new file mode 100644
index 0000000..1935844
--- /dev/null
+++ b/uni_modules/Lyuan-SignalR/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "Lyuan-SignalR",
+  "displayName": "AspNetCore SignalR 即时通讯JS SDK",
+  "version": "1.3.5",
+  "description": "适用于Asp.net core Signalr  js客户端",
+  "keywords": [
+    "即时通讯",
+    "asp.net",
+    "core",
+    "SignalR"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.0.7"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "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": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/Lyuan-SignalR/readme.md b/uni_modules/Lyuan-SignalR/readme.md
new file mode 100644
index 0000000..62cba4e
--- /dev/null
+++ b/uni_modules/Lyuan-SignalR/readme.md
@@ -0,0 +1,66 @@
+# Lyuan-SignalR
+
+## 使用方法与官方文档一致，请自行参考[官方文档](https://docs.microsoft.com/zh-cn/aspnet/core/signalr/introduction?view=aspnetcore-5.0)
+
+兼容微信小程序、h5、Android、ios ，其他小程序未测， 理论支持。
+断线重连、重试等功能需自行判断，该库修改自微软官方。
+
+
+```javascript
+import {
+	HubConnectionBuilder,
+	LogLevel
+} from './signalr.js';
+ const connection = new HubConnectionBuilder()
+   .withUrl("http://xxx.com/messagehub", {
+     // accessTokenFactory: () => {
+     //     return 'token';
+     // }
+   })
+   .configureLogging(LogLevel.Trace)
+   .build();
+ 
+ //接收消息
+ connection.on("ReceiveMessage", function (user, message) {
+   ;
+ });
+ 
+ //发送消息, 需在链接成功后调用
+ //connection.invoke('方法名',参数)
+ 
+ //链接断开
+ connection.on/close(function () { //去掉斜杠
+   ;
+   //重试
+   start(ms);
+ });
+ 
+ const ms = 5000;
+ const start = (timer) => {
+   setTimeout(() => {
+     try {
+       connection
+         .start()
+         .then(() => {
+           ;
+         })
+         .catch((e) => {
+           //重试
+           // console.log("websocket连接失败", e);
+           start(ms);
+         });
+     } catch (e) {
+       //重试
+       start(ms);
+     }
+   }, timer);
+ };
+ 
+ //开始连接
+ start(0);
+
+```
+
+
+###觉得有用的话，可直接打赏或微信
+<img src='https://vkceyugu.cdn.bspapp.com/VKCEYUGU-aliyun-w83z4an5gxdjff2ce6/1cb1d210-53af-11eb-8ff1-d5dcf8779628.jpg' width='40%' /> 
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/LICENSE.md b/uni_modules/Sansnn-uQRCode/LICENSE.md
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/LICENSE.md
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/uni_modules/Sansnn-uQRCode/README.md b/uni_modules/Sansnn-uQRCode/README.md
new file mode 100644
index 0000000..77d7925
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/README.md
@@ -0,0 +1,392 @@
+# 介绍
+
+`uQRCode`是一款基于`Javascript`环境开发的二维码生成插件，适用所有`Javascript`运行环境的前端应用和`Node.js`应用。
+
+`uQRCode`可扩展性高，它支持自定义渲染二维码，可通过`uQRCode API`得到二维码绘制关键信息后，使用`canvas`、`svg`或`js`操作`dom`的方式绘制二维码图案。还可自定义二维码样式，如随机颜色、圆点、方块、块与块之间的间距等。
+
+欢迎加入群聊【uQRCode交流群】：[695070434](https://jq.qq.com/?_wv=1027&k=JRjzDqiw)。
+
+# 设计器
+
+uQRCode发布了配套的可视化设计器，可根据自己喜好在设计器中设计二维码样式，一键生成配置代码复制到项目中，详情请在微信小程序搜索“柚子二维码”，或扫描下方小程序码体验。
+
+![uQRCode设计器](https://uqrcode.cn/mp_weixin_code.jpg)
+
+## 设计器模板示例
+
+![uQRCode设计器](https://uqrcode.cn/yz_1.png)
+![uQRCode设计器](https://uqrcode.cn/yz_2.png)
+![uQRCode设计器](https://uqrcode.cn/yz_3.png)
+![uQRCode设计器](https://uqrcode.cn/yz_4.png)
+![uQRCode设计器](https://uqrcode.cn/yz_5.png)
+![uQRCode设计器](https://uqrcode.cn/yz_6.png)
+![uQRCode设计器](https://uqrcode.cn/yz_7.png)
+![uQRCode设计器](https://uqrcode.cn/yz_8.png)
+![uQRCode设计器](https://uqrcode.cn/yz_9.png)
+
+# 快速上手
+
+> 在`uni-app`中，我们更推荐使用组件方式来生成二维码，组件方式大大提高了页面的可读性以及避开了一些平台容易出问题的地方，当组件无法满足需求的时候，再考虑切换成原生方式。
+
+官方文档：[https://uqrcode.cn/doc](https://uqrcode.cn/doc)。
+
+github地址：[https://github.com/Sansnn/uQRCode](https://github.com/Sansnn/uQRCode)。
+
+npm地址：[https://www.npmjs.com/package/uqrcodejs](https://www.npmjs.com/package/uqrcodejs)。
+
+uni-app插件市场地址：[https://ext.dcloud.net.cn/plugin?id=1287](https://ext.dcloud.net.cn/plugin?id=1287)。
+
+## 原生方式
+
+原生方式仅需要获取`uqrcode.js`文件便可使用。详细配置请移步到：文档 > [原生](https://uqrcode.cn/doc/document/native.html)。
+
+### 安装
+
+1. 通过`npm`安装，成功后即可使用`import`或`require`进行引用。
+``` bash
+# npm安装
+npm install uqrcodejs
+# 或者
+npm install @uqrcode/js
+```
+
+2. 通过项目开源地址获取`uqrcode.js`，下载`uqrcode.js`后，将其复制到您项目指定目录，在页面中引入`uqrcode.js`文件即可开始使用。
+
+### 引入
+
+- 通过`import`引入。
+``` javascript
+// npm安装
+import UQRCode from 'uqrcodejs'; // npm install uqrcodejs
+// 或者
+import UQRCode from '@uqrcode/js'; // npm install @uqrcode/js
+```
+
+- `Node.js`通过`require`引入。
+``` javascript
+// npm安装
+const UQRCode = require('uqrcodejs'); // npm install uqrcodejs
+// 或者
+const UQRCode = require('@uqrcode/js'); // npm install @uqrcode/js
+```
+
+- 原生浏览器环境，在js脚本加载时添加到`window`。
+``` html
+<script type="text/javascript" src="uqrcode.js"></script>
+<script>
+    var UQRCode = window.UQRCode;
+</script>
+```
+
+### 简单用法
+
+`uQRCode`基于`Canvas API`封装了一套方法，建议开发者使用`canvas`生成，一键调用，非常方便。以下是示例：
+
+- HTML示例
+  - DOM部分
+  ``` html
+  <canvas id="qrcode" width="200" height="200"></canvas>
+  ```
+
+  - JS部分
+  ``` javascript
+  // 获取uQRCode实例
+  var qr = new UQRCode();
+  // 设置二维码内容
+  qr.data = "https://uqrcode.cn/doc";
+  // 设置二维码大小，必须与canvas设置的宽高一致
+  qr.size = 200;
+  // 调用制作二维码方法
+  qr.make();
+  // 获取canvas元素
+  var canvas = document.getElementById("qrcode");
+  // 获取canvas上下文
+  var canvasContext = canvas.getContext("2d");
+  // 设置uQRCode实例的canvas上下文
+  qr.canvasContext = canvasContext;
+  // 调用绘制方法将二维码图案绘制到canvas上
+  qr.drawCanvas();
+  ```
+
+- uni-app示例
+  - Template部分
+  ``` html
+  <canvas id="qrcode" canvas-id="qrcode" style="width: 200px;height: 200px;"></canvas>
+  ```
+  
+  - JS部分
+  ``` javascript
+  onReady() {
+    // 获取uQRCode实例
+    var qr = new UQRCode();
+    // 设置二维码内容
+    qr.data = "https://uqrcode.cn/doc";
+    // 设置二维码大小，必须与canvas设置的宽高一致
+    qr.size = 200;
+    // 调用制作二维码方法
+    qr.make();
+    // 获取canvas上下文
+    var canvasContext = uni.createCanvasContext('qrcode', this); // 如果是组件，this必须传入
+    // 设置uQRCode实例的canvas上下文
+    qr.canvasContext = canvasContext;
+    // 调用绘制方法将二维码图案绘制到canvas上
+    qr.drawCanvas();
+  }
+  ```
+  
+- 微信小程序，推荐使用Canvas 2D，关于Canvas 2D的使用请参考微信开放文档。
+
+### 高级用法
+
+考虑到部分平台可能不支持`canvas`，所以`uQRCode`并没有强制要求和`canvas`一起使用，您还可以选择其他方式来生成二维码，例如使用`js`操作`dom`进行绘制或是使用`svg`绘制等。以下是示例：
+
+- uni-app v-for+view
+
+```html
+<template>
+  <view>
+    <view class="qrcode">
+      <view v-for="(row, rowI) in modules" :key="rowI" style="display: flex;flex-direction: row;">
+        <view v-for="(col, colI) in row" :key="colI">
+          <view v-if="col.isBlack" style="width: 10px;height: 10px;background-color: black;">
+            <!-- 黑色码点 -->
+          </view>
+          <view v-else style="width: 10px;height: 10px;background-color: white;">
+            <!-- 白色码点 -->
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import UQRCode from '../../uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js';
+
+  export default {
+    data() {
+      return {
+        modules: []
+      }
+    },
+    onLoad() {
+      const qr = new UQRCode();
+      qr.data = 'uQRCode';
+      qr.make();
+      this.modules = qr.modules;
+    },
+    methods: {
+
+    }
+  }
+</script>
+```
+
+- js操作dom
+
+``` html
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>uQRCode二维码生成</title>
+</head>
+<body>
+    <div id="qrcode" style="position: relative;"></div>
+    <script type="text/javascript" src="uqrcode.js"></script>
+    <script>
+    // 引入uQRCode
+    var UQRCode = window.UQRCode;
+    // 获取uQRCode实例
+    var qr = new UQRCode();
+    // 设置二维码内容
+    qr.data = "https://uqrcode.cn/doc";
+    // 设置二维码大小，必须与canvas设置的宽高一致
+    qr.size = 200;
+    // 设置二维码前景图，可以是路径
+    qr.foregroundImageSrc =
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAC3xJREFUeJztnd1vFNcZxodSJ3y3EL7SYIQwu15wI5FSAkqVkISKgEkuSIEC6127RrloL9r8D4n5UFUZp/9C24A/okqUOzCmSdoohQtkXIkiRS1VC7YQF41Kbe/unL7PzHt2z45ndnZmd1l75hzrSSwzMzvn+c15z8ee3dcwdIlkWaRlqSnF62a+4dDiiMtZ36cKyc183NQ3WS2sZ2IqWX/phwTWEDhuEKT5S0hLSctJK1grWasiLllPWe9l7MUSowTJDU7oopKVICSEZXwz3yKtJj1HWkdaT9pA2hgTbeA6r2MPVrMnEpCEI8HU1FpUGC18cbQEPB1r+Ea+Q2olbSFtJbWREqxkxCXr2cZ1hwebSM+zN2vYq+XsXYtRQ2uRJ8hWgaa4kl8ET0Ur30SK9F3STtL3SLtJL5P2kPZGXHu4rru57vCgg9TO3mxir1azd0uNUmuRUALBWKzAAOm1pBcM+4nYwTeBG3uNtJ/0FukQqZP0NuudiErWr5PrfID0JulVwwb1Enu0lT1byx6qUKpqJWoH3qLAQIzcbNhNFU/CKwzhMOld0o9JaVKW1EP6CamXdDqi6uU69nCdUffjpCPsyZvs0U72bDN7KKHI8OULRcIAQcQ9NDXQRYhCeNpF2ocXPXjw4M8uX748eP/+/b9NT08/ETEv8ABekCcXDx069FMGs489SzGUtezpEqPK0KWGKnRGiH8vMGVc+I1UKnXy3r17N5ttwHwvd+/e/bKjo+Mkt5bvG3bfAi/RD69gj2Ur8YQhO/Il3LzQKbVx09t35MiR9x4/fvzvZld2oRTy6l8HDhxAiHvdsPsVeInhMobGSw2fvkTtO5YxSYQqdE6Ih4cnJiY+b3YlF1q5ffv2p4Y9APiBYY/CELqe4wj0TKWwpYYrxLn1TBSjqf1Hjx79eYGK3w1sGz4VK/kVeHbs2LFfkIc/ZC/b2FtEoGcrhS01XKFJYdKHzghD28NjY2N/0BDCwSHvrnAreYU9RV/ybUfY8gSyVAlXmPRhnvHuw4cP/65hhIPy4MGDf5CHPzLsUdeLHLbWVAKi9h/LOcZtMezOHPONE25D22ZXfr7KWeAdeXiSw9ZO9nYte91iuPQjEgj6DwzJMInBLBNDXczA07p1hAeCQh52sZe7lH5EDn99geDgbYa9ToOlgayGURsU8rCbvdzN3voCUUdYmH9gJRPrMphx9mggNQPpYS/3sLcb2GvXCaITyEYFCEYHvRpIzUB62UsJZGO1QFbxwVgu2auB1B3IXvZ2I3sdGAiWm09rIDUDOc1eaiAaSEWlHQp7ntc1Kh0XRlEHMtQ1V2HPm3N+uvJxYRQSyoIB0j6Ymash/0onyBy3c5MkeUzS45haFFEg9pOLCk6LgsgJs0xPxKxIDbu1lNITn7l2hs7N0U/p/Bn6vf/OkEgM28dcuDMy59rhlbfuKzmUCdaSFxoQVNZZUHk/INlrZ+mo8tV/k34GCMI2BvLRnU/mXDt8MQlHLs5AMhWBdI+e00CeJpDtw9lQQD7SQBoBJCdSQ+FaSHVA5r6m/xExB6KOtBIj6boBMemUWTNntUIvTZP1pmnOuboG0gAgOKebBgQpeu3UYNZVHRd7ilA0kAYDwTHZ0TPWtXBdN7XTuTlqRc4zNZAGAelmIF73ZwPJayBOICUQ9evUqwYiNBAFCM3U6d+bBSTlASSngTSrhaTFZ1Pj4k+TE+LPk39lTYhPJ8et9bEYAslb85BmAYESCJmkJC9YQok4LC66AUGsbqfhpysQa42ri0ZKtY6yqrxPfj0oEd3l98pA/idmRM+1cyJ7vc9Tv/ziY5rgFQhJ6fzq5iGmOP+X34nM9Q+L18qQuki7fv9e8f4y1z4Q6bEPRfqPfSJ9g/597Az9rY+um41fyMKELFeA2bbhc1UQecAwTQtCECA4JmedW37tWfpv1/UPrPtDuHwi/kvwgM8Wjp+hR2X7pTgC4Se5UjGLP+V/81/LkhDKC/6GloJ7w7B31pwph02/YrJovUkVNyDVFJNNDA7EvRSB0HlJC0hOOJcY8zRZTGkg7sVUJP9gAxkuARkPCGS0z+q4k4MAMivKgJgxATLDz3mYH+eZCEMDAMKGDYyPVH0tvBUMIEkJhPqLvBBlr5WnMLb9UoRHWRjb908Mi4GJESvU1KZhC8YJ6pgTDCRNIylce8DnXBxzge7jjSvv88QvI341fkn00/UusHD9/vFhe6YePSAlJZRxfs0aknMFBXzA8+VWn4TrvYar44ICUvd9U04goc4PvyFuAQNJW+HhghU2Pqld1IGjz0CYkrsM0zRqCnc995DYf2eQW3TwXYzzHEjtoyy30uhdJ7Fd7Q1vmd4GVCzzBYjeBsRFA4kwEGzVyftMGPPFlaxgi4s4vGD6Xd1l4miaYpomhqUN17Hp1E1rHQlbdbKjZ0W3m66fE+e//K29ahsQCGCcvfUbmpWfcb+2i3AfOB7L720jJwPWdcED4XcMBzOe23QgLJXbS+gqyiqACNMyN1FhG5Cr6Pi2EfcJY2yAVLoG1p0KjnPr+RZuvRURIN4fLfMC4jfs1UBqAeK5tNFlvfWqgTxFIDsuZSt+tKyHOli87ZoXpbdhc9YnqJT3QzSQ+gCBaV8U90O5a+irMWolNPLB5gP8n0JYF+n1K+8XW5IGUicg1ZTPpyZEu/WhHu9VWw2kKUBcOv0KQDAl7L16TrQPZQKqy9px0jYS7jPr8QEyZzPdqcothF5umrDMWgshwX7+Y20D6o7f0ollnB+QyQnryW0LCoShlJZdqhP2is0QyFiuZeG7TnPWNrWCpz6bvE1AsmRQt/UBUfyOkJL0AVJLwagudkBMq+Kz4sWPs9b+3hSMdihFELJXz1trXnkIXx5g5kUuVxAD40MaSG1A8qIsNNDPDJmMz/p5rTfh/OzVPguCiaVhbCnFulbBFL8eL98G5Ni9FbogzM2aCFmnot2pP6HIPGt9IkRqRnxtPqF/6/asNBb4eq7iqzVmLJOKn6Cl3/uphST4Kb5AcMo/YVuoQXnxNb3ijsFgLWOBACk9ZUk5rEQ/MIw+ICO2Y9lkxP989BkpGvWkBruLn6BNKMNf/J4sqqs2DWWs19kazeV3RRW38TTgvCZJA5lnWjhAYiINZJ6pkUD018TWB0jor4nVX6TcWCCBv0hZf9V4Y4D0GAG/alx/GX9jgQT+Mn6drqJBMBiIM13FumqA6IQuDQDikdBFJgZzTegiociUR8hfWJbyaGpq6p+6lQSHgRIm5ZEKRCYFQ9bjYlKwGzdu6KRgIWCguCQFQ8K1qpKCqSOt9dyPICHi/uPHj+u0eQEgyALPkHLQmJs2Dx77ps2rlFiy89atW9d870CXsnLz5s1RpXUETiyphi2ZehWtxEq9unnz5mOPHj263+xKLpQyOTn5VWtrKzJp7zPKU6/KrNG+abzVsOWanLijo+OETk7sX+AREjkb7smJZevwDFfOsAVyiG9e6bs7OX33RZ2+2y5K+u5LnL6706hT+m61L1ET3Lca7gnukdRdJ7ivnOC+1QiZ4F6FIkOXhAK6aHKIg+joMWLAkPg1vgHMQrE0gCfjbdY7EZWsXyfX+QB78Kphr1W9xB5tZc/WKjDgqW/f4SxqBy+hoKkh/qGj38QvhriIySOeBADCOs3LfFN7I649XNfdXHd40MGebGWP4NVq9k6F4Ruq3IraUtDEEPfQGYE0wGAsjckjmuMWvgm0ngQrGXHJerZx3bewF8+zN2vYK3j2rBEwTLmVRUY5FNlaAAbzFFDHjB5PAMbV6/hG8FRsjIk2cJ3XsQer2ZOV7NESo9QqVBihgMiidvQSTItRgoOmiKdgBWsla1XEJesp672MvZAQWowSCBmiagKhlkUOqXAkIAkpjpL1l344IdQVhrM4X0SFpGpxxOWsr5cvTSleNxM36RK18n+GJEwNAYal3QAAAABJRU5ErkJggg==';
+    // 调用制作二维码方法
+    qr.make();
+
+    var drawModules = qr.getDrawModules();
+    // 遍历drawModules创建dom元素
+    var qrHtml = '';
+    for (var i = 0; i < drawModules.length; i++) {
+        var drawModule = drawModules[i];
+        switch (drawModule.type) {
+        case 'tile':
+            /* 绘制小块 */
+            qrHtml += `<div style="position: absolute;left: ${drawModule.x}px;top: ${drawModule.y}px;width: ${drawModule.width}px;height: ${drawModule.height}px;background: ${drawModule.color};"></div>`;
+            break;
+        case 'image':
+            /* 绘制图像 */
+            qrHtml += `<img style="position: absolute;left: ${drawModule.x}px;top: ${drawModule.y}px;width: ${drawModule.width}px;height: ${drawModule.height}px;" src="${drawModule.imageSrc}" />`;
+            break;
+        }
+    }
+    document.getElementById('qrcode').innerHTML = qrHtml;
+    </script>
+</body>
+</html>
+```
+
+- svg
+``` html
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>uQRCode二维码生成</title>
+</head>
+<body>
+    <svg id="qrcode" width="200" height="200" xmlns="http://www.w3.org/2000/svg" version="1.1"></svg>
+    <script type="text/javascript" src="uqrcode.js"></script>
+    <script>
+    // 引入uQRCode
+    var UQRCode = window.UQRCode;
+    // 获取uQRCode实例
+    var qr = new UQRCode();
+    // 设置二维码内容
+    qr.data = "https://uqrcode.cn/doc";
+    // 设置二维码大小，必须与canvas设置的宽高一致
+    qr.size = 200;
+    // 设置二维码前景图，可以是路径
+    qr.foregroundImageSrc =
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAC3xJREFUeJztnd1vFNcZxodSJ3y3EL7SYIQwu15wI5FSAkqVkISKgEkuSIEC6127RrloL9r8D4n5UFUZp/9C24A/okqUOzCmSdoohQtkXIkiRS1VC7YQF41Kbe/unL7PzHt2z45ndnZmd1l75hzrSSwzMzvn+c15z8ee3dcwdIlkWaRlqSnF62a+4dDiiMtZ36cKyc183NQ3WS2sZ2IqWX/phwTWEDhuEKT5S0hLSctJK1grWasiLllPWe9l7MUSowTJDU7oopKVICSEZXwz3yKtJj1HWkdaT9pA2hgTbeA6r2MPVrMnEpCEI8HU1FpUGC18cbQEPB1r+Ea+Q2olbSFtJbWREqxkxCXr2cZ1hwebSM+zN2vYq+XsXYtRQ2uRJ8hWgaa4kl8ET0Ur30SK9F3STtL3SLtJL5P2kPZGXHu4rru57vCgg9TO3mxir1azd0uNUmuRUALBWKzAAOm1pBcM+4nYwTeBG3uNtJ/0FukQqZP0NuudiErWr5PrfID0JulVwwb1Enu0lT1byx6qUKpqJWoH3qLAQIzcbNhNFU/CKwzhMOld0o9JaVKW1EP6CamXdDqi6uU69nCdUffjpCPsyZvs0U72bDN7KKHI8OULRcIAQcQ9NDXQRYhCeNpF2ocXPXjw4M8uX748eP/+/b9NT08/ETEv8ABekCcXDx069FMGs489SzGUtezpEqPK0KWGKnRGiH8vMGVc+I1UKnXy3r17N5ttwHwvd+/e/bKjo+Mkt5bvG3bfAi/RD69gj2Ur8YQhO/Il3LzQKbVx09t35MiR9x4/fvzvZld2oRTy6l8HDhxAiHvdsPsVeInhMobGSw2fvkTtO5YxSYQqdE6Ih4cnJiY+b3YlF1q5ffv2p4Y9APiBYY/CELqe4wj0TKWwpYYrxLn1TBSjqf1Hjx79eYGK3w1sGz4VK/kVeHbs2LFfkIc/ZC/b2FtEoGcrhS01XKFJYdKHzghD28NjY2N/0BDCwSHvrnAreYU9RV/ybUfY8gSyVAlXmPRhnvHuw4cP/65hhIPy4MGDf5CHPzLsUdeLHLbWVAKi9h/LOcZtMezOHPONE25D22ZXfr7KWeAdeXiSw9ZO9nYte91iuPQjEgj6DwzJMInBLBNDXczA07p1hAeCQh52sZe7lH5EDn99geDgbYa9ToOlgayGURsU8rCbvdzN3voCUUdYmH9gJRPrMphx9mggNQPpYS/3sLcb2GvXCaITyEYFCEYHvRpIzUB62UsJZGO1QFbxwVgu2auB1B3IXvZ2I3sdGAiWm09rIDUDOc1eaiAaSEWlHQp7ntc1Kh0XRlEHMtQ1V2HPm3N+uvJxYRQSyoIB0j6Ymash/0onyBy3c5MkeUzS45haFFEg9pOLCk6LgsgJs0xPxKxIDbu1lNITn7l2hs7N0U/p/Bn6vf/OkEgM28dcuDMy59rhlbfuKzmUCdaSFxoQVNZZUHk/INlrZ+mo8tV/k34GCMI2BvLRnU/mXDt8MQlHLs5AMhWBdI+e00CeJpDtw9lQQD7SQBoBJCdSQ+FaSHVA5r6m/xExB6KOtBIj6boBMemUWTNntUIvTZP1pmnOuboG0gAgOKebBgQpeu3UYNZVHRd7ilA0kAYDwTHZ0TPWtXBdN7XTuTlqRc4zNZAGAelmIF73ZwPJayBOICUQ9evUqwYiNBAFCM3U6d+bBSTlASSngTSrhaTFZ1Pj4k+TE+LPk39lTYhPJ8et9bEYAslb85BmAYESCJmkJC9YQok4LC66AUGsbqfhpysQa42ri0ZKtY6yqrxPfj0oEd3l98pA/idmRM+1cyJ7vc9Tv/ziY5rgFQhJ6fzq5iGmOP+X34nM9Q+L18qQuki7fv9e8f4y1z4Q6bEPRfqPfSJ9g/597Az9rY+um41fyMKELFeA2bbhc1UQecAwTQtCECA4JmedW37tWfpv1/UPrPtDuHwi/kvwgM8Wjp+hR2X7pTgC4Se5UjGLP+V/81/LkhDKC/6GloJ7w7B31pwph02/YrJovUkVNyDVFJNNDA7EvRSB0HlJC0hOOJcY8zRZTGkg7sVUJP9gAxkuARkPCGS0z+q4k4MAMivKgJgxATLDz3mYH+eZCEMDAMKGDYyPVH0tvBUMIEkJhPqLvBBlr5WnMLb9UoRHWRjb908Mi4GJESvU1KZhC8YJ6pgTDCRNIylce8DnXBxzge7jjSvv88QvI341fkn00/UusHD9/vFhe6YePSAlJZRxfs0aknMFBXzA8+VWn4TrvYar44ICUvd9U04goc4PvyFuAQNJW+HhghU2Pqld1IGjz0CYkrsM0zRqCnc995DYf2eQW3TwXYzzHEjtoyy30uhdJ7Fd7Q1vmd4GVCzzBYjeBsRFA4kwEGzVyftMGPPFlaxgi4s4vGD6Xd1l4miaYpomhqUN17Hp1E1rHQlbdbKjZ0W3m66fE+e//K29ahsQCGCcvfUbmpWfcb+2i3AfOB7L720jJwPWdcED4XcMBzOe23QgLJXbS+gqyiqACNMyN1FhG5Cr6Pi2EfcJY2yAVLoG1p0KjnPr+RZuvRURIN4fLfMC4jfs1UBqAeK5tNFlvfWqgTxFIDsuZSt+tKyHOli87ZoXpbdhc9YnqJT3QzSQ+gCBaV8U90O5a+irMWolNPLB5gP8n0JYF+n1K+8XW5IGUicg1ZTPpyZEu/WhHu9VWw2kKUBcOv0KQDAl7L16TrQPZQKqy9px0jYS7jPr8QEyZzPdqcothF5umrDMWgshwX7+Y20D6o7f0ollnB+QyQnryW0LCoShlJZdqhP2is0QyFiuZeG7TnPWNrWCpz6bvE1AsmRQt/UBUfyOkJL0AVJLwagudkBMq+Kz4sWPs9b+3hSMdihFELJXz1trXnkIXx5g5kUuVxAD40MaSG1A8qIsNNDPDJmMz/p5rTfh/OzVPguCiaVhbCnFulbBFL8eL98G5Ni9FbogzM2aCFmnot2pP6HIPGt9IkRqRnxtPqF/6/asNBb4eq7iqzVmLJOKn6Cl3/uphST4Kb5AcMo/YVuoQXnxNb3ijsFgLWOBACk9ZUk5rEQ/MIw+ICO2Y9lkxP989BkpGvWkBruLn6BNKMNf/J4sqqs2DWWs19kazeV3RRW38TTgvCZJA5lnWjhAYiINZJ6pkUD018TWB0jor4nVX6TcWCCBv0hZf9V4Y4D0GAG/alx/GX9jgQT+Mn6drqJBMBiIM13FumqA6IQuDQDikdBFJgZzTegiociUR8hfWJbyaGpq6p+6lQSHgRIm5ZEKRCYFQ9bjYlKwGzdu6KRgIWCguCQFQ8K1qpKCqSOt9dyPICHi/uPHj+u0eQEgyALPkHLQmJs2Dx77ps2rlFiy89atW9d870CXsnLz5s1RpXUETiyphi2ZehWtxEq9unnz5mOPHj263+xKLpQyOTn5VWtrKzJp7zPKU6/KrNG+abzVsOWanLijo+OETk7sX+AREjkb7smJZevwDFfOsAVyiG9e6bs7OX33RZ2+2y5K+u5LnL6706hT+m61L1ET3Lca7gnukdRdJ7ivnOC+1QiZ4F6FIkOXhAK6aHKIg+joMWLAkPg1vgHMQrE0gCfjbdY7EZWsXyfX+QB78Kphr1W9xB5tZc/WKjDgqW/f4SxqBy+hoKkh/qGj38QvhriIySOeBADCOs3LfFN7I649XNfdXHd40MGebGWP4NVq9k6F4Ruq3IraUtDEEPfQGYE0wGAsjckjmuMWvgm0ngQrGXHJerZx3bewF8+zN2vYK3j2rBEwTLmVRUY5FNlaAAbzFFDHjB5PAMbV6/hG8FRsjIk2cJ3XsQer2ZOV7NESo9QqVBihgMiidvQSTItRgoOmiKdgBWsla1XEJesp672MvZAQWowSCBmiagKhlkUOqXAkIAkpjpL1l344IdQVhrM4X0SFpGpxxOWsr5cvTSleNxM36RK18n+GJEwNAYal3QAAAABJRU5ErkJggg==';
+    // 调用制作二维码方法
+    qr.make();
+
+    var drawModules = qr.getDrawModules();
+    // 遍历drawModules创建svg元素
+    var qrHtml = '';
+    for (var i = 0; i < drawModules.length; i++) {
+        var drawModule = drawModules[i];
+        switch (drawModule.type) {
+        case 'tile':
+            /* 绘制小块 */
+            qrHtml += `<rect x="${drawModule.x}" y="${drawModule.y}" width="${drawModule.width}" height="${drawModule.height}" style="fill: ${drawModule.color};" />`;
+            break;
+        case 'image':
+            /* 绘制图像 */
+            qrHtml += `<image href="${drawModule.imageSrc}" x="${drawModule.x}" y="${drawModule.y}" width="${drawModule.width}" height="${drawModule.height}" />`;
+            break;
+        }
+    }
+    document.getElementById('qrcode').innerHTML = qrHtml;
+    </script>
+</body>
+</html>
+```
+
+> 更多用法大家自行探索咯，期待分享哟~
+
+### 导出临时文件路径
+
+原生方式基于`Canvas`的，请自行参阅各平台`Canvas`的导出方式。以下是部分示例：
+
+- uni-app
+```javascript
+// 通过uni.createCanvasContext方式创建绘制上下文的，对应导出API为uni.canvasToTempFilePath
+// 调用完ctx.draw()方法后不能第一时间导出，否则会异常，需要有一定的延时
+setTimeout(() => {
+    uni.canvasToTempFilePath(
+        {
+            canvasId: this.canvasId,
+            fileType: this.fileType,
+            width: this.canvasWidth,
+            height: this.canvasHeight,
+            success: res => {
+                console.log(res);
+            },
+            fail: err => {
+                console.log(err);
+            }
+        }, 
+        // this // 组件内使用必传当前实例
+    );
+}, 300);
+```
+
+- Canvas2D
+```javascript
+// 得到base64
+console.log(canvas.toDataURL());
+// 得到buffer
+console.log(canvas.toBuffer());
+```
+
+### 保存二维码到本地相册
+
+必须在导出临时文件路径成功后再执行保存。uni-app通用保存方式（H5除外）：
+```javascript
+uni.saveImageToPhotosAlbum({
+    filePath: tempFilePath,
+    success: res => {
+        console.log(res);
+    },
+    fail: err => {
+        console.log(err);
+    }
+});
+```
+
+H5可以通过设置`<a>`标签`href`属性的方式进行保存：
+```javascript
+const aEle = document.createElement('a');
+aEle.download = 'uQRCode'; // 设置下载的文件名，默认是'下载'
+aEle.href = tempFilePath;
+document.body.appendChild(aEle);
+aEle.click();
+aEle.remove(); // 下载之后把创建的元素删除
+```
+经过测试，PC端浏览器可以下载，部分安卓自带或第三方浏览器可以下载，安卓微信浏览器不适用，移动端iOS所有浏览器均不适用，差异较大，还是推荐各位导出文件给图片组件显示，然后提示用户通过长按图片进行保存这种方式。
+
+## uni-app组件方式
+
+### 安装
+
+通过uni-app插件市场地址安装：[https://ext.dcloud.net.cn/plugin?id=1287](https://ext.dcloud.net.cn/plugin?id=1287)。详细配置请移步到：文档 > [uni-app组件](https://uqrcode.cn/doc/document/uni-app.html)。
+
+### 引入
+
+uni-app默认为easycom模式，可直接键入`<uqrcode>`标签。
+
+### 简单用法
+
+安装`uqrcode`组件后，在`template`中键入`<uqrcode/>`。设置`ref`属性可使用组件内部方法，`canvas-id`属性为组件内部的canvas组件标识，`value`属性为二维码生成对应内容，`options`为配置选项，可配置二维码样式，绘制Logo等，详见：[options](https://uqrcode.cn/doc/document/uni-app.html#options) 。
+
+``` html
+<uqrcode ref="uqrcode" canvas-id="qrcode" value="https://uqrcode.cn/doc" :options="{ margin: 10 }"></uqrcode>
+```
+
+### 导出临时文件路径
+
+为了保证方法调用成功，请在 [complete](https://uqrcode.cn/doc/document/uni-app.html#complete) 事件返回`success=true`后调用。
+
+```javascript
+// uqrcode为组件的ref名称
+this.$refs.uqrcode.toTempFilePath({
+  success: res => {
+    console.log(res);
+  }
+});
+```
+
+### 保存二维码到本地相册
+
+为了保证方法调用成功，请在 [complete](https://uqrcode.cn/doc/document/uni-app.html#complete) 事件返回`success=true`后调用。
+
+```javascript
+// uqrcode为组件的ref名称
+this.$refs.uqrcode.save({
+  success: () => {
+    uni.showToast({
+      icon: 'success',
+      title: '保存成功'
+    });
+  }
+});
+```
+
+## 更多使用说明请前往官方文档查看：[https://uqrcode.cn/doc](https://uqrcode.cn/doc)。
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/changelog.md b/uni_modules/Sansnn-uQRCode/changelog.md
new file mode 100644
index 0000000..74a6e4c
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/changelog.md
@@ -0,0 +1,12 @@
+## 4.0.6（2022-12-12）
+修复`getDrawModules`，第一次获取结果正常，后续获取`tile`模块不存在的问题；  
+修复安卓type:normal因Canvas API使用了小数或为0的参数导致生成异常的问题（注：安卓非2d Canvas部分API参数不支持携带小数，部分API参数必须大于0）。
+## 4.0.1（2022-11-28）
+优化组件loading属性的表现；  
+新增组件type选项normal，以便于在某些条件编译初始为type=2d时还可以选择使用非2d组件类型；  
+修复组件条件编译在其他编辑器语法提示报错；  
+修复原生对es5的支持。
+## 4.0.0（2022-11-21）
+v4版本源代码全面开放，开源地址：[https://github.com/Sansnn/uQRCode](https://github.com/Sansnn/uQRCode)；  
+
+升级说明：v4为大版本更新，虽然已尽可能兼容上一代版本，但不可避免的还是存在一些细节差异，若更新后出现问题，请参考对照[v3 文档](https://uqrcode.cn/doc/v3)，[v4 文档](https://uqrcode.cn/doc)进行修改。
diff --git a/uni_modules/Sansnn-uQRCode/common/cache.js b/uni_modules/Sansnn-uQRCode/common/cache.js
new file mode 100644
index 0000000..d897d26
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/common/cache.js
@@ -0,0 +1 @@
+export const cacheImageList = [];
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/common/queue.js b/uni_modules/Sansnn-uQRCode/common/queue.js
new file mode 100644
index 0000000..be6b1d2
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/common/queue.js
@@ -0,0 +1,41 @@
+function Queue() {
+  let waitingQueue = this.waitingQueue = [];
+  let isRunning = this.isRunning = false; // 记录是否有未完成的任务
+
+  function execute(task, resolve, reject) {
+    task()
+      .then((data) => {
+        resolve(data);
+      })
+      .catch((e) => {
+        reject(e);
+      })
+      .finally(() => {
+        // 等待任务队列中如果有任务，则触发它；否则设置isRunning = false,表示无任务状态
+        if (waitingQueue.length) {
+          const next = waitingQueue.shift();
+          execute(next.task, next.resolve, next.reject);
+        } else {
+          isRunning = false;
+        }
+      });
+  }
+  this.exec = function(task) {
+    return new Promise((resolve, reject) => {
+      if (isRunning) {
+        waitingQueue.push({
+          task,
+          resolve,
+          reject
+        });
+      } else {
+        isRunning = true;
+        execute(task, resolve, reject);
+      }
+    });
+  }
+}
+
+/* 队列实例，某些平台一起使用多个组件时需要通过队列逐一绘制，否则部分绘制方法异常，nvue端的iOS gcanvas尤其明显，在不通过队列绘制时会出现图片丢失的情况 */
+export const queueDraw = new Queue();
+export const queueLoadImage = new Queue();
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/common/types/cache.d.ts b/uni_modules/Sansnn-uQRCode/common/types/cache.d.ts
new file mode 100644
index 0000000..9b6c3ce
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/common/types/cache.d.ts
@@ -0,0 +1,3 @@
+declare module '*/common/cache' {
+  export const cacheImageList: Array;
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/common/types/queue.d.ts b/uni_modules/Sansnn-uQRCode/common/types/queue.d.ts
new file mode 100644
index 0000000..f81ab97
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/common/types/queue.d.ts
@@ -0,0 +1,4 @@
+declare module '*/common/queue' {
+  export const queueDraw: any;
+  export const queueLoadImage: any;
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/components/u-qrcode/u-qrcode.vue b/uni_modules/Sansnn-uQRCode/components/u-qrcode/u-qrcode.vue
new file mode 100644
index 0000000..4fefaac
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/components/u-qrcode/u-qrcode.vue
@@ -0,0 +1,1131 @@
+<template>
+  <view class="uqrcode" :class="{ 'uqrcode-hide': hide }" :style="{ width: `${templateOptions.width}px`, height: `${templateOptions.height}px` }">
+    <view class="uqrcode-canvas-wrapper">
+      <!-- 画布 -->
+      <!-- #ifndef APP-NVUE -->
+      <canvas class="uqrcode-canvas" :id="canvasId" :canvas-id="canvasId" :type="canvasType" :style="{
+          width: `${templateOptions.canvasWidth}px`,
+          height: `${templateOptions.canvasHeight}px`,
+          transform: templateOptions.canvasTransform
+        }" v-if="templateOptions.canvasDisplay" @click="onClick"></canvas>
+      <!-- #endif -->
+
+      <!-- nvue用gcanvas -->
+      <!-- #ifdef APP-NVUE -->
+      <gcanvas class="uqrcode-canvas" ref="gcanvas" :style="{
+          width: `${templateOptions.canvasWidth}px`,
+          height: `${templateOptions.canvasHeight}px`
+        }" v-if="templateOptions.canvasDisplay" @click="onClick"></gcanvas>
+      <!-- #endif -->
+    </view>
+
+    <!-- 加载效果 -->
+    <view class="uqrcode-makeing" v-if="loading === undefined ? makeing : loading">
+      <slot name="loading">
+        <image class="uqrcode-makeing-image" :style="{ width: `${templateOptions.size / 4}px`, height: `${templateOptions.size / 4}px` }"
+          src="data:image/gif;base64,R0lGODlhAAEAAfIEAOHh4SSsWuDg4N3d3f///wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjAyODhGMzM4RDEwMTExRUM4MDhCRkVBQkE2QUZDQzkwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjAyODhGMzM5RDEwMTExRUM4MDhCRkVBQkE2QUZDQzkwIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDI4OEYzMzZEMTAxMTFFQzgwOEJGRUFCQTZBRkNDOTAiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDI4OEYzMzdEMTAxMTFFQzgwOEJGRUFCQTZBRkNDOTAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQFFAAEACwAAAAAAAEAAQAD/0i63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSCwaj8ikcslsOp/QqHRKrVqv2Kx2y+16v+CweEwum8/otHrNbrvf8Lh8Tq/b7/i8fs/v+/+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanigCqq6ytrieusbISAbW2t7i5uru8vb66bLLCrLDDw7S/ycrLzLXBxsLF0LHIzdbXzc/Trybb1BHY4eK92t6r0uaq1ePs4+Xp6PDg7fTh7+bx+PP1/Mz33vkA7utH0Ne/bQERDizIMNfBaQkhLmxIMcBDaBExTqzI8P+isYwfN3Ik6PFYt3TnRI7kVzLaSZQA1q0s2HLWS5QyZ/ar+a0ETHUqdbLjyc3nz5xC6RFtBdIkhKQ01/yMeVPeU6g7pR6tqu8q1npLiXEV6PVru7ApjcJEquyEPa1rxyosm83EWzVTm7qk688uNrRA1eIMatDvNcBUBVt9cJdEYzR55Urku8ztX7iDFXdlfLnE4zORNZPlfNiwNcR6bVJua7ou3q2i55I+3brv67ixJ8927bhzmtAkgDv4HIJ4GeEikDMw/oH5GOUgoCtw3oF6GOkesFvfsP0L9g7afY/o7uU7h/ClPYsHDTt4++Hri8c//j55/eXzm+d/fj96/+n/+1UX4HX/ZVcgeRggyIV5G6BHmycMauAgb5xEmMGEtnViIQYYVvbJhhd0yBqEBYJ34ICUgGiBiMmAomIFLP7iYonnnZiehjQ2aOODOE7l449MERbVai1iBuSRO67EVpG3IenkYvDptKSMRj5pZUhENjRlYU1e6aVqu420JTlVfmlmYGFyNCYviJ2ZWZoVrblLm25uFuVMcgJTZp1X5gmWkGzuyeeTfioF6JyCDopkoWcdqmeXilrJ6FCOOpRopD9O6k6luNCJ6V5wUqSpRZd+mqSYnN7iqalFhaplqrasyqpYWXYEqzOlzmpnA0mNKquuiblqa61kQgrsqWreSqqx/8e+eaeSyqIi7bTUVmvttdhmq+223Hbr7bejCCDuuOSWa+656Kar7rrnSjDAu/DGK++89NZr77340vsru/z2224E+QYs8MAEw7uvvwj3627BDDfM8MEJR5zuwg5XbHG9EEusMbkUX+zxxRlvvHHHH5f8cK4ip+wvySa3HHDIKifMsss0Y4xyzDijO3PNPBt8c85Aj7tzzzzDHPS6QxNNs9FHTwyw0lAPwHTT/0IQNdRTU11u0ld/nLXWQj/dddE/g50y12Nb/LXZaKft8Npgt+32ycyafbTccxMMt9Z45y3w3lT37Xe+qEnGruDxzihxalU/ULHiETNuLuI+k7i44f9Ii013j5Fjri7l70Ius+dOW/32hxpLvrXmBYuOsOocs6436pfndrjsA7u+Muk64/437Z3bnrnpDeuuMO+NO/A48KML/7nvLzP/OvKTQ0+49Ls7X7rjp1sevHu1c1889sdr3zvxm1eYOvWro986+fzCHrb7s3vfPPjfK9895/ePMLL1+DKe3c6Hv/fZb4DPM5++4IfA9hWwfvxrIAH9tz/1STCBD8wdAy8oNfYlboMXlF/oQChBEXbwgByMnQLnJcAUmrCFHDTh4FhYNrZ5cIY2q5sLb4hDGuowhjzs4Qd/GMIgCnGERCyhEY8IOAxS8IgVZE8Kk2cfKI4viQ2UIRPAaxi3JQqxiXcDoBXtVbgVOlB/YzTgb9ZnRhWKL40axCIVQ/A/+sExgFwU1wvFeMchrjF8T8xfA/oYxz8Kko5sfCMh71XGDJZPkYvMoSH7V8VDLiCS15Nj9do4P0hiUl6NDCQlGfBJRoLrlKhMpSpXycpWuvKVsIylLGdJy1ra8pa4zKUud8nLXvryl8AMpjCHScxiGvOYyEymMpfJzGY685nQjKY0p0nNalrzmtjMpja3yc1uevOb4AynOMdJhwQAACH5BAUUAAQALDIAMgCcAJwAAAP/KLrcTjDKSWt0OFsIuv9gKI5kaZ6Ztq1s6iorKs90/apsTt1pbP/AIA+mK16Gj41wyWwan8ikpUmtRp/GaMNn7Xq3WJ2Wwf2arWHxmDg9u6np3JpdeduX8da8fO8j83xXSn6EQ4CDa4GFi2CHO3uIjJJkjo+JkZOTlZZjipmFmxNzAp6ffqESo6Wmd6hHl22sjK4ckLGyoLSqmLh9tAS7t72+urZ1QL+LycacNcuEz528M9HErsHHP9WtxbDZNtt24YbTMuNu5zerJulm7S7rJe9e8zjfzt2n+VrxJPVo+wQJo/GvSsFG9wgGFLeQ3EBqDdFFVFcOxUEnE1/0G3GR/0lHOs0UXss10ltIiCX1peRX8cRHIS83iniJLVRNUcgyfonZkp1Oej/tnTT3K87NSkdfgSuaJukhp8ByMsUCNQ/UIFPDVDXKDKe2rFC6IhWrFB/YIlubkq319awak5uuSnWrB+5Yu2VF0pUpBZXctnt7jhqMl63KhMMIU3z4hm9ixY4xMn6sGENkj4IpVyaVuctlzdImn/kMWiDixp1L/z08VPVm0lhTuw59WqLo2YNhz22NO7dsOL9789ANmLfwwlGhBT8Obzke58wtQ499O/qf6bu9WvddHWj37RqxF9cOHrky8ZvTs/wOkH2IwPDjy59Pv779+/jz69/Pv7////8ABijggAQWaOCBCCao4FQDNOjggxBGKOGEFFZooYQrBKDhhhx26OGHIIYo4ogfXmjiiSim6GCGJLbo4oswaqjijDTSyGKMOOYYY4089ljhjToGKWSJPhZpJJBDJimkkUz2iKSSUO7Y5JQqPhnllSRSqeWJVmLpJZFbhjlhl1+WKaOYaEJIpplfpulmg2uyieWbbsYpZ5R0pmnnnUrmieaefA7pp5iABhrkoGEWamiOiG6p6KJSNjrlo5C+KCmVlFba4qWTbqCpl5w2memnIvLIkwVB6mdqUBh6qqOqNZ5aQar5rbpSiqMGAKuNrEaY664zykoBrfjZ6lesruYIbJX/vaqZLI7L4trsg7/WiuytKFZb7LXH8orqq9Z6222wz8YYbbbTrlgujOdymS6c677YronCTkDsfcbaxO2w4G4rrr7/2tsvvvvGVbAE99qXr8EBIzywwgc7srDDyoZLLrbufluxv6EOUFTC9XWsLi0g0ycyvCQ/HPLJH6tsMsu/lDzfyR7H7PLMMKe8McEit7wzxD3b/PPKQesMrcWh+kxqnzm7sjSeTaPyNJQ0Kz31oVGHcnWSVQu9tY5dG/01jmE7PTbYWW9yNtpFm712pDQ3HMHbZEf8lN0E0A03sxjTG6/eIU4sMd6AW4q3VYQXvunhXMkNgeKLOw6I4I9DPiLlGZMnbnngjKsl+ealdq6V5qB7iDnin5f+YQIAIfkEBRQABAAsMgAyAJwAnAAAA/84utxOMMpJa3Q4Wyi6/2AojmRpnpm2rWzqKisqz3T9qmxO3Wls/8AgD6YrXoaPjXDJbBqfyKSlSa1Gn8Zow2fterdYnZbB/ZqtYfGYOD27qencml1525fx1rx87yPzfFdKfoRDgINrgYWLYIc7e4iMkmSOj4mRk5OVlmOKmYWbE3MDnp9+oRKjpaZ3qEeXbayMrhyQsbKgtKqYuH20BLu3vb66tnVAv4vJxpw1y4TPnbwz0cSuwcc/1a3FsNk223bhhtMy427nN6sm6WbtLusl717zON/O3af5WvEk9Wj7BAmj8a9KwUb3CAYUt5DcQGoN0UVUVw7FQScTX/QbcZH/SUc6zRReyzXSW0iIJfWl5FfxxEchLzeKeIktVE1RyDJ+idmSnU56P+2dNPcrzs1KR1+BK5om6SGnwHIyxQI1D9QgU8NUNcoMp7asULoiFasUH9giW5uSrfX1rBqTm65KdasH7li7ZUXSlSkFldy2e3uOGoyXrcqEwwhTfPiGb2LFjjEyfqwYQ2SPgilXJpW5y2XN0iaf+QxaIOLGnUv/PTxU9WbSWFO7Dn1aoujZg2HPbY07t2w4v3vz0A2Yt/DCUaEFPw5vOR7nzC1Dj307+p/pu71a910daPftGrEX1w4euTLxm9Oz/A6QfYjA8OPLn0+/vv37+PPr38+/v////wAGKOCABBZo4IEIJqjgVAE06OCDEEYo4YQUVmihhMQBoOGGHHbo4YcghsjhhSSWaOKJDmYo4oostqghijDGGKOKLtZo44sy5qgjhTTe6OOKOwYpZAA9/mikh0MmKWORRzYJgJJQnsikk0ZGaeWFU1Lp45VcTpilljZ2KeaDX4Lp4pholmkmi2iOqeaaIrYp5ptwgihnl3TWieSdV+ap54h8WunnnzgGCuWghBoaJaJ/KnooeoTW6KiSjOo5aZKV1pnjL5tCp1+nroBaG4ufLkmLqMaJWOqMp5rqXoerwsipq6OuGCuKs7L6Koe3StmqrrWqmh+qmxCbipG9mpirrP+eDktrKMbmVWOyJS6La7P4RXuItsn5SC2J1vq664bfYvkrs+NqWK6F4SqL7X3c5sHtketW2G6179oXbxzzIusssNA+S56N9fJ47rXpAlCwlweLG2yIC7fJU7aXkhnUhxGnebGHGbu5Maz/Vkzkx7yGXPHE8IrcIMr6qjzySgSbfCnL9bn8sl/+UqwyTZHeaDPPPUvqMtBBt/gzyUVvOTTSSYe5NMxNr3k01FGDOTXOVWv6NNZZS721TV3DaXO/YZu5bxpkl63l2WGkrbaTbGPh9ttHxv3E3HT/aLcReOfts8CV9O230AAXC7i0gxOOLiqCJ87m4dtC3q3jThceuOQElP+YAAAh+QQFFAAEACwyADIAnACcAAAD/xi63E4wyklrdDhbOLr/YCiOZGmKWcpsbEuoMHvOdG17sOruVJ7Kt6Aw6NPwjq/iYzNsOkvKJXIXbQCfWGx1NaVuFdesWPgFd13lQHjMpqXP6PK6TSe94ay7pc6HyvEbehV9hCGCgBOHE4WMHYqIEI8RjYySiJYElIWYeJiahJxwnp98oWejpHSmXaipbKtTra5isEiys1p/kIm6g7hjtUe3v03BPMM0uxTFvcpJX3M1zhLM0NORzYtD1xxDxl7We9vc1Vvcz+ZM49flVefIM+ftUe/Z1OvT80r14b5C8t7sQYJ3AiAZgZcQZsLnTF8RfunE/SMXsJ8zgiYMElHYSf9hE403vsWxqG0iu4oRp2EsAdKGyBYrSbSs8TKPR4bKHPqA6E6dyXwoe16LOWKmG46ibv5sGJQeN6IijM6oGUhpkHMdSe6CGgJrUq0Drd7wegppWbDdlpIFl/KiWBtrY5ll9VZaXGFz5aJdqPZu1b1Z25a86petUJV1kxUeKXhr4niLYaaZTFmKP03RjlbePDkzIc8nOIt+3Ae0idGonUrE7HNj6tc6WlMy7Qe2bcvLSNG2c7v3gt1tgKPw7Vv4GOMgiBeX3Qj5B+W9nWOR7gi6bepOsFu/zpyR9u2vsX/srhn8aPE47x00f578Z/eh2bdfPRv+afmi0fed1BQ/VzH/3/lXmX6E0eeSgAPaV0eACP6XBXaRRSjhhBRWaOGFGGao4YYcdujhhyCGKOKIJJZo4okopqjiimQB4OKLMMYo44w01mjjjTMSKMCOPPbo449ABinkkDgWaeSROOpI5JJMNonkk1BGqaSTVFYZ5ZVY3jillVx2meWXSG7p5Zhkgmmmi2KWqeaZbBqZ5ppwtilnjG/GaeecbNZ55554Yqknn4D2eeSfgRYqaI2EGqrooS8muiijkDr6KKSCSjoppXNaeimmeSq46aec2qgpqKH66SmpqJYKwKipqjroqa3yKVWSsP64oaknSVmrj7deOauWu/bYq665QgmhhrgCRexl/1UOayxFy+bGpbNP/ipqsDxSGya0zxropLavFlsttjuC6ya343rbpLlFWosouQKwS6u426rLpLzA0hsus1Tie62+59q7pL/vAtwuvATT6K7CCCPrK7r18vutw9Hm9LDARCacI8T7SmulxjIuvDHGQ4JMJ8cBS7wuxa6GjPK9LLcMo8i2xiwzmi8PbPPNNPO6s8w9C/tzy0FnO7SrRZd7tKpJx7t0qU2bzGjUT4fadKxYn2xw1lwfvHXXYDP8ddhkN5pz2WhfjTbQZ68dttpuM9123De7PDbddZvJatZUk4x3xbsk6/Hfa/atMuGCWww4f4gXPrfYhzferbKTDy554hmBXxz55R0rXvlgnGvO1OJphS665+luTncCADs=">
+        </image>
+      </slot>
+    </view>
+
+    <!-- 错误处理 -->
+    <view class="uqrcode-error" v-if="isError" @click="onClick">
+      <slot name="error" :error="error">
+        <text class="uqrcode-error-message">{{ error.errMsg }}</text>
+      </slot>
+    </view>
+
+    <!-- H5保存提示 -->
+    <!-- #ifdef H5 -->
+    <view class="uqrcode-h5-save" v-if="isH5Save">
+      <slot name="h5save" :tempFilePath="tempFilePath">
+        <image class="uqrcode-h5-save-image" :src="tempFilePath"></image>
+        <text class="uqrcode-h5-save-text">{{ h5SaveIsDownload ? '若保存失败，' : '' }}请长按二维码进行保存</text>
+      </slot>
+      <view class="uqrcode-h5-save-close" @click.stop="isH5Save = false">
+        <view class="uqrcode-h5-save-close-before"></view>
+        <view class="uqrcode-h5-save-close-after"></view>
+      </view>
+    </view>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+  // #ifdef VUE3
+  import {
+    toRaw
+  } from 'vue';
+  // #endif
+
+  /* 引入uQRCode核心js */
+  import UQRCode from '../../js_sdk/uqrcode/uqrcode';
+
+  /* 引入nvue所需模块 */
+  // #ifdef APP-NVUE
+  import {
+    enable,
+    WeexBridge
+  } from '../../js_sdk/gcanvas';
+  const modal = weex.requireModule('modal');
+  // #endif
+
+  /* 引入队列 */
+  import {
+    queueDraw,
+    queueLoadImage
+  } from '../../common/queue';
+  /* 引入缓存图片 */
+  import {
+    cacheImageList
+  } from '../../common/cache';
+
+  let instance = null;
+
+  export default {
+    name: 'uqrcode',
+    props: {
+      /**
+       * canvas组件id
+       */
+      canvasId: {
+        type: String,
+        required: true // canvasId在微信小程序初始值不能为空，created中赋值也不行，必须给一个值，否则挂载组件后无法绘制。不考虑用随机id，uuid
+      },
+      /**
+       * 二维码内容
+       */
+      value: {
+        type: [String, Number]
+      },
+      /**
+       * 选项
+       */
+      options: {
+        type: Object,
+        default: () => {
+          return {};
+        }
+      },
+      /**
+       * 二维码大小
+       */
+      size: {
+        type: [String, Number],
+        default: 200
+      },
+      /**
+       * 二维码尺寸单位
+       */
+      sizeUnit: {
+        type: String,
+        default: 'px'
+      },
+      /**
+       * 导出的文件类型
+       */
+      fileType: {
+        type: String,
+        default: 'png'
+      },
+      /**
+       * 是否初始化组件后就开始生成
+       */
+      start: {
+        type: Boolean,
+        default: true
+      },
+      /**
+       * 是否数据发生改变自动重绘
+       */
+      auto: {
+        type: Boolean,
+        default: true
+      },
+      /**
+       * 隐藏组件
+       */
+      hide: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * canvas 类型，微信小程序默认使用2d，非2d微信官方已放弃维护，问题比较多
+       * 注意：微信小程序type2d手机上正常，PC上微信内打开小程序toDataURL报错，看后期微信官方团队会不会做兼容，不兼容的话只能在自行判断在PC使用非2d，或者直接提示用户请在手机上操作，微信团队的海报中心小程序就是这么做的
+       */
+      type: {
+        type: String,
+        default: () => {
+          // #ifdef MP-WEIXIN
+          return '2d';
+          // #endif
+          // #ifndef MP-WEIXIN
+          return 'normal';
+          // #endif
+        }
+      },
+      /**
+       * 队列绘制，主要针对NVue端
+       */
+      queue: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * 是否队列加载图片，可减少canvas发起的网络资源请求，节省服务器资源
+       */
+      isQueueLoadImage: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * loading态
+       */
+      loading: {
+        type: Boolean,
+        default: undefined
+      },
+      /**
+       * H5保存即自动下载（在支持的环境下），默认false为仅弹层提示用户需要长按图片保存，不会自动下载
+       */
+      h5SaveIsDownload: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * H5下载名称
+       */
+      h5DownloadName: {
+        type: String,
+        default: 'uQRCode'
+      }
+    },
+    data() {
+      return {
+        canvas: undefined,
+        canvasType: undefined,
+        canvasContext: undefined,
+        makeDelegate: undefined,
+        drawDelegate: undefined,
+        toTempFilePathDelegate: undefined,
+        makeExecuted: false,
+        makeing: false,
+        drawing: false,
+        isError: false,
+        error: undefined,
+        isH5Save: false,
+        tempFilePath: '',
+        templateOptions: {
+          size: 0,
+          width: 0, // 组件宽度
+          height: 0,
+          canvasWidth: 0, // canvas宽度
+          canvasHeight: 0,
+          canvasTransform: '',
+          canvasDisplay: false
+        },
+        uqrcodeOptions: {
+          data: ''
+        },
+        plugins: [],
+        makeingPattern: [
+          [
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true]
+          ],
+          [
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, true, true, true, false, true, true, true],
+            [true, true, true, true, true, true, false, true, true, true],
+            [true, true, true, true, true, true, false, true, true, true]
+          ],
+          [
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, true, true, true, true, false, false, false],
+            [true, true, true, true, true, true, true, false, false, false],
+            [true, true, true, true, true, true, true, false, false, false],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true]
+          ],
+          [
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true]
+          ]
+        ]
+      };
+    },
+    watch: {
+      type: {
+        handler(val) {
+          const types = ['2d'];
+          if (types.includes(val)) {
+            this.canvasType = val;
+          } else {
+            this.canvasType = undefined;
+          }
+        },
+        immediate: true
+      },
+      value: {
+        handler() {
+          if (this.auto) {
+            this.remake();
+          }
+        }
+      },
+      size: {
+        handler() {
+          if (this.auto) {
+            this.remake();
+          }
+        }
+      },
+      options: {
+        handler() {
+          if (this.auto) {
+            this.remake();
+          }
+        },
+        deep: true
+      },
+      makeing: {
+        handler(val) {
+          if (!val) {
+            if (typeof this.toTempFilePathDelegate === 'function') {
+              this.toTempFilePathDelegate();
+            }
+          }
+        }
+      }
+    },
+    mounted() {
+      this.templateOptions.size = this.sizeUnit == 'rpx' ? uni.upx2px(this.size) : this.size;
+      this.templateOptions.width = this.templateOptions.size;
+      this.templateOptions.height = this.templateOptions.size;
+      this.templateOptions.canvasWidth = this.templateOptions.size;
+      this.templateOptions.canvasHeight = this.templateOptions.size;
+      if (this.canvasType == '2d') {
+        // #ifndef MP-WEIXIN
+        this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+        this.templateOptions.canvasHeight})`;
+        // #endif
+      } else {
+        this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+        this.templateOptions.canvasHeight})`;
+      }
+      if (this.start) {
+        this.make();
+      }
+    },
+    methods: {
+      /**
+       * 获取模板选项
+       */
+      getTemplateOptions() {
+        var size = this.sizeUnit == 'rpx' ? uni.upx2px(this.size) : this.size;
+        return deepReplace(this.templateOptions, {
+          size,
+          width: size,
+          height: size
+        });
+      },
+      /**
+       * 获取插件选项
+       */
+      getUqrcodeOptions() {
+        return deepReplace(this.options, {
+          data: String(this.value),
+          size: Number(this.templateOptions.size)
+        });
+      },
+      /**
+       * 重置画布
+       */
+      resetCanvas(callback) {
+        this.templateOptions.canvasDisplay = false;
+        this.$nextTick(() => {
+          this.templateOptions.canvasDisplay = true;
+          this.$nextTick(() => {
+            callback && callback();
+          });
+        });
+      },
+      /**
+       * 绘制二维码
+       */
+      async draw(callback = {}, isDrawDelegate = false) {
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        if (this.drawing) {
+          if (!isDrawDelegate) {
+            this.drawDelegate = () => {
+              this.draw(callback, true);
+            };
+            return;
+          }
+        } else {
+          this.drawing = true;
+        }
+
+        if (!this.canvasId) {
+          console.error('[uQRCode]: canvasId must be set!');
+          this.isError = true;
+          this.drawing = false;
+          callback.fail({
+            errMsg: '[uQRCode]: canvasId must be set!'
+          });
+          callback.complete({
+            errMsg: '[uQRCode]: canvasId must be set!'
+          });
+          return;
+        }
+        if (!this.value) {
+          console.error('[uQRCode]: value must be set!');
+          this.isError = true;
+          this.drawing = false;
+          callback.fail({
+            errMsg: '[uQRCode]: value must be set!'
+          });
+          callback.complete({
+            errMsg: '[uQRCode]: value must be set!'
+          });
+          return;
+        }
+
+        /* 组件数据 */
+        this.templateOptions = this.getTemplateOptions();
+        /* uQRCode选项 */
+        this.uqrcodeOptions = this.getUqrcodeOptions();
+        /* 纠错等级兼容字母写法 */
+        if (typeof this.uqrcodeOptions.errorCorrectLevel === 'string') {
+          this.uqrcodeOptions.errorCorrectLevel = UQRCode.errorCorrectLevel[this.uqrcodeOptions.errorCorrectLevel];
+        }
+        /* nvue不支持动态修改gcanvas尺寸，除nvue外，默认使用useDynamicSize */
+        // #ifndef APP-NVUE
+        if (typeof this.options.useDynamicSize === 'undefined') {
+          this.uqrcodeOptions.useDynamicSize = true;
+        }
+        // #endif
+        // #ifdef APP-NVUE
+        if (typeof this.options.useDynamicSize === 'undefined') {
+          this.uqrcodeOptions.useDynamicSize = false;
+        }
+        // if (typeof this.options.drawReserve === 'undefined') {
+        //   this.uqrcodeOptions.drawReserve = true;
+        // }
+        // #endif
+
+        /* 获取uQRCode实例 */
+        const qr = instance = new UQRCode();
+        /* 注册扩展 */
+        this.plugins.forEach(p => qr.register(p.plugin));
+        /* 设置uQRCode选项 */
+        qr.setOptions(this.uqrcodeOptions);
+        /* 调用制作二维码方法 */
+        qr.make();
+
+        /* 获取canvas上下文 */
+        let canvasContext = null;
+        // #ifndef APP-NVUE
+        if (this.canvasType === '2d') {
+          // #ifdef MP-WEIXIN
+          /* 微信小程序获取canvas2d上下文方式 */
+          const canvas = (this.canvas = await new Promise(resolve => {
+            uni
+              .createSelectorQuery()
+              .in(this) // 在组件内使用需要
+              .select(`#${this.canvasId}`)
+              .fields({
+                node: true,
+                size: true
+              })
+              .exec(res => {
+                resolve(res[0].node);
+              });
+          }));
+          canvasContext = this.canvasContext = canvas.getContext('2d');
+          /* 2d的组件设置宽高与实际canvas绘制宽高不是一个，打个比方，组件size=200，canvas.width设置为100，那么绘制出来就是100=200，组件size=400，canvas.width设置为800，绘制大小还是800=400，所以无需理会下方返回的dynamicSize是多少，按dpr重新赋值给canvas即可 */
+          this.templateOptions.canvasWidth = qr.size;
+          this.templateOptions.canvasHeight = qr.size;
+          this.templateOptions.canvasTransform = '';
+          /* 使用dynamicSize+scale，可以解决小块间出现白线问题，dpr可以解决模糊问题 */
+          const dpr = uni.getSystemInfoSync().pixelRatio;
+          canvas.width = qr.dynamicSize * dpr;
+          canvas.height = qr.dynamicSize * dpr;
+          canvasContext.scale(dpr, dpr);
+          /* 微信小程序获取图像方式 */
+          qr.loadImage = this.getLoadImage(function(src) {
+            /* 小程序下获取网络图片信息需先配置download域名白名单才能生效 */
+            return new Promise((resolve, reject) => {
+              const img = canvas.createImage();
+              img.src = src;
+              img.onload = () => {
+                resolve(img);
+              };
+              img.onerror = err => {
+                reject(err);
+              };
+            });
+          });
+          // #endif
+          // #ifndef MP-WEIXIN
+          /* 非微信小程序不支持2d，切换回uniapp获取canvas上下文方式 */
+          canvasContext = this.canvasContext = uni.createCanvasContext(this.canvasId, this);
+          /* 使用dynamicSize，可以解决小块间出现白线问题，再通过scale缩放至size，使其达到所设尺寸 */
+          this.templateOptions.canvasWidth = qr.dynamicSize;
+          this.templateOptions.canvasHeight = qr.dynamicSize;
+          this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+          this.templateOptions.canvasHeight})`;
+          /* uniapp获取图像方式 */
+          qr.loadImage = this.getLoadImage(function(src) {
+            return new Promise((resolve, reject) => {
+              if (src.startsWith('http')) {
+                uni.getImageInfo({
+                  src,
+                  success: res => {
+                    resolve(res.path);
+                  },
+                  fail: err => {
+                    reject(err);
+                  }
+                });
+              } else {
+                if (src.startsWith('.')) {
+                  console.error('[uQRCode]: 本地图片路径仅支持绝对路径！');
+                  throw new Error('[uQRCode]: local image path only supports absolute path!');
+                } else {
+                  resolve(src);
+                }
+              }
+            });
+          });
+          // #endif
+        } else {
+          /* uniapp获取canvas上下文方式 */
+          canvasContext = this.canvasContext = uni.createCanvasContext(this.canvasId, this);
+          /* 使用dynamicSize，可以解决小块间出现白线问题，再通过scale缩放至size，使其达到所设尺寸 */
+          this.templateOptions.canvasWidth = qr.dynamicSize;
+          this.templateOptions.canvasHeight = qr.dynamicSize;
+          this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+          this.templateOptions.canvasHeight})`;
+          /* uniapp获取图像方式 */
+          qr.loadImage = this.getLoadImage(function(src) {
+            return new Promise((resolve, reject) => {
+              /* getImageInfo在微信小程序的bug：本地路径返回路径会把开头的/或../移除，导致路径错误，解决方法：限制只能使用绝对路径 */
+              if (src.startsWith('http')) {
+                uni.getImageInfo({
+                  src,
+                  success: res => {
+                    resolve(res.path);
+                  },
+                  fail: err => {
+                    reject(err);
+                  }
+                });
+              } else {
+                if (src.startsWith('.')) {
+                  console.error('[uQRCode]: 本地图片路径仅支持绝对路径！');
+                  throw new Error('[uQRCode]: local image path only supports absolute path!');
+                } else {
+                  resolve(src);
+                }
+              }
+            });
+          });
+        }
+        // #endif
+        // #ifdef APP-NVUE
+        /* NVue获取canvas上下文方式 */
+        const gcanvas = this.$refs['gcanvas'];
+        const canvas = enable(gcanvas, {
+          bridge: WeexBridge
+        });
+        canvasContext = this.canvasContext = canvas.getContext('2d');
+        /* NVue获取图像方式 */
+        qr.loadImage = this.getLoadImage(function(src) {
+          return new Promise((resolve, reject) => {
+            /* getImageInfo在nvue的bug：获取同一个路径的图片信息，同一时间第一次获取成功，后续失败，猜测是写入本地时产生文件写入冲突，所以没有返回，特别是对于网络资源 --- 已实现队列绘制，已解决此问题 */
+            if (src.startsWith('.')) {
+              console.error('[uQRCode]: 本地图片路径仅支持绝对路径！');
+              throw new Error('[uQRCode]: local image path only supports absolute path!');
+            } else {
+              uni.getImageInfo({
+                src,
+                success: res => {
+                  resolve(res.path);
+                },
+                fail: err => {
+                  reject(err);
+                }
+              });
+            }
+          });
+        });
+        // #endif
+
+        /* 设置uQRCode实例的canvas上下文 */
+        qr.canvasContext = canvasContext;
+        /* 延时等待页面重新绘制完毕 */
+        setTimeout(() => {
+          /* 从插件获取具体要调用哪一个扩展函数 */
+          var plugin = this.plugins.find(p => p.name == qr.style);
+          var drawCanvasName = plugin ? plugin.drawCanvas : 'drawCanvas';
+          /* 虽然qr[drawCanvasName]是直接返回Promise的，但由于js内部this指向问题，故不能直接exec(qr[drawCanvasName])此方式执行，需要改成exec(() => qr[drawCanvasName]())才能正确获取this */
+          var drawCanvas;
+          if (this.queue) {
+            drawCanvas = () => queueDraw.exec(() => qr[drawCanvasName]());
+            // drawCanvas = () => queueDraw.exec(() => new Promise((resolve, reject) => {
+            //   setTimeout(() => {
+            //     qr[drawCanvasName]().then(resolve).catch(reject);
+            //   }, 1000);
+            // }));
+          } else {
+            drawCanvas = () => qr[drawCanvasName]();
+          }
+          /* 调用绘制方法将二维码图案绘制到canvas上 */
+          drawCanvas()
+            .then(() => {
+              if (this.drawDelegate) {
+                /* 高频重绘纠正 */
+                let delegate = this.drawDelegate;
+                this.drawDelegate = undefined;
+                delegate();
+              } else {
+                this.drawing = false;
+                callback.success();
+              }
+            })
+            .catch(err => {
+              console.log(err);
+              if (this.drawDelegate) {
+                /* 高频重绘纠正 */
+                let delegate = this.drawDelegate;
+                this.drawDelegate = undefined;
+                delegate();
+              } else {
+                this.drawing = false;
+                this.isError = true;
+                callback.fail(err);
+              }
+            })
+            .finally(() => {
+              callback.complete();
+            });
+        }, 300);
+      },
+      /**
+       * 生成二维码
+       */
+      make(callback = {}) {
+        this.makeExecuted = true;
+        this.makeing = true;
+        this.isError = false;
+
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        this.resetCanvas(() => {
+          clearTimeout(this.makeDelegate);
+          this.makeDelegate = setTimeout(() => {
+            this.draw({
+              success: () => {
+                setTimeout(() => {
+                  callback.success();
+                  this.complete(true);
+                }, 300);
+              },
+              fail: err => {
+                callback.fail(err);
+                this.error = err;
+                this.complete(false, err.errMsg);
+              },
+              complete: () => {
+                callback.complete();
+                this.makeing = false;
+              }
+            });
+          }, 300);
+        });
+      },
+      /**
+       * 重新生成
+       */
+      remake(callback) {
+        this.$emit('change');
+        this.make(callback);
+      },
+      /**
+       * 生成完成
+       */
+      complete(success = true, errMsg = '') {
+        if (success) {
+          this.$emit('complete', {
+            success
+          });
+        } else {
+          this.$emit('complete', {
+            success,
+            errMsg
+          });
+        }
+      },
+      /**
+       * 导出临时路径
+       */
+      toTempFilePath(callback = {}) {
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        if (!this.makeExecuted) {
+          console.error('[uQRCode]: make() 方法从未调用！请先成功调用 make() 后再进行操作。');
+          var err = {
+            errMsg: '[uQRCode]: make() method has never been executed! please execute make() successfully before operating.'
+          };
+          callback.fail(err);
+          callback.complete(err);
+          return;
+        }
+
+        if (this.isError) {
+          callback.fail(this.error);
+          callback.complete(this.error);
+          return;
+        }
+
+        if (this.makeing) {
+          /* 如果还在生成状态，那当前操作将托管到委托，监听生成完成后再通过委托复调当前方法 */
+          this.toTempFilePathDelegate = () => {
+            this.toTempFilePath(callback);
+          };
+          return;
+        } else {
+          this.toTempFilePathDelegate = null;
+        }
+
+        // #ifndef APP-NVUE
+        if (this.canvasType === '2d') {
+          // #ifdef MP-WEIXIN
+          try {
+            let dataURL = null;
+            // #ifdef VUE3
+            dataURL = toRaw(this.canvas)
+              .toDataURL();
+            // #endif
+            // #ifndef VUE3
+            dataURL = this.canvas.toDataURL();
+            // #endif
+            callback.success({
+              tempFilePath: dataURL
+            });
+            callback.complete({
+              tempFilePath: dataURL
+            });
+          } catch (e) {
+            callback.fail(e);
+            callback.complete(e);
+          }
+          // #endif
+        } else {
+          uni.canvasToTempFilePath({
+              canvasId: this.canvasId,
+              fileType: this.fileType,
+              width: Number(this.templateOptions.canvasWidth),
+              height: Number(this.templateOptions.canvasHeight),
+              destWidth: Number(this.templateOptions.size),
+              destHeight: Number(this.templateOptions.size),
+              success: res => {
+                callback.success(res);
+              },
+              fail: err => {
+                callback.fail(err);
+              },
+              complete: () => {
+                callback.complete();
+              }
+            },
+            this
+          );
+        }
+        // #endif
+        // #ifdef APP-NVUE
+        const dpr = uni.getSystemInfoSync().pixelRatio;
+        this.canvasContext.toTempFilePath(
+          0,
+          0,
+          this.templateOptions.canvasWidth * dpr,
+          this.templateOptions.canvasHeight * dpr,
+          this.templateOptions.size * dpr,
+          this.templateOptions.size * dpr,
+          '',
+          1,
+          res => {
+            callback.success(res);
+            callback.complete(res);
+          }
+        );
+        // #endif
+      },
+      /**
+       * 保存
+       */
+      save(callback = {}) {
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        this.toTempFilePath({
+          success: res => {
+            // #ifndef H5
+            if (this.canvasType === '2d') {
+              // #ifdef MP-WEIXIN
+              /* 需要将 data:image/png;base64, 这段去除 writeFile 才能正常打开文件，否则是损坏文件，无法打开 */
+              const reg = new RegExp('^data:image/png;base64,', 'g');
+              const dataURL = res.tempFilePath.replace(reg, '');
+              const fs = wx.getFileSystemManager();
+              const tempFilePath = `${wx.env.USER_DATA_PATH}/${new Date().getTime()}${
+                Math.random()
+                  .toString()
+                  .split('.')[1]
+              }.png`;
+              fs.writeFile({
+                filePath: tempFilePath, // 要写入的文件路径 (本地路径)
+                data: dataURL, // base64图片
+                encoding: 'base64',
+                success: res1 => {
+                  uni.saveImageToPhotosAlbum({
+                    filePath: tempFilePath,
+                    success: res2 => {
+                      callback.success(res2);
+                    },
+                    fail: err2 => {
+                      callback.fail(err2);
+                    },
+                    complete: () => {
+                      callback.complete();
+                    }
+                  });
+                },
+                fail: err => {
+                  callback.fail(err);
+                },
+                complete: () => {
+                  callback.complete();
+                }
+              });
+              // #endif
+            } else {
+              uni.saveImageToPhotosAlbum({
+                filePath: res.tempFilePath,
+                success: res1 => {
+                  callback.success(res1);
+                },
+                fail: err1 => {
+                  callback.fail(err1);
+                },
+                complete: () => {
+                  callback.complete();
+                }
+              });
+            }
+            // #endif
+
+            // #ifdef H5
+            /* 可以在电脑浏览器下载，移动端iOS不行，安卓微信浏览器不行，安卓外部浏览器可以 */
+            this.isH5Save = true;
+            this.tempFilePath = res.tempFilePath;
+            if (this.h5SaveIsDownload) {
+              const aEle = document.createElement('a');
+              aEle.download = this.h5DownloadName; // 设置下载的文件名，默认是'下载'
+              aEle.href = res.tempFilePath;
+              document.body.appendChild(aEle);
+              aEle.click();
+              aEle.remove(); // 下载之后把创建的元素删除
+            }
+            callback.success({
+              errMsg: 'ok'
+            });
+            callback.complete({
+              errMsg: 'ok'
+            });
+            // #endif
+          },
+          fail: err => {
+            callback.fail(err);
+            callback.complete(err);
+          }
+        });
+      },
+      /**
+       * 注册click事件
+       */
+      onClick(e) {
+        this.$emit('click', e);
+      },
+      /**
+       * 获取实例
+       */
+      getInstance() {
+        return instance;
+      },
+      /**
+       * 注册扩展，组件仅支持注册type为style的drawCanvas扩展
+       * @param {Object} plugin
+       */
+      registerStyle(plugin) {
+        if (plugin.Type != 'style') {
+          console.warn('[uQRCode]: registerStyle 仅支持注册 style 类型的扩展！');
+          return {
+            errMsg: 'registerStyle 仅支持注册 style 类型的扩展！'
+          };
+        }
+        if (typeof plugin === 'function') {
+          this.plugins.push({
+            plugin,
+            name: plugin.Name,
+            drawCanvas: plugin.DrawCanvas
+          });
+        }
+      },
+      getLoadImage(loadImage) {
+        var that = this;
+        if (typeof loadImage == 'function') {
+          return function(src) {
+            /* 判断是否是队列加载图片的 */
+            if (that.isQueueLoadImage) {
+              /* 解决iOS APP||NVUE同时绘制多个二维码导致图片丢失需使用队列 */
+              return queueLoadImage.exec(() => {
+                return new Promise((resolve, reject) => {
+                  setTimeout(() => {
+                    const cache = cacheImageList.find(x => x.src == src);
+                    if (cache) {
+                      resolve(cache.img);
+                    } else {
+                      loadImage(src)
+                        .then(img => {
+                          cacheImageList.push({
+                            src,
+                            img
+                          });
+                          resolve(img);
+                        })
+                        .catch(err => {
+                          reject(err);
+                        });
+                    }
+                  }, 10);
+                });
+              });
+            } else {
+              return loadImage(src);
+            }
+          };
+        } else {
+          return function(src) {
+            return Promise.resolve(src);
+          };
+        }
+      }
+    }
+  };
+
+  /**
+   * 对象属性深度替换
+   * @param {Object} o 原始对象/默认对象/被替换的对象
+   * @param {Object} r 从这个对象里取值替换到o对象里
+   * @return {Object} 替换后的新对象
+   */
+  function deepReplace(o = {}, r = {}, c = false) {
+    let obj;
+    if (c) {
+      // 从源替换
+      obj = o;
+    } else {
+      // 不替换源，copy一份备份来替换
+      obj = {
+        ...o
+      };
+    }
+    for (let k in r) {
+      var vr = r[k];
+      if (vr != undefined) {
+        if (vr.constructor == Object) {
+          obj[k] = this.deepReplace(obj[k], vr);
+        } else if (vr.constructor == String && !vr) {
+          obj[k] = obj[k];
+        } else {
+          obj[k] = vr;
+        }
+      }
+    }
+    return obj;
+  }
+</script>
+
+<style scoped>
+  .uqrcode {
+    position: relative;
+  }
+
+  .uqrcode-hide {
+    position: fixed;
+    left: 7500rpx;
+  }
+
+  .uqrcode-canvas {
+    transform-origin: top left;
+  }
+
+  .uqrcode-makeing {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 10;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+  }
+
+  .uqrcode-makeing-image {
+    /* #ifndef APP-NVUE */
+    display: block;
+    max-width: 120px;
+    max-height: 120px;
+    /* #endif */
+  }
+
+  .uqrcode-error {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+  }
+
+  .uqrcode-error-message {
+    font-size: 12px;
+    color: #939291;
+  }
+
+  /* #ifdef H5 */
+  .uqrcode-h5-save {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 100;
+    background-color: rgba(0, 0, 0, 0.68);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .uqrcode-h5-save-image {
+    width: 512rpx;
+    height: 512rpx;
+    padding: 32rpx;
+  }
+
+  .uqrcode-h5-save-text {
+    margin-top: 20rpx;
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #ffffff;
+  }
+
+  .uqrcode-h5-save-close {
+    position: relative;
+    margin-top: 72rpx;
+    width: 60rpx;
+    height: 60rpx;
+    border: 2rpx solid #ffffff;
+    border-radius: 60rpx;
+    padding: 10rpx;
+  }
+
+  .uqrcode-h5-save-close-before {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%) rotate(45deg);
+    width: 40rpx;
+    height: 4rpx;
+    background: #ffffff;
+  }
+
+  .uqrcode-h5-save-close-after {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%) rotate(-45deg);
+    width: 40rpx;
+    height: 4rpx;
+    background: #ffffff;
+  }
+
+  /* #endif */
+</style>
diff --git a/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue b/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue
new file mode 100644
index 0000000..4fefaac
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue
@@ -0,0 +1,1131 @@
+<template>
+  <view class="uqrcode" :class="{ 'uqrcode-hide': hide }" :style="{ width: `${templateOptions.width}px`, height: `${templateOptions.height}px` }">
+    <view class="uqrcode-canvas-wrapper">
+      <!-- 画布 -->
+      <!-- #ifndef APP-NVUE -->
+      <canvas class="uqrcode-canvas" :id="canvasId" :canvas-id="canvasId" :type="canvasType" :style="{
+          width: `${templateOptions.canvasWidth}px`,
+          height: `${templateOptions.canvasHeight}px`,
+          transform: templateOptions.canvasTransform
+        }" v-if="templateOptions.canvasDisplay" @click="onClick"></canvas>
+      <!-- #endif -->
+
+      <!-- nvue用gcanvas -->
+      <!-- #ifdef APP-NVUE -->
+      <gcanvas class="uqrcode-canvas" ref="gcanvas" :style="{
+          width: `${templateOptions.canvasWidth}px`,
+          height: `${templateOptions.canvasHeight}px`
+        }" v-if="templateOptions.canvasDisplay" @click="onClick"></gcanvas>
+      <!-- #endif -->
+    </view>
+
+    <!-- 加载效果 -->
+    <view class="uqrcode-makeing" v-if="loading === undefined ? makeing : loading">
+      <slot name="loading">
+        <image class="uqrcode-makeing-image" :style="{ width: `${templateOptions.size / 4}px`, height: `${templateOptions.size / 4}px` }"
+          src="data:image/gif;base64,R0lGODlhAAEAAfIEAOHh4SSsWuDg4N3d3f///wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjAyODhGMzM4RDEwMTExRUM4MDhCRkVBQkE2QUZDQzkwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjAyODhGMzM5RDEwMTExRUM4MDhCRkVBQkE2QUZDQzkwIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDI4OEYzMzZEMTAxMTFFQzgwOEJGRUFCQTZBRkNDOTAiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDI4OEYzMzdEMTAxMTFFQzgwOEJGRUFCQTZBRkNDOTAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQFFAAEACwAAAAAAAEAAQAD/0i63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+cCzPdG3feK7vfO//wKBwSCwaj8ikcslsOp/QqHRKrVqv2Kx2y+16v+CweEwum8/otHrNbrvf8Lh8Tq/b7/i8fs/v+/+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanigCqq6ytrieusbISAbW2t7i5uru8vb66bLLCrLDDw7S/ycrLzLXBxsLF0LHIzdbXzc/Trybb1BHY4eK92t6r0uaq1ePs4+Xp6PDg7fTh7+bx+PP1/Mz33vkA7utH0Ne/bQERDizIMNfBaQkhLmxIMcBDaBExTqzI8P+isYwfN3Ik6PFYt3TnRI7kVzLaSZQA1q0s2HLWS5QyZ/ar+a0ETHUqdbLjyc3nz5xC6RFtBdIkhKQ01/yMeVPeU6g7pR6tqu8q1npLiXEV6PVru7ApjcJEquyEPa1rxyosm83EWzVTm7qk688uNrRA1eIMatDvNcBUBVt9cJdEYzR55Urku8ztX7iDFXdlfLnE4zORNZPlfNiwNcR6bVJua7ou3q2i55I+3brv67ixJ8927bhzmtAkgDv4HIJ4GeEikDMw/oH5GOUgoCtw3oF6GOkesFvfsP0L9g7afY/o7uU7h/ClPYsHDTt4++Hri8c//j55/eXzm+d/fj96/+n/+1UX4HX/ZVcgeRggyIV5G6BHmycMauAgb5xEmMGEtnViIQYYVvbJhhd0yBqEBYJ34ICUgGiBiMmAomIFLP7iYonnnZiehjQ2aOODOE7l449MERbVai1iBuSRO67EVpG3IenkYvDptKSMRj5pZUhENjRlYU1e6aVqu420JTlVfmlmYGFyNCYviJ2ZWZoVrblLm25uFuVMcgJTZp1X5gmWkGzuyeeTfioF6JyCDopkoWcdqmeXilrJ6FCOOpRopD9O6k6luNCJ6V5wUqSpRZd+mqSYnN7iqalFhaplqrasyqpYWXYEqzOlzmpnA0mNKquuiblqa61kQgrsqWreSqqx/8e+eaeSyqIi7bTUVmvttdhmq+223Hbr7bejCCDuuOSWa+656Kar7rrnSjDAu/DGK++89NZr77340vsru/z2224E+QYs8MAEw7uvvwj3627BDDfM8MEJR5zuwg5XbHG9EEusMbkUX+zxxRlvvHHHH5f8cK4ip+wvySa3HHDIKifMsss0Y4xyzDijO3PNPBt8c85Aj7tzzzzDHPS6QxNNs9FHTwyw0lAPwHTT/0IQNdRTU11u0ld/nLXWQj/dddE/g50y12Nb/LXZaKft8Npgt+32ycyafbTccxMMt9Z45y3w3lT37Xe+qEnGruDxzihxalU/ULHiETNuLuI+k7i44f9Ii013j5Fjri7l70Ius+dOW/32hxpLvrXmBYuOsOocs6436pfndrjsA7u+Muk64/437Z3bnrnpDeuuMO+NO/A48KML/7nvLzP/OvKTQ0+49Ls7X7rjp1sevHu1c1889sdr3zvxm1eYOvWro986+fzCHrb7s3vfPPjfK9895/ePMLL1+DKe3c6Hv/fZb4DPM5++4IfA9hWwfvxrIAH9tz/1STCBD8wdAy8oNfYlboMXlF/oQChBEXbwgByMnQLnJcAUmrCFHDTh4FhYNrZ5cIY2q5sLb4hDGuowhjzs4Qd/GMIgCnGERCyhEY8IOAxS8IgVZE8Kk2cfKI4viQ2UIRPAaxi3JQqxiXcDoBXtVbgVOlB/YzTgb9ZnRhWKL40axCIVQ/A/+sExgFwU1wvFeMchrjF8T8xfA/oYxz8Kko5sfCMh71XGDJZPkYvMoSH7V8VDLiCS15Nj9do4P0hiUl6NDCQlGfBJRoLrlKhMpSpXycpWuvKVsIylLGdJy1ra8pa4zKUud8nLXvryl8AMpjCHScxiGvOYyEymMpfJzGY685nQjKY0p0nNalrzmtjMpja3yc1uevOb4AynOMdJhwQAACH5BAUUAAQALDIAMgCcAJwAAAP/KLrcTjDKSWt0OFsIuv9gKI5kaZ6Ztq1s6iorKs90/apsTt1pbP/AIA+mK16Gj41wyWwan8ikpUmtRp/GaMNn7Xq3WJ2Wwf2arWHxmDg9u6np3JpdeduX8da8fO8j83xXSn6EQ4CDa4GFi2CHO3uIjJJkjo+JkZOTlZZjipmFmxNzAp6ffqESo6Wmd6hHl22sjK4ckLGyoLSqmLh9tAS7t72+urZ1QL+LycacNcuEz528M9HErsHHP9WtxbDZNtt24YbTMuNu5zerJulm7S7rJe9e8zjfzt2n+VrxJPVo+wQJo/GvSsFG9wgGFLeQ3EBqDdFFVFcOxUEnE1/0G3GR/0lHOs0UXss10ltIiCX1peRX8cRHIS83iniJLVRNUcgyfonZkp1Oej/tnTT3K87NSkdfgSuaJukhp8ByMsUCNQ/UIFPDVDXKDKe2rFC6IhWrFB/YIlubkq319awak5uuSnWrB+5Yu2VF0pUpBZXctnt7jhqMl63KhMMIU3z4hm9ixY4xMn6sGENkj4IpVyaVuctlzdImn/kMWiDixp1L/z08VPVm0lhTuw59WqLo2YNhz22NO7dsOL9789ANmLfwwlGhBT8Obzke58wtQ499O/qf6bu9WvddHWj37RqxF9cOHrky8ZvTs/wOkH2IwPDjy59Pv779+/jz69/Pv7////8ABijggAQWaOCBCCao4FQDNOjggxBGKOGEFFZooYQrBKDhhhx26OGHIIYo4ogfXmjiiSim6GCGJLbo4oswaqjijDTSyGKMOOYYY4089ljhjToGKWSJPhZpJJBDJimkkUz2iKSSUO7Y5JQqPhnllSRSqeWJVmLpJZFbhjlhl1+WKaOYaEJIpplfpulmg2uyieWbbsYpZ5R0pmnnnUrmieaefA7pp5iABhrkoGEWamiOiG6p6KJSNjrlo5C+KCmVlFba4qWTbqCpl5w2memnIvLIkwVB6mdqUBh6qqOqNZ5aQar5rbpSiqMGAKuNrEaY664zykoBrfjZ6lesruYIbJX/vaqZLI7L4trsg7/WiuytKFZb7LXH8orqq9Z6222wz8YYbbbTrlgujOdymS6c677YronCTkDsfcbaxO2w4G4rrr7/2tsvvvvGVbAE99qXr8EBIzywwgc7srDDyoZLLrbufluxv6EOUFTC9XWsLi0g0ycyvCQ/HPLJH6tsMsu/lDzfyR7H7PLMMKe8McEit7wzxD3b/PPKQesMrcWh+kxqnzm7sjSeTaPyNJQ0Kz31oVGHcnWSVQu9tY5dG/01jmE7PTbYWW9yNtpFm712pDQ3HMHbZEf8lN0E0A03sxjTG6/eIU4sMd6AW4q3VYQXvunhXMkNgeKLOw6I4I9DPiLlGZMnbnngjKsl+ealdq6V5qB7iDnin5f+YQIAIfkEBRQABAAsMgAyAJwAnAAAA/84utxOMMpJa3Q4Wyi6/2AojmRpnpm2rWzqKisqz3T9qmxO3Wls/8AgD6YrXoaPjXDJbBqfyKSlSa1Gn8Zow2fterdYnZbB/ZqtYfGYOD27qencml1525fx1rx87yPzfFdKfoRDgINrgYWLYIc7e4iMkmSOj4mRk5OVlmOKmYWbE3MDnp9+oRKjpaZ3qEeXbayMrhyQsbKgtKqYuH20BLu3vb66tnVAv4vJxpw1y4TPnbwz0cSuwcc/1a3FsNk223bhhtMy427nN6sm6WbtLusl717zON/O3af5WvEk9Wj7BAmj8a9KwUb3CAYUt5DcQGoN0UVUVw7FQScTX/QbcZH/SUc6zRReyzXSW0iIJfWl5FfxxEchLzeKeIktVE1RyDJ+idmSnU56P+2dNPcrzs1KR1+BK5om6SGnwHIyxQI1D9QgU8NUNcoMp7asULoiFasUH9giW5uSrfX1rBqTm65KdasH7li7ZUXSlSkFldy2e3uOGoyXrcqEwwhTfPiGb2LFjjEyfqwYQ2SPgilXJpW5y2XN0iaf+QxaIOLGnUv/PTxU9WbSWFO7Dn1aoujZg2HPbY07t2w4v3vz0A2Yt/DCUaEFPw5vOR7nzC1Dj307+p/pu71a910daPftGrEX1w4euTLxm9Oz/A6QfYjA8OPLn0+/vv37+PPr38+/v////wAGKOCABBZo4IEIJqjgVAE06OCDEEYo4YQUVmihhMQBoOGGHHbo4YcghsjhhSSWaOKJDmYo4oostqghijDGGKOKLtZo44sy5qgjhTTe6OOKOwYpZAA9/mikh0MmKWORRzYJgJJQnsikk0ZGaeWFU1Lp45VcTpilljZ2KeaDX4Lp4pholmkmi2iOqeaaIrYp5ptwgihnl3TWieSdV+ap54h8WunnnzgGCuWghBoaJaJ/KnooeoTW6KiSjOo5aZKV1pnjL5tCp1+nroBaG4ufLkmLqMaJWOqMp5rqXoerwsipq6OuGCuKs7L6Koe3StmqrrWqmh+qmxCbipG9mpirrP+eDktrKMbmVWOyJS6La7P4RXuItsn5SC2J1vq664bfYvkrs+NqWK6F4SqL7X3c5sHtketW2G6179oXbxzzIusssNA+S56N9fJ47rXpAlCwlweLG2yIC7fJU7aXkhnUhxGnebGHGbu5Maz/Vkzkx7yGXPHE8IrcIMr6qjzySgSbfCnL9bn8sl/+UqwyTZHeaDPPPUvqMtBBt/gzyUVvOTTSSYe5NMxNr3k01FGDOTXOVWv6NNZZS721TV3DaXO/YZu5bxpkl63l2WGkrbaTbGPh9ttHxv3E3HT/aLcReOfts8CV9O230AAXC7i0gxOOLiqCJ87m4dtC3q3jThceuOQElP+YAAAh+QQFFAAEACwyADIAnACcAAAD/xi63E4wyklrdDhbOLr/YCiOZGmKWcpsbEuoMHvOdG17sOruVJ7Kt6Aw6NPwjq/iYzNsOkvKJXIXbQCfWGx1NaVuFdesWPgFd13lQHjMpqXP6PK6TSe94ay7pc6HyvEbehV9hCGCgBOHE4WMHYqIEI8RjYySiJYElIWYeJiahJxwnp98oWejpHSmXaipbKtTra5isEiys1p/kIm6g7hjtUe3v03BPMM0uxTFvcpJX3M1zhLM0NORzYtD1xxDxl7We9vc1Vvcz+ZM49flVefIM+ftUe/Z1OvT80r14b5C8t7sQYJ3AiAZgZcQZsLnTF8RfunE/SMXsJ8zgiYMElHYSf9hE403vsWxqG0iu4oRp2EsAdKGyBYrSbSs8TKPR4bKHPqA6E6dyXwoe16LOWKmG46ibv5sGJQeN6IijM6oGUhpkHMdSe6CGgJrUq0Drd7wegppWbDdlpIFl/KiWBtrY5ll9VZaXGFz5aJdqPZu1b1Z25a86petUJV1kxUeKXhr4niLYaaZTFmKP03RjlbePDkzIc8nOIt+3Ae0idGonUrE7HNj6tc6WlMy7Qe2bcvLSNG2c7v3gt1tgKPw7Vv4GOMgiBeX3Qj5B+W9nWOR7gi6bepOsFu/zpyR9u2vsX/srhn8aPE47x00f578Z/eh2bdfPRv+afmi0fed1BQ/VzH/3/lXmX6E0eeSgAPaV0eACP6XBXaRRSjhhBRWaOGFGGao4YYcdujhhyCGKOKIJJZo4okopqjiimQB4OKLMMYo44w01mjjjTMSKMCOPPbo449ABinkkDgWaeSROOpI5JJMNonkk1BGqaSTVFYZ5ZVY3jillVx2meWXSG7p5Zhkgmmmi2KWqeaZbBqZ5ppwtilnjG/GaeecbNZ55554Yqknn4D2eeSfgRYqaI2EGqrooS8muiijkDr6KKSCSjoppXNaeimmeSq46aec2qgpqKH66SmpqJYKwKipqjroqa3yKVWSsP64oaknSVmrj7deOauWu/bYq665QgmhhrgCRexl/1UOayxFy+bGpbNP/ipqsDxSGya0zxropLavFlsttjuC6ya343rbpLlFWosouQKwS6u426rLpLzA0hsus1Tie62+59q7pL/vAtwuvATT6K7CCCPrK7r18vutw9Hm9LDARCacI8T7SmulxjIuvDHGQ4JMJ8cBS7wuxa6GjPK9LLcMo8i2xiwzmi8PbPPNNPO6s8w9C/tzy0FnO7SrRZd7tKpJx7t0qU2bzGjUT4fadKxYn2xw1lwfvHXXYDP8ddhkN5pz2WhfjTbQZ68dttpuM9123De7PDbddZvJatZUk4x3xbsk6/Hfa/atMuGCWww4f4gXPrfYhzferbKTDy554hmBXxz55R0rXvlgnGvO1OJphS665+luTncCADs=">
+        </image>
+      </slot>
+    </view>
+
+    <!-- 错误处理 -->
+    <view class="uqrcode-error" v-if="isError" @click="onClick">
+      <slot name="error" :error="error">
+        <text class="uqrcode-error-message">{{ error.errMsg }}</text>
+      </slot>
+    </view>
+
+    <!-- H5保存提示 -->
+    <!-- #ifdef H5 -->
+    <view class="uqrcode-h5-save" v-if="isH5Save">
+      <slot name="h5save" :tempFilePath="tempFilePath">
+        <image class="uqrcode-h5-save-image" :src="tempFilePath"></image>
+        <text class="uqrcode-h5-save-text">{{ h5SaveIsDownload ? '若保存失败，' : '' }}请长按二维码进行保存</text>
+      </slot>
+      <view class="uqrcode-h5-save-close" @click.stop="isH5Save = false">
+        <view class="uqrcode-h5-save-close-before"></view>
+        <view class="uqrcode-h5-save-close-after"></view>
+      </view>
+    </view>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+  // #ifdef VUE3
+  import {
+    toRaw
+  } from 'vue';
+  // #endif
+
+  /* 引入uQRCode核心js */
+  import UQRCode from '../../js_sdk/uqrcode/uqrcode';
+
+  /* 引入nvue所需模块 */
+  // #ifdef APP-NVUE
+  import {
+    enable,
+    WeexBridge
+  } from '../../js_sdk/gcanvas';
+  const modal = weex.requireModule('modal');
+  // #endif
+
+  /* 引入队列 */
+  import {
+    queueDraw,
+    queueLoadImage
+  } from '../../common/queue';
+  /* 引入缓存图片 */
+  import {
+    cacheImageList
+  } from '../../common/cache';
+
+  let instance = null;
+
+  export default {
+    name: 'uqrcode',
+    props: {
+      /**
+       * canvas组件id
+       */
+      canvasId: {
+        type: String,
+        required: true // canvasId在微信小程序初始值不能为空，created中赋值也不行，必须给一个值，否则挂载组件后无法绘制。不考虑用随机id，uuid
+      },
+      /**
+       * 二维码内容
+       */
+      value: {
+        type: [String, Number]
+      },
+      /**
+       * 选项
+       */
+      options: {
+        type: Object,
+        default: () => {
+          return {};
+        }
+      },
+      /**
+       * 二维码大小
+       */
+      size: {
+        type: [String, Number],
+        default: 200
+      },
+      /**
+       * 二维码尺寸单位
+       */
+      sizeUnit: {
+        type: String,
+        default: 'px'
+      },
+      /**
+       * 导出的文件类型
+       */
+      fileType: {
+        type: String,
+        default: 'png'
+      },
+      /**
+       * 是否初始化组件后就开始生成
+       */
+      start: {
+        type: Boolean,
+        default: true
+      },
+      /**
+       * 是否数据发生改变自动重绘
+       */
+      auto: {
+        type: Boolean,
+        default: true
+      },
+      /**
+       * 隐藏组件
+       */
+      hide: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * canvas 类型，微信小程序默认使用2d，非2d微信官方已放弃维护，问题比较多
+       * 注意：微信小程序type2d手机上正常，PC上微信内打开小程序toDataURL报错，看后期微信官方团队会不会做兼容，不兼容的话只能在自行判断在PC使用非2d，或者直接提示用户请在手机上操作，微信团队的海报中心小程序就是这么做的
+       */
+      type: {
+        type: String,
+        default: () => {
+          // #ifdef MP-WEIXIN
+          return '2d';
+          // #endif
+          // #ifndef MP-WEIXIN
+          return 'normal';
+          // #endif
+        }
+      },
+      /**
+       * 队列绘制，主要针对NVue端
+       */
+      queue: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * 是否队列加载图片，可减少canvas发起的网络资源请求，节省服务器资源
+       */
+      isQueueLoadImage: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * loading态
+       */
+      loading: {
+        type: Boolean,
+        default: undefined
+      },
+      /**
+       * H5保存即自动下载（在支持的环境下），默认false为仅弹层提示用户需要长按图片保存，不会自动下载
+       */
+      h5SaveIsDownload: {
+        type: Boolean,
+        default: false
+      },
+      /**
+       * H5下载名称
+       */
+      h5DownloadName: {
+        type: String,
+        default: 'uQRCode'
+      }
+    },
+    data() {
+      return {
+        canvas: undefined,
+        canvasType: undefined,
+        canvasContext: undefined,
+        makeDelegate: undefined,
+        drawDelegate: undefined,
+        toTempFilePathDelegate: undefined,
+        makeExecuted: false,
+        makeing: false,
+        drawing: false,
+        isError: false,
+        error: undefined,
+        isH5Save: false,
+        tempFilePath: '',
+        templateOptions: {
+          size: 0,
+          width: 0, // 组件宽度
+          height: 0,
+          canvasWidth: 0, // canvas宽度
+          canvasHeight: 0,
+          canvasTransform: '',
+          canvasDisplay: false
+        },
+        uqrcodeOptions: {
+          data: ''
+        },
+        plugins: [],
+        makeingPattern: [
+          [
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true]
+          ],
+          [
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, true, true, true, false, true, true, true],
+            [true, true, true, true, true, true, false, true, true, true],
+            [true, true, true, true, true, true, false, true, true, true]
+          ],
+          [
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, true, true, true, true, false, false, false],
+            [true, true, true, true, true, true, true, false, false, false],
+            [true, true, true, true, true, true, true, false, false, false],
+            [true, true, true, false, false, false, false, true, true, true],
+            [true, true, true, false, false, false, false, true, true, true]
+          ],
+          [
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, false, false, false, false, false, false, false],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true],
+            [true, true, true, true, true, true, true, true, true, true]
+          ]
+        ]
+      };
+    },
+    watch: {
+      type: {
+        handler(val) {
+          const types = ['2d'];
+          if (types.includes(val)) {
+            this.canvasType = val;
+          } else {
+            this.canvasType = undefined;
+          }
+        },
+        immediate: true
+      },
+      value: {
+        handler() {
+          if (this.auto) {
+            this.remake();
+          }
+        }
+      },
+      size: {
+        handler() {
+          if (this.auto) {
+            this.remake();
+          }
+        }
+      },
+      options: {
+        handler() {
+          if (this.auto) {
+            this.remake();
+          }
+        },
+        deep: true
+      },
+      makeing: {
+        handler(val) {
+          if (!val) {
+            if (typeof this.toTempFilePathDelegate === 'function') {
+              this.toTempFilePathDelegate();
+            }
+          }
+        }
+      }
+    },
+    mounted() {
+      this.templateOptions.size = this.sizeUnit == 'rpx' ? uni.upx2px(this.size) : this.size;
+      this.templateOptions.width = this.templateOptions.size;
+      this.templateOptions.height = this.templateOptions.size;
+      this.templateOptions.canvasWidth = this.templateOptions.size;
+      this.templateOptions.canvasHeight = this.templateOptions.size;
+      if (this.canvasType == '2d') {
+        // #ifndef MP-WEIXIN
+        this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+        this.templateOptions.canvasHeight})`;
+        // #endif
+      } else {
+        this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+        this.templateOptions.canvasHeight})`;
+      }
+      if (this.start) {
+        this.make();
+      }
+    },
+    methods: {
+      /**
+       * 获取模板选项
+       */
+      getTemplateOptions() {
+        var size = this.sizeUnit == 'rpx' ? uni.upx2px(this.size) : this.size;
+        return deepReplace(this.templateOptions, {
+          size,
+          width: size,
+          height: size
+        });
+      },
+      /**
+       * 获取插件选项
+       */
+      getUqrcodeOptions() {
+        return deepReplace(this.options, {
+          data: String(this.value),
+          size: Number(this.templateOptions.size)
+        });
+      },
+      /**
+       * 重置画布
+       */
+      resetCanvas(callback) {
+        this.templateOptions.canvasDisplay = false;
+        this.$nextTick(() => {
+          this.templateOptions.canvasDisplay = true;
+          this.$nextTick(() => {
+            callback && callback();
+          });
+        });
+      },
+      /**
+       * 绘制二维码
+       */
+      async draw(callback = {}, isDrawDelegate = false) {
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        if (this.drawing) {
+          if (!isDrawDelegate) {
+            this.drawDelegate = () => {
+              this.draw(callback, true);
+            };
+            return;
+          }
+        } else {
+          this.drawing = true;
+        }
+
+        if (!this.canvasId) {
+          console.error('[uQRCode]: canvasId must be set!');
+          this.isError = true;
+          this.drawing = false;
+          callback.fail({
+            errMsg: '[uQRCode]: canvasId must be set!'
+          });
+          callback.complete({
+            errMsg: '[uQRCode]: canvasId must be set!'
+          });
+          return;
+        }
+        if (!this.value) {
+          console.error('[uQRCode]: value must be set!');
+          this.isError = true;
+          this.drawing = false;
+          callback.fail({
+            errMsg: '[uQRCode]: value must be set!'
+          });
+          callback.complete({
+            errMsg: '[uQRCode]: value must be set!'
+          });
+          return;
+        }
+
+        /* 组件数据 */
+        this.templateOptions = this.getTemplateOptions();
+        /* uQRCode选项 */
+        this.uqrcodeOptions = this.getUqrcodeOptions();
+        /* 纠错等级兼容字母写法 */
+        if (typeof this.uqrcodeOptions.errorCorrectLevel === 'string') {
+          this.uqrcodeOptions.errorCorrectLevel = UQRCode.errorCorrectLevel[this.uqrcodeOptions.errorCorrectLevel];
+        }
+        /* nvue不支持动态修改gcanvas尺寸，除nvue外，默认使用useDynamicSize */
+        // #ifndef APP-NVUE
+        if (typeof this.options.useDynamicSize === 'undefined') {
+          this.uqrcodeOptions.useDynamicSize = true;
+        }
+        // #endif
+        // #ifdef APP-NVUE
+        if (typeof this.options.useDynamicSize === 'undefined') {
+          this.uqrcodeOptions.useDynamicSize = false;
+        }
+        // if (typeof this.options.drawReserve === 'undefined') {
+        //   this.uqrcodeOptions.drawReserve = true;
+        // }
+        // #endif
+
+        /* 获取uQRCode实例 */
+        const qr = instance = new UQRCode();
+        /* 注册扩展 */
+        this.plugins.forEach(p => qr.register(p.plugin));
+        /* 设置uQRCode选项 */
+        qr.setOptions(this.uqrcodeOptions);
+        /* 调用制作二维码方法 */
+        qr.make();
+
+        /* 获取canvas上下文 */
+        let canvasContext = null;
+        // #ifndef APP-NVUE
+        if (this.canvasType === '2d') {
+          // #ifdef MP-WEIXIN
+          /* 微信小程序获取canvas2d上下文方式 */
+          const canvas = (this.canvas = await new Promise(resolve => {
+            uni
+              .createSelectorQuery()
+              .in(this) // 在组件内使用需要
+              .select(`#${this.canvasId}`)
+              .fields({
+                node: true,
+                size: true
+              })
+              .exec(res => {
+                resolve(res[0].node);
+              });
+          }));
+          canvasContext = this.canvasContext = canvas.getContext('2d');
+          /* 2d的组件设置宽高与实际canvas绘制宽高不是一个，打个比方，组件size=200，canvas.width设置为100，那么绘制出来就是100=200，组件size=400，canvas.width设置为800，绘制大小还是800=400，所以无需理会下方返回的dynamicSize是多少，按dpr重新赋值给canvas即可 */
+          this.templateOptions.canvasWidth = qr.size;
+          this.templateOptions.canvasHeight = qr.size;
+          this.templateOptions.canvasTransform = '';
+          /* 使用dynamicSize+scale，可以解决小块间出现白线问题，dpr可以解决模糊问题 */
+          const dpr = uni.getSystemInfoSync().pixelRatio;
+          canvas.width = qr.dynamicSize * dpr;
+          canvas.height = qr.dynamicSize * dpr;
+          canvasContext.scale(dpr, dpr);
+          /* 微信小程序获取图像方式 */
+          qr.loadImage = this.getLoadImage(function(src) {
+            /* 小程序下获取网络图片信息需先配置download域名白名单才能生效 */
+            return new Promise((resolve, reject) => {
+              const img = canvas.createImage();
+              img.src = src;
+              img.onload = () => {
+                resolve(img);
+              };
+              img.onerror = err => {
+                reject(err);
+              };
+            });
+          });
+          // #endif
+          // #ifndef MP-WEIXIN
+          /* 非微信小程序不支持2d，切换回uniapp获取canvas上下文方式 */
+          canvasContext = this.canvasContext = uni.createCanvasContext(this.canvasId, this);
+          /* 使用dynamicSize，可以解决小块间出现白线问题，再通过scale缩放至size，使其达到所设尺寸 */
+          this.templateOptions.canvasWidth = qr.dynamicSize;
+          this.templateOptions.canvasHeight = qr.dynamicSize;
+          this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+          this.templateOptions.canvasHeight})`;
+          /* uniapp获取图像方式 */
+          qr.loadImage = this.getLoadImage(function(src) {
+            return new Promise((resolve, reject) => {
+              if (src.startsWith('http')) {
+                uni.getImageInfo({
+                  src,
+                  success: res => {
+                    resolve(res.path);
+                  },
+                  fail: err => {
+                    reject(err);
+                  }
+                });
+              } else {
+                if (src.startsWith('.')) {
+                  console.error('[uQRCode]: 本地图片路径仅支持绝对路径！');
+                  throw new Error('[uQRCode]: local image path only supports absolute path!');
+                } else {
+                  resolve(src);
+                }
+              }
+            });
+          });
+          // #endif
+        } else {
+          /* uniapp获取canvas上下文方式 */
+          canvasContext = this.canvasContext = uni.createCanvasContext(this.canvasId, this);
+          /* 使用dynamicSize，可以解决小块间出现白线问题，再通过scale缩放至size，使其达到所设尺寸 */
+          this.templateOptions.canvasWidth = qr.dynamicSize;
+          this.templateOptions.canvasHeight = qr.dynamicSize;
+          this.templateOptions.canvasTransform = `scale(${this.templateOptions.size / this.templateOptions.canvasWidth}, ${this.templateOptions.size /
+          this.templateOptions.canvasHeight})`;
+          /* uniapp获取图像方式 */
+          qr.loadImage = this.getLoadImage(function(src) {
+            return new Promise((resolve, reject) => {
+              /* getImageInfo在微信小程序的bug：本地路径返回路径会把开头的/或../移除，导致路径错误，解决方法：限制只能使用绝对路径 */
+              if (src.startsWith('http')) {
+                uni.getImageInfo({
+                  src,
+                  success: res => {
+                    resolve(res.path);
+                  },
+                  fail: err => {
+                    reject(err);
+                  }
+                });
+              } else {
+                if (src.startsWith('.')) {
+                  console.error('[uQRCode]: 本地图片路径仅支持绝对路径！');
+                  throw new Error('[uQRCode]: local image path only supports absolute path!');
+                } else {
+                  resolve(src);
+                }
+              }
+            });
+          });
+        }
+        // #endif
+        // #ifdef APP-NVUE
+        /* NVue获取canvas上下文方式 */
+        const gcanvas = this.$refs['gcanvas'];
+        const canvas = enable(gcanvas, {
+          bridge: WeexBridge
+        });
+        canvasContext = this.canvasContext = canvas.getContext('2d');
+        /* NVue获取图像方式 */
+        qr.loadImage = this.getLoadImage(function(src) {
+          return new Promise((resolve, reject) => {
+            /* getImageInfo在nvue的bug：获取同一个路径的图片信息，同一时间第一次获取成功，后续失败，猜测是写入本地时产生文件写入冲突，所以没有返回，特别是对于网络资源 --- 已实现队列绘制，已解决此问题 */
+            if (src.startsWith('.')) {
+              console.error('[uQRCode]: 本地图片路径仅支持绝对路径！');
+              throw new Error('[uQRCode]: local image path only supports absolute path!');
+            } else {
+              uni.getImageInfo({
+                src,
+                success: res => {
+                  resolve(res.path);
+                },
+                fail: err => {
+                  reject(err);
+                }
+              });
+            }
+          });
+        });
+        // #endif
+
+        /* 设置uQRCode实例的canvas上下文 */
+        qr.canvasContext = canvasContext;
+        /* 延时等待页面重新绘制完毕 */
+        setTimeout(() => {
+          /* 从插件获取具体要调用哪一个扩展函数 */
+          var plugin = this.plugins.find(p => p.name == qr.style);
+          var drawCanvasName = plugin ? plugin.drawCanvas : 'drawCanvas';
+          /* 虽然qr[drawCanvasName]是直接返回Promise的，但由于js内部this指向问题，故不能直接exec(qr[drawCanvasName])此方式执行，需要改成exec(() => qr[drawCanvasName]())才能正确获取this */
+          var drawCanvas;
+          if (this.queue) {
+            drawCanvas = () => queueDraw.exec(() => qr[drawCanvasName]());
+            // drawCanvas = () => queueDraw.exec(() => new Promise((resolve, reject) => {
+            //   setTimeout(() => {
+            //     qr[drawCanvasName]().then(resolve).catch(reject);
+            //   }, 1000);
+            // }));
+          } else {
+            drawCanvas = () => qr[drawCanvasName]();
+          }
+          /* 调用绘制方法将二维码图案绘制到canvas上 */
+          drawCanvas()
+            .then(() => {
+              if (this.drawDelegate) {
+                /* 高频重绘纠正 */
+                let delegate = this.drawDelegate;
+                this.drawDelegate = undefined;
+                delegate();
+              } else {
+                this.drawing = false;
+                callback.success();
+              }
+            })
+            .catch(err => {
+              console.log(err);
+              if (this.drawDelegate) {
+                /* 高频重绘纠正 */
+                let delegate = this.drawDelegate;
+                this.drawDelegate = undefined;
+                delegate();
+              } else {
+                this.drawing = false;
+                this.isError = true;
+                callback.fail(err);
+              }
+            })
+            .finally(() => {
+              callback.complete();
+            });
+        }, 300);
+      },
+      /**
+       * 生成二维码
+       */
+      make(callback = {}) {
+        this.makeExecuted = true;
+        this.makeing = true;
+        this.isError = false;
+
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        this.resetCanvas(() => {
+          clearTimeout(this.makeDelegate);
+          this.makeDelegate = setTimeout(() => {
+            this.draw({
+              success: () => {
+                setTimeout(() => {
+                  callback.success();
+                  this.complete(true);
+                }, 300);
+              },
+              fail: err => {
+                callback.fail(err);
+                this.error = err;
+                this.complete(false, err.errMsg);
+              },
+              complete: () => {
+                callback.complete();
+                this.makeing = false;
+              }
+            });
+          }, 300);
+        });
+      },
+      /**
+       * 重新生成
+       */
+      remake(callback) {
+        this.$emit('change');
+        this.make(callback);
+      },
+      /**
+       * 生成完成
+       */
+      complete(success = true, errMsg = '') {
+        if (success) {
+          this.$emit('complete', {
+            success
+          });
+        } else {
+          this.$emit('complete', {
+            success,
+            errMsg
+          });
+        }
+      },
+      /**
+       * 导出临时路径
+       */
+      toTempFilePath(callback = {}) {
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        if (!this.makeExecuted) {
+          console.error('[uQRCode]: make() 方法从未调用！请先成功调用 make() 后再进行操作。');
+          var err = {
+            errMsg: '[uQRCode]: make() method has never been executed! please execute make() successfully before operating.'
+          };
+          callback.fail(err);
+          callback.complete(err);
+          return;
+        }
+
+        if (this.isError) {
+          callback.fail(this.error);
+          callback.complete(this.error);
+          return;
+        }
+
+        if (this.makeing) {
+          /* 如果还在生成状态，那当前操作将托管到委托，监听生成完成后再通过委托复调当前方法 */
+          this.toTempFilePathDelegate = () => {
+            this.toTempFilePath(callback);
+          };
+          return;
+        } else {
+          this.toTempFilePathDelegate = null;
+        }
+
+        // #ifndef APP-NVUE
+        if (this.canvasType === '2d') {
+          // #ifdef MP-WEIXIN
+          try {
+            let dataURL = null;
+            // #ifdef VUE3
+            dataURL = toRaw(this.canvas)
+              .toDataURL();
+            // #endif
+            // #ifndef VUE3
+            dataURL = this.canvas.toDataURL();
+            // #endif
+            callback.success({
+              tempFilePath: dataURL
+            });
+            callback.complete({
+              tempFilePath: dataURL
+            });
+          } catch (e) {
+            callback.fail(e);
+            callback.complete(e);
+          }
+          // #endif
+        } else {
+          uni.canvasToTempFilePath({
+              canvasId: this.canvasId,
+              fileType: this.fileType,
+              width: Number(this.templateOptions.canvasWidth),
+              height: Number(this.templateOptions.canvasHeight),
+              destWidth: Number(this.templateOptions.size),
+              destHeight: Number(this.templateOptions.size),
+              success: res => {
+                callback.success(res);
+              },
+              fail: err => {
+                callback.fail(err);
+              },
+              complete: () => {
+                callback.complete();
+              }
+            },
+            this
+          );
+        }
+        // #endif
+        // #ifdef APP-NVUE
+        const dpr = uni.getSystemInfoSync().pixelRatio;
+        this.canvasContext.toTempFilePath(
+          0,
+          0,
+          this.templateOptions.canvasWidth * dpr,
+          this.templateOptions.canvasHeight * dpr,
+          this.templateOptions.size * dpr,
+          this.templateOptions.size * dpr,
+          '',
+          1,
+          res => {
+            callback.success(res);
+            callback.complete(res);
+          }
+        );
+        // #endif
+      },
+      /**
+       * 保存
+       */
+      save(callback = {}) {
+        if (typeof callback.success != 'function') {
+          callback.success = () => {};
+        }
+        if (typeof callback.fail != 'function') {
+          callback.fail = () => {};
+        }
+        if (typeof callback.complete != 'function') {
+          callback.complete = () => {};
+        }
+
+        this.toTempFilePath({
+          success: res => {
+            // #ifndef H5
+            if (this.canvasType === '2d') {
+              // #ifdef MP-WEIXIN
+              /* 需要将 data:image/png;base64, 这段去除 writeFile 才能正常打开文件，否则是损坏文件，无法打开 */
+              const reg = new RegExp('^data:image/png;base64,', 'g');
+              const dataURL = res.tempFilePath.replace(reg, '');
+              const fs = wx.getFileSystemManager();
+              const tempFilePath = `${wx.env.USER_DATA_PATH}/${new Date().getTime()}${
+                Math.random()
+                  .toString()
+                  .split('.')[1]
+              }.png`;
+              fs.writeFile({
+                filePath: tempFilePath, // 要写入的文件路径 (本地路径)
+                data: dataURL, // base64图片
+                encoding: 'base64',
+                success: res1 => {
+                  uni.saveImageToPhotosAlbum({
+                    filePath: tempFilePath,
+                    success: res2 => {
+                      callback.success(res2);
+                    },
+                    fail: err2 => {
+                      callback.fail(err2);
+                    },
+                    complete: () => {
+                      callback.complete();
+                    }
+                  });
+                },
+                fail: err => {
+                  callback.fail(err);
+                },
+                complete: () => {
+                  callback.complete();
+                }
+              });
+              // #endif
+            } else {
+              uni.saveImageToPhotosAlbum({
+                filePath: res.tempFilePath,
+                success: res1 => {
+                  callback.success(res1);
+                },
+                fail: err1 => {
+                  callback.fail(err1);
+                },
+                complete: () => {
+                  callback.complete();
+                }
+              });
+            }
+            // #endif
+
+            // #ifdef H5
+            /* 可以在电脑浏览器下载，移动端iOS不行，安卓微信浏览器不行，安卓外部浏览器可以 */
+            this.isH5Save = true;
+            this.tempFilePath = res.tempFilePath;
+            if (this.h5SaveIsDownload) {
+              const aEle = document.createElement('a');
+              aEle.download = this.h5DownloadName; // 设置下载的文件名，默认是'下载'
+              aEle.href = res.tempFilePath;
+              document.body.appendChild(aEle);
+              aEle.click();
+              aEle.remove(); // 下载之后把创建的元素删除
+            }
+            callback.success({
+              errMsg: 'ok'
+            });
+            callback.complete({
+              errMsg: 'ok'
+            });
+            // #endif
+          },
+          fail: err => {
+            callback.fail(err);
+            callback.complete(err);
+          }
+        });
+      },
+      /**
+       * 注册click事件
+       */
+      onClick(e) {
+        this.$emit('click', e);
+      },
+      /**
+       * 获取实例
+       */
+      getInstance() {
+        return instance;
+      },
+      /**
+       * 注册扩展，组件仅支持注册type为style的drawCanvas扩展
+       * @param {Object} plugin
+       */
+      registerStyle(plugin) {
+        if (plugin.Type != 'style') {
+          console.warn('[uQRCode]: registerStyle 仅支持注册 style 类型的扩展！');
+          return {
+            errMsg: 'registerStyle 仅支持注册 style 类型的扩展！'
+          };
+        }
+        if (typeof plugin === 'function') {
+          this.plugins.push({
+            plugin,
+            name: plugin.Name,
+            drawCanvas: plugin.DrawCanvas
+          });
+        }
+      },
+      getLoadImage(loadImage) {
+        var that = this;
+        if (typeof loadImage == 'function') {
+          return function(src) {
+            /* 判断是否是队列加载图片的 */
+            if (that.isQueueLoadImage) {
+              /* 解决iOS APP||NVUE同时绘制多个二维码导致图片丢失需使用队列 */
+              return queueLoadImage.exec(() => {
+                return new Promise((resolve, reject) => {
+                  setTimeout(() => {
+                    const cache = cacheImageList.find(x => x.src == src);
+                    if (cache) {
+                      resolve(cache.img);
+                    } else {
+                      loadImage(src)
+                        .then(img => {
+                          cacheImageList.push({
+                            src,
+                            img
+                          });
+                          resolve(img);
+                        })
+                        .catch(err => {
+                          reject(err);
+                        });
+                    }
+                  }, 10);
+                });
+              });
+            } else {
+              return loadImage(src);
+            }
+          };
+        } else {
+          return function(src) {
+            return Promise.resolve(src);
+          };
+        }
+      }
+    }
+  };
+
+  /**
+   * 对象属性深度替换
+   * @param {Object} o 原始对象/默认对象/被替换的对象
+   * @param {Object} r 从这个对象里取值替换到o对象里
+   * @return {Object} 替换后的新对象
+   */
+  function deepReplace(o = {}, r = {}, c = false) {
+    let obj;
+    if (c) {
+      // 从源替换
+      obj = o;
+    } else {
+      // 不替换源，copy一份备份来替换
+      obj = {
+        ...o
+      };
+    }
+    for (let k in r) {
+      var vr = r[k];
+      if (vr != undefined) {
+        if (vr.constructor == Object) {
+          obj[k] = this.deepReplace(obj[k], vr);
+        } else if (vr.constructor == String && !vr) {
+          obj[k] = obj[k];
+        } else {
+          obj[k] = vr;
+        }
+      }
+    }
+    return obj;
+  }
+</script>
+
+<style scoped>
+  .uqrcode {
+    position: relative;
+  }
+
+  .uqrcode-hide {
+    position: fixed;
+    left: 7500rpx;
+  }
+
+  .uqrcode-canvas {
+    transform-origin: top left;
+  }
+
+  .uqrcode-makeing {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 10;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+  }
+
+  .uqrcode-makeing-image {
+    /* #ifndef APP-NVUE */
+    display: block;
+    max-width: 120px;
+    max-height: 120px;
+    /* #endif */
+  }
+
+  .uqrcode-error {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+  }
+
+  .uqrcode-error-message {
+    font-size: 12px;
+    color: #939291;
+  }
+
+  /* #ifdef H5 */
+  .uqrcode-h5-save {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 100;
+    background-color: rgba(0, 0, 0, 0.68);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .uqrcode-h5-save-image {
+    width: 512rpx;
+    height: 512rpx;
+    padding: 32rpx;
+  }
+
+  .uqrcode-h5-save-text {
+    margin-top: 20rpx;
+    font-size: 32rpx;
+    font-weight: 700;
+    color: #ffffff;
+  }
+
+  .uqrcode-h5-save-close {
+    position: relative;
+    margin-top: 72rpx;
+    width: 60rpx;
+    height: 60rpx;
+    border: 2rpx solid #ffffff;
+    border-radius: 60rpx;
+    padding: 10rpx;
+  }
+
+  .uqrcode-h5-save-close-before {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%) rotate(45deg);
+    width: 40rpx;
+    height: 4rpx;
+    background: #ffffff;
+  }
+
+  .uqrcode-h5-save-close-after {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%) rotate(-45deg);
+    width: 40rpx;
+    height: 4rpx;
+    background: #ffffff;
+  }
+
+  /* #endif */
+</style>
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/bridge/bridge-weex.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/bridge/bridge-weex.js
new file mode 100644
index 0000000..27086ec
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/bridge/bridge-weex.js
@@ -0,0 +1,241 @@
+const isWeex = typeof WXEnvironment !== 'undefined';
+const isWeexIOS = isWeex && /ios/i.test(WXEnvironment.platform);
+const isWeexAndroid = isWeex && !isWeexIOS;
+
+import GLmethod from '../context-webgl/GLmethod';
+
+const GCanvasModule =
+    (typeof weex !== 'undefined' && weex.requireModule) ? (weex.requireModule('gcanvas')) :
+        (typeof __weex_require__ !== 'undefined') ? (__weex_require__('@weex-module/gcanvas')) : {};
+
+let isDebugging = false;
+
+let isComboDisabled = false;
+
+const logCommand = (function () {
+    const methodQuery = [];
+    Object.keys(GLmethod).forEach(key => {
+        methodQuery[GLmethod[key]] = key;
+    })
+    const queryMethod = (id) => {
+        return methodQuery[parseInt(id)] || 'NotFoundMethod';
+    }
+    const logCommand = (id, cmds) => {
+        const mId = cmds.split(',')[0];
+        const mName = queryMethod(mId);
+        console.log(`=== callNative - componentId:${id}; method: ${mName}; cmds: ${cmds}`);
+    }
+    return logCommand;
+})();
+
+function joinArray(arr, sep) {
+    let res = '';
+    for (let i = 0; i < arr.length; i++) {
+        if (i !== 0) {
+            res += sep;
+        }
+        res += arr[i];
+    }
+    return res;
+}
+
+const commandsCache = {}
+
+const GBridge = {
+
+    callEnable: (ref, configArray) => {
+
+        commandsCache[ref] = [];
+
+        return GCanvasModule.enable({
+            componentId: ref,
+            config: configArray
+        });
+    },
+
+    callEnableDebug: () => {
+        isDebugging = true;
+    },
+
+    callEnableDisableCombo: () => {
+        isComboDisabled = true;
+    },
+
+    callSetContextType: function (componentId, context_type) {
+        GCanvasModule.setContextType(context_type, componentId);
+    },
+
+    callReset: function(id){
+        GCanvasModule.resetComponent && canvasModule.resetComponent(componentId);
+    },
+
+    render: isWeexIOS ? function (componentId) {
+        return GCanvasModule.extendCallNative({
+            contextId: componentId,
+            type: 0x60000001
+        });
+    } : function (componentId) {
+        return callGCanvasLinkNative(componentId, 0x60000001, 'render');
+    },
+
+    render2d: isWeexIOS ? function (componentId, commands, callback) {
+
+        if (isDebugging) {
+            console.log('>>> >>> render2d ===');
+            console.log('>>> commands: ' + commands);
+        }
+		
+        GCanvasModule.render([commands, callback?true:false], componentId, callback);
+
+    } : function (componentId, commands,callback) {
+
+        if (isDebugging) {
+            console.log('>>> >>> render2d ===');
+            console.log('>>> commands: ' + commands);
+        }
+
+        callGCanvasLinkNative(componentId, 0x20000001, commands);
+		if(callback){
+		callback();
+		}
+    },
+
+    callExtendCallNative: isWeexIOS ? function (componentId, cmdArgs) {
+
+        throw 'should not be here anymore ' + cmdArgs;
+
+    } : function (componentId, cmdArgs) {
+
+        throw 'should not be here anymore ' + cmdArgs;
+
+    },
+
+
+    flushNative: isWeexIOS ? function (componentId) {
+
+        const cmdArgs = joinArray(commandsCache[componentId], ';');
+        commandsCache[componentId] = [];
+
+        if (isDebugging) {
+            console.log('>>> >>> flush native ===');
+            console.log('>>> commands: ' + cmdArgs);
+        }
+
+        const result = GCanvasModule.extendCallNative({
+            "contextId": componentId,
+            "type": 0x60000000,
+            "args": cmdArgs
+        });
+
+        const res = result && result.result;
+
+        if (isDebugging) {
+            console.log('>>> result: ' + res);
+        }
+
+        return res;
+
+    } : function (componentId) {
+
+        const cmdArgs = joinArray(commandsCache[componentId], ';');
+        commandsCache[componentId] = [];
+
+        if (isDebugging) {
+            console.log('>>> >>> flush native ===');
+            console.log('>>> commands: ' + cmdArgs);
+        }
+
+        const result = callGCanvasLinkNative(componentId, 0x60000000, cmdArgs);
+
+        if (isDebugging) {
+            console.log('>>> result: ' + result);
+        }
+
+        return result;
+    },
+
+    callNative: function (componentId, cmdArgs, cache) {
+
+        if (isDebugging) {
+            logCommand(componentId, cmdArgs);
+        }
+
+        commandsCache[componentId].push(cmdArgs);
+
+        if (!cache || isComboDisabled) {
+            return GBridge.flushNative(componentId);
+        } else {
+            return undefined;
+        }
+    },
+
+    texImage2D(componentId, ...args) {
+        if (isWeexIOS) {
+            if (args.length === 6) {
+                const [target, level, internalformat, format, type, image] = args;
+                GBridge.callNative(
+                    componentId,
+                    GLmethod.texImage2D + ',' + 6 + ',' + target + ',' + level + ',' + internalformat + ',' + format + ',' + type + ',' + image.src
+                )
+            } else if (args.length === 9) {
+                const [target, level, internalformat, width, height, border, format, type, image] = args;
+                GBridge.callNative(
+                    componentId,
+                    GLmethod.texImage2D + ',' + 9 + ',' + target + ',' + level + ',' + internalformat + ',' + width + ',' + height + ',' + border + ',' +
+                    + format + ',' + type + ',' + (image ? image.src : 0)
+                )
+            }
+        } else if (isWeexAndroid) {
+            if (args.length === 6) {
+                const [target, level, internalformat, format, type, image] = args;
+                GCanvasModule.texImage2D(componentId, target, level, internalformat, format, type, image.src);
+            } else if (args.length === 9) {
+                const [target, level, internalformat, width, height, border, format, type, image] = args;
+                GCanvasModule.texImage2D(componentId, target, level, internalformat, width, height, border, format, type, (image ? image.src : 0));
+            }
+        }
+    },
+
+    texSubImage2D(componentId, target, level, xoffset, yoffset, format, type, image) {
+        if (isWeexIOS) {
+            if (arguments.length === 8) {
+                GBridge.callNative(
+                    componentId,
+                    GLmethod.texSubImage2D + ',' + 6 + ',' + target + ',' + level + ',' + xoffset + ',' + yoffset, + ',' + format + ',' + type + ',' + image.src
+                )
+            }
+        } else if (isWeexAndroid) {
+            GCanvasModule.texSubImage2D(componentId, target, level, xoffset, yoffset, format, type, image.src);
+        }
+    },
+
+    bindImageTexture(componentId, src, imageId) {
+        GCanvasModule.bindImageTexture([src, imageId], componentId);
+    },
+
+    perloadImage([url, id], callback) {
+        GCanvasModule.preLoadImage([url, id], function (image) {
+            image.url = url;
+            image.id = id;
+            callback(image);
+        });
+    },
+	
+	measureText(text, fontStyle, componentId) {
+	    return GCanvasModule.measureText([text, fontStyle], componentId);
+	},
+	
+	getImageData (componentId, x, y, w, h, callback) {
+		GCanvasModule.getImageData([x, y,w,h],componentId,callback);
+	},
+	
+	putImageData (componentId, data, x, y, w, h, callback) {
+		GCanvasModule.putImageData([x, y,w,h,data],componentId,callback);
+	},
+	
+	toTempFilePath(componentId, x, y, width, height, destWidth, destHeight, fileType, quality, callback){ 
+		GCanvasModule.toTempFilePath([x, y, width,height, destWidth, destHeight, fileType, quality], componentId, callback);
+	}
+}
+
+export default GBridge;
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleLinearGradient.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleLinearGradient.js
new file mode 100644
index 0000000..3e7f03a
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleLinearGradient.js
@@ -0,0 +1,18 @@
+class FillStyleLinearGradient {
+
+    constructor(x0, y0, x1, y1) {
+        this._start_pos = { _x: x0, _y: y0 };
+        this._end_pos = { _x: x1, _y: y1 };
+        this._stop_count = 0;
+        this._stops = [0, 0, 0, 0, 0];
+    }
+
+    addColorStop = function (pos, color) {
+        if (this._stop_count < 5 && 0.0 <= pos && pos <= 1.0) {
+            this._stops[this._stop_count] = { _pos: pos, _color: color };
+            this._stop_count++;
+        }
+    }
+}
+
+export default FillStyleLinearGradient;
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStylePattern.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStylePattern.js
new file mode 100644
index 0000000..6e4f646
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStylePattern.js
@@ -0,0 +1,8 @@
+class FillStylePattern {
+    constructor(img, pattern) {
+        this._style = pattern;
+        this._img = img;
+    }
+}
+
+export default FillStylePattern;
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleRadialGradient.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleRadialGradient.js
new file mode 100644
index 0000000..7790596
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/FillStyleRadialGradient.js
@@ -0,0 +1,17 @@
+class FillStyleRadialGradient {
+    constructor(x0, y0, r0, x1, y1, r1) {
+        this._start_pos = { _x: x0, _y: y0, _r: r0 };
+        this._end_pos = { _x: x1, _y: y1, _r: r1 };
+        this._stop_count = 0;
+        this._stops = [0, 0, 0, 0, 0];
+    }
+
+    addColorStop(pos, color) {
+        if (this._stop_count < 5 && 0.0 <= pos && pos <= 1.0) {
+            this._stops[this._stop_count] = { _pos: pos, _color: color };
+            this._stop_count++;
+        }
+    }
+}
+
+export default FillStyleRadialGradient;
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/RenderingContext.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/RenderingContext.js
new file mode 100644
index 0000000..e6b8f48
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-2d/RenderingContext.js
@@ -0,0 +1,666 @@
+import FillStylePattern from './FillStylePattern';
+import FillStyleLinearGradient from './FillStyleLinearGradient';
+import FillStyleRadialGradient from './FillStyleRadialGradient';
+import GImage from '../env/image.js';
+import {
+	ArrayBufferToBase64,
+	Base64ToUint8ClampedArray
+} from '../env/tool.js';
+
+export default class CanvasRenderingContext2D {
+
+	_drawCommands = '';
+
+	_globalAlpha = 1.0;
+
+	_fillStyle = 'rgb(0,0,0)';
+	_strokeStyle = 'rgb(0,0,0)';
+
+	_lineWidth = 1;
+	_lineCap = 'butt';
+	_lineJoin = 'miter';
+
+	_miterLimit = 10;
+
+	_globalCompositeOperation = 'source-over';
+
+	_textAlign = 'start';
+	_textBaseline = 'alphabetic';
+
+	_font = '10px sans-serif';
+
+	_savedGlobalAlpha = [];
+
+	timer = null;
+	componentId = null;
+
+	_notCommitDrawImageCache = [];
+	_needRedrawImageCache = [];
+	_redrawCommands = '';
+	_autoSaveContext = true;
+	// _imageMap = new GHashMap();
+	// _textureMap = new GHashMap();
+
+	constructor() {
+		this.className = 'CanvasRenderingContext2D';
+		//this.save()
+	}
+
+	setFillStyle(value) {
+		this.fillStyle = value;
+	}
+
+	set fillStyle(value) {
+		this._fillStyle = value;
+
+		if (typeof(value) == 'string') {
+			this._drawCommands = this._drawCommands.concat("F" + value + ";");
+		} else if (value instanceof FillStylePattern) {
+			const image = value._img;
+			if (!image.complete) {
+				image.onload = () => {
+					var index = this._needRedrawImageCache.indexOf(image);
+					if (index > -1) {
+						this._needRedrawImageCache.splice(index, 1);
+						CanvasRenderingContext2D.GBridge.bindImageTexture(this.componentId, image.src, image._id);
+						this._redrawflush(true);
+					}
+				}
+				this._notCommitDrawImageCache.push(image);
+			} else {
+				CanvasRenderingContext2D.GBridge.bindImageTexture(this.componentId, image.src, image._id);
+			}
+
+			//CanvasRenderingContext2D.GBridge.bindImageTexture(this.componentId, image.src, image._id);
+			this._drawCommands = this._drawCommands.concat("G" + image._id + "," + value._style + ";");
+		} else if (value instanceof FillStyleLinearGradient) {
+			var command = "D" + value._start_pos._x.toFixed(2) + "," + value._start_pos._y.toFixed(2) + "," +
+				value._end_pos._x.toFixed(2) + "," + value._end_pos._y.toFixed(2) + "," +
+				value._stop_count;
+			for (var i = 0; i < value._stop_count; ++i) {
+				command += ("," + value._stops[i]._pos + "," + value._stops[i]._color);
+			}
+			this._drawCommands = this._drawCommands.concat(command + ";");
+		} else if (value instanceof FillStyleRadialGradient) {
+			var command = "H" + value._start_pos._x.toFixed(2) + "," + value._start_pos._y.toFixed(2) + "," + value._start_pos._r
+				.toFixed(2) + "," +
+				value._end_pos._x.toFixed(2) + "," + value._end_pos._y.toFixed(2) + "," + value._end_pos._r.toFixed(2) + "," +
+				value._stop_count;
+			for (var i = 0; i < value._stop_count; ++i) {
+				command += ("," + value._stops[i]._pos + "," + value._stops[i]._color);
+			}
+			this._drawCommands = this._drawCommands.concat(command + ";");
+		}
+	}
+
+	get fillStyle() {
+		return this._fillStyle;
+	}
+
+	get globalAlpha() {
+		return this._globalAlpha;
+	}
+
+	setGlobalAlpha(value) {
+		this.globalAlpha = value;
+	}
+
+	set globalAlpha(value) {
+		this._globalAlpha = value;
+		this._drawCommands = this._drawCommands.concat("a" + value.toFixed(2) + ";");
+	}
+
+
+	get strokeStyle() {
+		return this._strokeStyle;
+	}
+
+	setStrokeStyle(value) {
+		this.strokeStyle = value;
+	}
+
+	set strokeStyle(value) {
+
+		this._strokeStyle = value;
+
+		if (typeof(value) == 'string') {
+			this._drawCommands = this._drawCommands.concat("S" + value + ";");
+		} else if (value instanceof FillStylePattern) {
+			CanvasRenderingContext2D.GBridge.bindImageTexture(this.componentId, image.src, image._id);
+			this._drawCommands = this._drawCommands.concat("G" + image._id + "," + value._style + ";");
+		} else if (value instanceof FillStyleLinearGradient) {
+			var command = "D" + value._start_pos._x.toFixed(2) + "," + value._start_pos._y.toFixed(2) + "," +
+				value._end_pos._x.toFixed(2) + "," + value._end_pos._y.toFixed(2) + "," +
+				value._stop_count;
+
+			for (var i = 0; i < value._stop_count; ++i) {
+				command += ("," + value._stops[i]._pos + "," + value._stops[i]._color);
+			}
+			this._drawCommands = this._drawCommands.concat(command + ";");
+		} else if (value instanceof FillStyleRadialGradient) {
+			var command = "H" + value._start_pos._x.toFixed(2) + "," + value._start_pos._y.toFixed(2) + "," + value._start_pos._r
+				.toFixed(2) + "," +
+				value._end_pos._x.toFixed(2) + "," + value._end_pos._y + ",".toFixed(2) + value._end_pos._r.toFixed(2) + "," +
+				value._stop_count;
+
+			for (var i = 0; i < value._stop_count; ++i) {
+				command += ("," + value._stops[i]._pos + "," + value._stops[i]._color);
+			}
+			this._drawCommands = this._drawCommands.concat(command + ";");
+		}
+	}
+
+	get lineWidth() {
+		return this._lineWidth;
+	}
+
+	setLineWidth(value) {
+		this.lineWidth = value;
+	}
+
+	set lineWidth(value) {
+		this._lineWidth = value;
+		this._drawCommands = this._drawCommands.concat("W" + value + ";");
+	}
+
+	get lineCap() {
+		return this._lineCap;
+	}
+
+	setLineCap(value) {
+		this.lineCap = value;
+	}
+
+	set lineCap(value) {
+		this._lineCap = value;
+		this._drawCommands = this._drawCommands.concat("C" + value + ";");
+	}
+
+	get lineJoin() {
+		return this._lineJoin;
+	}
+
+	setLineJoin(value) {
+		this.lineJoin = value
+	}
+
+	set lineJoin(value) {
+		this._lineJoin = value;
+		this._drawCommands = this._drawCommands.concat("J" + value + ";");
+	}
+
+	get miterLimit() {
+		return this._miterLimit;
+	}
+
+	setMiterLimit(value) {
+		this.miterLimit = value
+	}
+
+	set miterLimit(value) {
+		this._miterLimit = value;
+		this._drawCommands = this._drawCommands.concat("M" + value + ";");
+	}
+
+	get globalCompositeOperation() {
+		return this._globalCompositeOperation;
+	}
+
+	set globalCompositeOperation(value) {
+
+		this._globalCompositeOperation = value;
+		let mode = 0;
+		switch (value) {
+			case "source-over":
+				mode = 0;
+				break;
+			case "source-atop":
+				mode = 5;
+				break;
+			case "source-in":
+				mode = 0;
+				break;
+			case "source-out":
+				mode = 2;
+				break;
+			case "destination-over":
+				mode = 4;
+				break;
+			case "destination-atop":
+				mode = 4;
+				break;
+			case "destination-in":
+				mode = 4;
+				break;
+			case "destination-out":
+				mode = 3;
+				break;
+			case "lighter":
+				mode = 1;
+				break;
+			case "copy":
+				mode = 2;
+				break;
+			case "xor":
+				mode = 6;
+				break;
+			default:
+				mode = 0;
+		}
+
+		this._drawCommands = this._drawCommands.concat("B" + mode + ";");
+	}
+
+	get textAlign() {
+		return this._textAlign;
+	}
+
+	setTextAlign(value) {
+		this.textAlign = value
+	}
+
+	set textAlign(value) {
+
+		this._textAlign = value;
+		let Align = 0;
+		switch (value) {
+			case "start":
+				Align = 0;
+				break;
+			case "end":
+				Align = 1;
+				break;
+			case "left":
+				Align = 2;
+				break;
+			case "center":
+				Align = 3;
+				break;
+			case "right":
+				Align = 4;
+				break;
+			default:
+				Align = 0;
+		}
+
+		this._drawCommands = this._drawCommands.concat("A" + Align + ";");
+	}
+
+	get textBaseline() {
+		return this._textBaseline;
+	}
+
+	setTextBaseline(value) {
+		this.textBaseline = value
+	}
+
+	set textBaseline(value) {
+		this._textBaseline = value;
+		let baseline = 0;
+		switch (value) {
+			case "alphabetic":
+				baseline = 0;
+				break;
+			case "middle":
+				baseline = 1;
+				break;
+			case "top":
+				baseline = 2;
+				break;
+			case "hanging":
+				baseline = 3;
+				break;
+			case "bottom":
+				baseline = 4;
+				break;
+			case "ideographic":
+				baseline = 5;
+				break;
+			default:
+				baseline = 0;
+				break;
+		}
+
+		this._drawCommands = this._drawCommands.concat("E" + baseline + ";");
+	}
+
+	get font() {
+		return this._font;
+	}
+
+	setFontSize(size) {
+		var str = this._font;
+		var strs = str.trim().split(/\s+/);
+		for (var i = 0; i < strs.length; i++) {
+			var values = ["normal", "italic", "oblique", "normal", "small-caps", "normal", "bold",
+				"bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900",
+				"normal", "ultra-condensed", "extra-condensed", "condensed", "semi-condensed",
+				"semi-expanded", "expanded", "extra-expanded", "ultra-expanded"
+			];
+
+			if (-1 == values.indexOf(strs[i].trim())) {
+				if (typeof size === 'string') {
+					strs[i] = size;
+				} else if (typeof size === 'number') {
+					strs[i] = String(size) + 'px';
+				}
+				break;
+			}
+		}
+		this.font = strs.join(" ");
+	}
+
+	set font(value) {
+		this._font = value;
+		this._drawCommands = this._drawCommands.concat("j" + value + ";");
+	}
+
+	setTransform(a, b, c, d, tx, ty) {
+		this._drawCommands = this._drawCommands.concat("t" +
+			(a === 1 ? "1" : a.toFixed(2)) + "," +
+			(b === 0 ? "0" : b.toFixed(2)) + "," +
+			(c === 0 ? "0" : c.toFixed(2)) + "," +
+			(d === 1 ? "1" : d.toFixed(2)) + "," + tx.toFixed(2) + "," + ty.toFixed(2) + ";");
+	}
+
+	transform(a, b, c, d, tx, ty) {
+		this._drawCommands = this._drawCommands.concat("f" +
+			(a === 1 ? "1" : a.toFixed(2)) + "," +
+			(b === 0 ? "0" : b.toFixed(2)) + "," +
+			(c === 0 ? "0" : c.toFixed(2)) + "," +
+			(d === 1 ? "1" : d.toFixed(2)) + "," + tx + "," + ty + ";");
+	}
+
+	resetTransform() {
+		this._drawCommands = this._drawCommands.concat("m;");
+	}
+
+	scale(a, d) {
+		this._drawCommands = this._drawCommands.concat("k" + a.toFixed(2) + "," +
+			d.toFixed(2) + ";");
+	}
+
+	rotate(angle) {
+		this._drawCommands = this._drawCommands
+			.concat("r" + angle.toFixed(6) + ";");
+	}
+
+	translate(tx, ty) {
+		this._drawCommands = this._drawCommands.concat("l" + tx.toFixed(2) + "," + ty.toFixed(2) + ";");
+	}
+
+	save() {
+		this._savedGlobalAlpha.push(this._globalAlpha);
+		this._drawCommands = this._drawCommands.concat("v;");
+	}
+
+	restore() {
+		this._drawCommands = this._drawCommands.concat("e;");
+		this._globalAlpha = this._savedGlobalAlpha.pop();
+	}
+
+	createPattern(img, pattern) {
+		if (typeof img === 'string') {
+			var imgObj = new GImage();
+			imgObj.src = img;
+			img = imgObj;
+		}
+		return new FillStylePattern(img, pattern);
+	}
+
+	createLinearGradient(x0, y0, x1, y1) {
+		return new FillStyleLinearGradient(x0, y0, x1, y1);
+	}
+
+	createRadialGradient = function(x0, y0, r0, x1, y1, r1) {
+		return new FillStyleRadialGradient(x0, y0, r0, x1, y1, r1);
+	};
+
+	createCircularGradient = function(x0, y0, r0) {
+		return new FillStyleRadialGradient(x0, y0, 0, x0, y0, r0);
+	};
+
+	strokeRect(x, y, w, h) {
+		this._drawCommands = this._drawCommands.concat("s" + x + "," + y + "," + w + "," + h + ";");
+	}
+
+
+	clearRect(x, y, w, h) {
+		this._drawCommands = this._drawCommands.concat("c" + x + "," + y + "," + w +
+			"," + h + ";");
+	}
+
+	clip() {
+		this._drawCommands = this._drawCommands.concat("p;");
+	}
+
+	resetClip() {
+		this._drawCommands = this._drawCommands.concat("q;");
+	}
+
+	closePath() {
+		this._drawCommands = this._drawCommands.concat("o;");
+	}
+
+	moveTo(x, y) {
+		this._drawCommands = this._drawCommands.concat("g" + x.toFixed(2) + "," + y.toFixed(2) + ";");
+	}
+
+	lineTo(x, y) {
+		this._drawCommands = this._drawCommands.concat("i" + x.toFixed(2) + "," + y.toFixed(2) + ";");
+	}
+
+	quadraticCurveTo = function(cpx, cpy, x, y) {
+		this._drawCommands = this._drawCommands.concat("u" + cpx + "," + cpy + "," + x + "," + y + ";");
+	}
+
+	bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y, ) {
+		this._drawCommands = this._drawCommands.concat(
+			"z" + cp1x.toFixed(2) + "," + cp1y.toFixed(2) + "," + cp2x.toFixed(2) + "," + cp2y.toFixed(2) + "," +
+			x.toFixed(2) + "," + y.toFixed(2) + ";");
+	}
+
+	arcTo(x1, y1, x2, y2, radius) {
+		this._drawCommands = this._drawCommands.concat("h" + x1 + "," + y1 + "," + x2 + "," + y2 + "," + radius + ";");
+	}
+
+	beginPath() {
+		this._drawCommands = this._drawCommands.concat("b;");
+	}
+
+
+	fillRect(x, y, w, h) {
+		this._drawCommands = this._drawCommands.concat("n" + x + "," + y + "," + w +
+			"," + h + ";");
+	}
+
+	rect(x, y, w, h) {
+		this._drawCommands = this._drawCommands.concat("w" + x + "," + y + "," + w + "," + h + ";");
+	}
+
+	fill() {
+		this._drawCommands = this._drawCommands.concat("L;");
+	}
+
+	stroke(path) {
+		this._drawCommands = this._drawCommands.concat("x;");
+	}
+
+	arc(x, y, radius, startAngle, endAngle, anticlockwise) {
+
+		let ianticlockwise = 0;
+		if (anticlockwise) {
+			ianticlockwise = 1;
+		}
+
+		this._drawCommands = this._drawCommands.concat(
+			"y" + x.toFixed(2) + "," + y.toFixed(2) + "," +
+			radius.toFixed(2) + "," + startAngle + "," + endAngle + "," + ianticlockwise +
+			";"
+		);
+	}
+
+	fillText(text, x, y) {
+		let tmptext = text.replace(/!/g, "!!");
+		tmptext = tmptext.replace(/,/g, "!,");
+		tmptext = tmptext.replace(/;/g, "!;");
+		this._drawCommands = this._drawCommands.concat("T" + tmptext + "," + x + "," + y + ",0.0;");
+	}
+
+	strokeText = function(text, x, y) {
+		let tmptext = text.replace(/!/g, "!!");
+		tmptext = tmptext.replace(/,/g, "!,");
+		tmptext = tmptext.replace(/;/g, "!;");
+		this._drawCommands = this._drawCommands.concat("U" + tmptext + "," + x + "," + y + ",0.0;");
+	}
+
+	measureText(text) {
+		return CanvasRenderingContext2D.GBridge.measureText(text, this.font, this.componentId);
+	}
+
+	isPointInPath = function(x, y) {
+		throw new Error('GCanvas not supported yet');
+	}
+
+	drawImage(image, sx, sy, sw, sh, dx, dy, dw, dh) {
+		if (typeof image === 'string') {
+			var imgObj = new GImage();
+			imgObj.src = image;
+			image = imgObj;
+		}
+		if (image instanceof GImage) {
+			if (!image.complete) {
+				imgObj.onload = () => {
+					var index = this._needRedrawImageCache.indexOf(image);
+					if (index > -1) {
+						this._needRedrawImageCache.splice(index, 1);
+						CanvasRenderingContext2D.GBridge.bindImageTexture(this.componentId, image.src, image._id);
+						this._redrawflush(true);
+					}
+				}
+				this._notCommitDrawImageCache.push(image);
+			} else {
+				CanvasRenderingContext2D.GBridge.bindImageTexture(this.componentId, image.src, image._id);
+			}
+			var srcArgs = [image, sx, sy, sw, sh, dx, dy, dw, dh];
+			var args = [];
+			for (var arg in srcArgs) {
+				if (typeof(srcArgs[arg]) != 'undefined') {
+					args.push(srcArgs[arg]);
+				}
+			}
+			this.__drawImage.apply(this, args);
+			//this.__drawImage(image,sx, sy, sw, sh, dx, dy, dw, dh);
+		}
+	}
+
+	__drawImage(image, sx, sy, sw, sh, dx, dy, dw, dh) {
+		const numArgs = arguments.length;
+
+		function drawImageCommands() {
+
+			if (numArgs === 3) {
+				const x = parseFloat(sx) || 0.0;
+				const y = parseFloat(sy) || 0.0;
+
+				return ("d" + image._id + ",0,0," +
+					image.width + "," + image.height + "," +
+					x + "," + y + "," + image.width + "," + image.height + ";");
+			} else if (numArgs === 5) {
+				const x = parseFloat(sx) || 0.0;
+				const y = parseFloat(sy) || 0.0;
+				const width = parseInt(sw) || image.width;
+				const height = parseInt(sh) || image.height;
+
+				return ("d" + image._id + ",0,0," +
+					image.width + "," + image.height + "," +
+					x + "," + y + "," + width + "," + height + ";");
+			} else if (numArgs === 9) {
+				sx = parseFloat(sx) || 0.0;
+				sy = parseFloat(sy) || 0.0;
+				sw = parseInt(sw) || image.width;
+				sh = parseInt(sh) || image.height;
+				dx = parseFloat(dx) || 0.0;
+				dy = parseFloat(dy) || 0.0;
+				dw = parseInt(dw) || image.width;
+				dh = parseInt(dh) || image.height;
+
+				return ("d" + image._id + "," +
+					sx + "," + sy + "," + sw + "," + sh + "," +
+					dx + "," + dy + "," + dw + "," + dh + ";");
+			}
+		}
+		this._drawCommands += drawImageCommands();
+	}
+
+	_flush(reserve, callback) {
+		const commands = this._drawCommands;
+		this._drawCommands = '';
+		CanvasRenderingContext2D.GBridge.render2d(this.componentId, commands, callback);
+		this._needRender = false;
+	}
+
+	_redrawflush(reserve, callback) {
+		const commands = this._redrawCommands;
+		CanvasRenderingContext2D.GBridge.render2d(this.componentId, commands, callback);
+		if (this._needRedrawImageCache.length == 0) {
+			this._redrawCommands = '';
+		}
+	}
+
+	draw(reserve, callback) {
+		if (!reserve) {
+			this._globalAlpha = this._savedGlobalAlpha.pop();
+			this._savedGlobalAlpha.push(this._globalAlpha);
+			this._redrawCommands = this._drawCommands;
+			this._needRedrawImageCache = this._notCommitDrawImageCache;
+			if (this._autoSaveContext) {
+				this._drawCommands = ("v;" + this._drawCommands);
+				this._autoSaveContext = false;
+			} else {
+				this._drawCommands = ("e;X;v;" + this._drawCommands);
+			}
+		} else {
+			this._needRedrawImageCache = this._needRedrawImageCache.concat(this._notCommitDrawImageCache);
+			this._redrawCommands += this._drawCommands;
+			if (this._autoSaveContext) {
+				this._drawCommands = ("v;" + this._drawCommands);
+				this._autoSaveContext = false;
+			}
+		}
+		this._notCommitDrawImageCache = [];
+		if (this._flush) {
+			this._flush(reserve, callback);
+		}
+	}
+
+	getImageData(x, y, w, h, callback) {
+		CanvasRenderingContext2D.GBridge.getImageData(this.componentId, x, y, w, h, function(res) {
+			res.data = Base64ToUint8ClampedArray(res.data);
+			if (typeof(callback) == 'function') {
+				callback(res);
+			}
+		});
+	}
+
+	putImageData(data, x, y, w, h, callback) {
+		if (data instanceof Uint8ClampedArray) {
+			data = ArrayBufferToBase64(data);
+			CanvasRenderingContext2D.GBridge.putImageData(this.componentId, data, x, y, w, h, function(res) {
+				if (typeof(callback) == 'function') {
+					callback(res);
+				}
+			});
+		}
+	}
+
+	toTempFilePath(x, y, width, height, destWidth, destHeight, fileType, quality, callback) {
+		CanvasRenderingContext2D.GBridge.toTempFilePath(this.componentId, x, y, width, height, destWidth, destHeight,
+			fileType, quality,
+			function(res) {
+				if (typeof(callback) == 'function') {
+					callback(res);
+				}
+			});
+	}
+}
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ActiveInfo.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ActiveInfo.js
new file mode 100644
index 0000000..b495129
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ActiveInfo.js
@@ -0,0 +1,11 @@
+export default class WebGLActiveInfo {
+    className = 'WebGLActiveInfo';
+
+    constructor({
+        type, name, size
+    }) {
+        this.type = type;
+        this.name = name;
+        this.size = size;
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Buffer.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Buffer.js
new file mode 100644
index 0000000..4800f67
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Buffer.js
@@ -0,0 +1,21 @@
+import {getTransferedObjectUUID} from './classUtils';
+
+const name = 'WebGLBuffer';
+
+function uuid(id) {
+    return getTransferedObjectUUID(name, id);
+}
+
+export default class WebGLBuffer {
+    className = name;
+
+    constructor(id) {
+        this.id = id;
+    }
+
+    static uuid = uuid;
+
+    uuid() {
+        return uuid(this.id);
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Framebuffer.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Framebuffer.js
new file mode 100644
index 0000000..28b46d3
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Framebuffer.js
@@ -0,0 +1,21 @@
+import {getTransferedObjectUUID} from './classUtils';
+
+const name = 'WebGLFrameBuffer';
+
+function uuid(id) {
+    return getTransferedObjectUUID(name, id);
+}
+
+export default class WebGLFramebuffer {
+    className = name;
+
+    constructor(id) {
+        this.id = id;
+    }
+
+    static uuid = uuid;
+
+    uuid() {
+        return uuid(this.id);
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLenum.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLenum.js
new file mode 100644
index 0000000..ac5544d
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLenum.js
@@ -0,0 +1,298 @@
+export default {
+    "DEPTH_BUFFER_BIT": 256,
+    "STENCIL_BUFFER_BIT": 1024,
+    "COLOR_BUFFER_BIT": 16384,
+    "POINTS": 0,
+    "LINES": 1,
+    "LINE_LOOP": 2,
+    "LINE_STRIP": 3,
+    "TRIANGLES": 4,
+    "TRIANGLE_STRIP": 5,
+    "TRIANGLE_FAN": 6,
+    "ZERO": 0,
+    "ONE": 1,
+    "SRC_COLOR": 768,
+    "ONE_MINUS_SRC_COLOR": 769,
+    "SRC_ALPHA": 770,
+    "ONE_MINUS_SRC_ALPHA": 771,
+    "DST_ALPHA": 772,
+    "ONE_MINUS_DST_ALPHA": 773,
+    "DST_COLOR": 774,
+    "ONE_MINUS_DST_COLOR": 775,
+    "SRC_ALPHA_SATURATE": 776,
+    "FUNC_ADD": 32774,
+    "BLEND_EQUATION": 32777,
+    "BLEND_EQUATION_RGB": 32777,
+    "BLEND_EQUATION_ALPHA": 34877,
+    "FUNC_SUBTRACT": 32778,
+    "FUNC_REVERSE_SUBTRACT": 32779,
+    "BLEND_DST_RGB": 32968,
+    "BLEND_SRC_RGB": 32969,
+    "BLEND_DST_ALPHA": 32970,
+    "BLEND_SRC_ALPHA": 32971,
+    "CONSTANT_COLOR": 32769,
+    "ONE_MINUS_CONSTANT_COLOR": 32770,
+    "CONSTANT_ALPHA": 32771,
+    "ONE_MINUS_CONSTANT_ALPHA": 32772,
+    "BLEND_COLOR": 32773,
+    "ARRAY_BUFFER": 34962,
+    "ELEMENT_ARRAY_BUFFER": 34963,
+    "ARRAY_BUFFER_BINDING": 34964,
+    "ELEMENT_ARRAY_BUFFER_BINDING": 34965,
+    "STREAM_DRAW": 35040,
+    "STATIC_DRAW": 35044,
+    "DYNAMIC_DRAW": 35048,
+    "BUFFER_SIZE": 34660,
+    "BUFFER_USAGE": 34661,
+    "CURRENT_VERTEX_ATTRIB": 34342,
+    "FRONT": 1028,
+    "BACK": 1029,
+    "FRONT_AND_BACK": 1032,
+    "TEXTURE_2D": 3553,
+    "CULL_FACE": 2884,
+    "BLEND": 3042,
+    "DITHER": 3024,
+    "STENCIL_TEST": 2960,
+    "DEPTH_TEST": 2929,
+    "SCISSOR_TEST": 3089,
+    "POLYGON_OFFSET_FILL": 32823,
+    "SAMPLE_ALPHA_TO_COVERAGE": 32926,
+    "SAMPLE_COVERAGE": 32928,
+    "NO_ERROR": 0,
+    "INVALID_ENUM": 1280,
+    "INVALID_VALUE": 1281,
+    "INVALID_OPERATION": 1282,
+    "OUT_OF_MEMORY": 1285,
+    "CW": 2304,
+    "CCW": 2305,
+    "LINE_WIDTH": 2849,
+    "ALIASED_POINT_SIZE_RANGE": 33901,
+    "ALIASED_LINE_WIDTH_RANGE": 33902,
+    "CULL_FACE_MODE": 2885,
+    "FRONT_FACE": 2886,
+    "DEPTH_RANGE": 2928,
+    "DEPTH_WRITEMASK": 2930,
+    "DEPTH_CLEAR_VALUE": 2931,
+    "DEPTH_FUNC": 2932,
+    "STENCIL_CLEAR_VALUE": 2961,
+    "STENCIL_FUNC": 2962,
+    "STENCIL_FAIL": 2964,
+    "STENCIL_PASS_DEPTH_FAIL": 2965,
+    "STENCIL_PASS_DEPTH_PASS": 2966,
+    "STENCIL_REF": 2967,
+    "STENCIL_VALUE_MASK": 2963,
+    "STENCIL_WRITEMASK": 2968,
+    "STENCIL_BACK_FUNC": 34816,
+    "STENCIL_BACK_FAIL": 34817,
+    "STENCIL_BACK_PASS_DEPTH_FAIL": 34818,
+    "STENCIL_BACK_PASS_DEPTH_PASS": 34819,
+    "STENCIL_BACK_REF": 36003,
+    "STENCIL_BACK_VALUE_MASK": 36004,
+    "STENCIL_BACK_WRITEMASK": 36005,
+    "VIEWPORT": 2978,
+    "SCISSOR_BOX": 3088,
+    "COLOR_CLEAR_VALUE": 3106,
+    "COLOR_WRITEMASK": 3107,
+    "UNPACK_ALIGNMENT": 3317,
+    "PACK_ALIGNMENT": 3333,
+    "MAX_TEXTURE_SIZE": 3379,
+    "MAX_VIEWPORT_DIMS": 3386,
+    "SUBPIXEL_BITS": 3408,
+    "RED_BITS": 3410,
+    "GREEN_BITS": 3411,
+    "BLUE_BITS": 3412,
+    "ALPHA_BITS": 3413,
+    "DEPTH_BITS": 3414,
+    "STENCIL_BITS": 3415,
+    "POLYGON_OFFSET_UNITS": 10752,
+    "POLYGON_OFFSET_FACTOR": 32824,
+    "TEXTURE_BINDING_2D": 32873,
+    "SAMPLE_BUFFERS": 32936,
+    "SAMPLES": 32937,
+    "SAMPLE_COVERAGE_VALUE": 32938,
+    "SAMPLE_COVERAGE_INVERT": 32939,
+    "COMPRESSED_TEXTURE_FORMATS": 34467,
+    "DONT_CARE": 4352,
+    "FASTEST": 4353,
+    "NICEST": 4354,
+    "GENERATE_MIPMAP_HINT": 33170,
+    "BYTE": 5120,
+    "UNSIGNED_BYTE": 5121,
+    "SHORT": 5122,
+    "UNSIGNED_SHORT": 5123,
+    "INT": 5124,
+    "UNSIGNED_INT": 5125,
+    "FLOAT": 5126,
+    "DEPTH_COMPONENT": 6402,
+    "ALPHA": 6406,
+    "RGB": 6407,
+    "RGBA": 6408,
+    "LUMINANCE": 6409,
+    "LUMINANCE_ALPHA": 6410,
+    "UNSIGNED_SHORT_4_4_4_4": 32819,
+    "UNSIGNED_SHORT_5_5_5_1": 32820,
+    "UNSIGNED_SHORT_5_6_5": 33635,
+    "FRAGMENT_SHADER": 35632,
+    "VERTEX_SHADER": 35633,
+    "MAX_VERTEX_ATTRIBS": 34921,
+    "MAX_VERTEX_UNIFORM_VECTORS": 36347,
+    "MAX_VARYING_VECTORS": 36348,
+    "MAX_COMBINED_TEXTURE_IMAGE_UNITS": 35661,
+    "MAX_VERTEX_TEXTURE_IMAGE_UNITS": 35660,
+    "MAX_TEXTURE_IMAGE_UNITS": 34930,
+    "MAX_FRAGMENT_UNIFORM_VECTORS": 36349,
+    "SHADER_TYPE": 35663,
+    "DELETE_STATUS": 35712,
+    "LINK_STATUS": 35714,
+    "VALIDATE_STATUS": 35715,
+    "ATTACHED_SHADERS": 35717,
+    "ACTIVE_UNIFORMS": 35718,
+    "ACTIVE_ATTRIBUTES": 35721,
+    "SHADING_LANGUAGE_VERSION": 35724,
+    "CURRENT_PROGRAM": 35725,
+    "NEVER": 512,
+    "LESS": 513,
+    "EQUAL": 514,
+    "LEQUAL": 515,
+    "GREATER": 516,
+    "NOTEQUAL": 517,
+    "GEQUAL": 518,
+    "ALWAYS": 519,
+    "KEEP": 7680,
+    "REPLACE": 7681,
+    "INCR": 7682,
+    "DECR": 7683,
+    "INVERT": 5386,
+    "INCR_WRAP": 34055,
+    "DECR_WRAP": 34056,
+    "VENDOR": 7936,
+    "RENDERER": 7937,
+    "VERSION": 7938,
+    "NEAREST": 9728,
+    "LINEAR": 9729,
+    "NEAREST_MIPMAP_NEAREST": 9984,
+    "LINEAR_MIPMAP_NEAREST": 9985,
+    "NEAREST_MIPMAP_LINEAR": 9986,
+    "LINEAR_MIPMAP_LINEAR": 9987,
+    "TEXTURE_MAG_FILTER": 10240,
+    "TEXTURE_MIN_FILTER": 10241,
+    "TEXTURE_WRAP_S": 10242,
+    "TEXTURE_WRAP_T": 10243,
+    "TEXTURE": 5890,
+    "TEXTURE_CUBE_MAP": 34067,
+    "TEXTURE_BINDING_CUBE_MAP": 34068,
+    "TEXTURE_CUBE_MAP_POSITIVE_X": 34069,
+    "TEXTURE_CUBE_MAP_NEGATIVE_X": 34070,
+    "TEXTURE_CUBE_MAP_POSITIVE_Y": 34071,
+    "TEXTURE_CUBE_MAP_NEGATIVE_Y": 34072,
+    "TEXTURE_CUBE_MAP_POSITIVE_Z": 34073,
+    "TEXTURE_CUBE_MAP_NEGATIVE_Z": 34074,
+    "MAX_CUBE_MAP_TEXTURE_SIZE": 34076,
+    "TEXTURE0": 33984,
+    "TEXTURE1": 33985,
+    "TEXTURE2": 33986,
+    "TEXTURE3": 33987,
+    "TEXTURE4": 33988,
+    "TEXTURE5": 33989,
+    "TEXTURE6": 33990,
+    "TEXTURE7": 33991,
+    "TEXTURE8": 33992,
+    "TEXTURE9": 33993,
+    "TEXTURE10": 33994,
+    "TEXTURE11": 33995,
+    "TEXTURE12": 33996,
+    "TEXTURE13": 33997,
+    "TEXTURE14": 33998,
+    "TEXTURE15": 33999,
+    "TEXTURE16": 34000,
+    "TEXTURE17": 34001,
+    "TEXTURE18": 34002,
+    "TEXTURE19": 34003,
+    "TEXTURE20": 34004,
+    "TEXTURE21": 34005,
+    "TEXTURE22": 34006,
+    "TEXTURE23": 34007,
+    "TEXTURE24": 34008,
+    "TEXTURE25": 34009,
+    "TEXTURE26": 34010,
+    "TEXTURE27": 34011,
+    "TEXTURE28": 34012,
+    "TEXTURE29": 34013,
+    "TEXTURE30": 34014,
+    "TEXTURE31": 34015,
+    "ACTIVE_TEXTURE": 34016,
+    "REPEAT": 10497,
+    "CLAMP_TO_EDGE": 33071,
+    "MIRRORED_REPEAT": 33648,
+    "FLOAT_VEC2": 35664,
+    "FLOAT_VEC3": 35665,
+    "FLOAT_VEC4": 35666,
+    "INT_VEC2": 35667,
+    "INT_VEC3": 35668,
+    "INT_VEC4": 35669,
+    "BOOL": 35670,
+    "BOOL_VEC2": 35671,
+    "BOOL_VEC3": 35672,
+    "BOOL_VEC4": 35673,
+    "FLOAT_MAT2": 35674,
+    "FLOAT_MAT3": 35675,
+    "FLOAT_MAT4": 35676,
+    "SAMPLER_2D": 35678,
+    "SAMPLER_CUBE": 35680,
+    "VERTEX_ATTRIB_ARRAY_ENABLED": 34338,
+    "VERTEX_ATTRIB_ARRAY_SIZE": 34339,
+    "VERTEX_ATTRIB_ARRAY_STRIDE": 34340,
+    "VERTEX_ATTRIB_ARRAY_TYPE": 34341,
+    "VERTEX_ATTRIB_ARRAY_NORMALIZED": 34922,
+    "VERTEX_ATTRIB_ARRAY_POINTER": 34373,
+    "VERTEX_ATTRIB_ARRAY_BUFFER_BINDING": 34975,
+    "IMPLEMENTATION_COLOR_READ_TYPE": 35738,
+    "IMPLEMENTATION_COLOR_READ_FORMAT": 35739,
+    "COMPILE_STATUS": 35713,
+    "LOW_FLOAT": 36336,
+    "MEDIUM_FLOAT": 36337,
+    "HIGH_FLOAT": 36338,
+    "LOW_INT": 36339,
+    "MEDIUM_INT": 36340,
+    "HIGH_INT": 36341,
+    "FRAMEBUFFER": 36160,
+    "RENDERBUFFER": 36161,
+    "RGBA4": 32854,
+    "RGB5_A1": 32855,
+    "RGB565": 36194,
+    "DEPTH_COMPONENT16": 33189,
+    "STENCIL_INDEX8": 36168,
+    "DEPTH_STENCIL": 34041,
+    "RENDERBUFFER_WIDTH": 36162,
+    "RENDERBUFFER_HEIGHT": 36163,
+    "RENDERBUFFER_INTERNAL_FORMAT": 36164,
+    "RENDERBUFFER_RED_SIZE": 36176,
+    "RENDERBUFFER_GREEN_SIZE": 36177,
+    "RENDERBUFFER_BLUE_SIZE": 36178,
+    "RENDERBUFFER_ALPHA_SIZE": 36179,
+    "RENDERBUFFER_DEPTH_SIZE": 36180,
+    "RENDERBUFFER_STENCIL_SIZE": 36181,
+    "FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE": 36048,
+    "FRAMEBUFFER_ATTACHMENT_OBJECT_NAME": 36049,
+    "FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL": 36050,
+    "FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE": 36051,
+    "COLOR_ATTACHMENT0": 36064,
+    "DEPTH_ATTACHMENT": 36096,
+    "STENCIL_ATTACHMENT": 36128,
+    "DEPTH_STENCIL_ATTACHMENT": 33306,
+    "NONE": 0,
+    "FRAMEBUFFER_COMPLETE": 36053,
+    "FRAMEBUFFER_INCOMPLETE_ATTACHMENT": 36054,
+    "FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT": 36055,
+    "FRAMEBUFFER_INCOMPLETE_DIMENSIONS": 36057,
+    "FRAMEBUFFER_UNSUPPORTED": 36061,
+    "FRAMEBUFFER_BINDING": 36006,
+    "RENDERBUFFER_BINDING": 36007,
+    "MAX_RENDERBUFFER_SIZE": 34024,
+    "INVALID_FRAMEBUFFER_OPERATION": 1286,
+    "UNPACK_FLIP_Y_WEBGL": 37440,
+    "UNPACK_PREMULTIPLY_ALPHA_WEBGL": 37441,
+    "CONTEXT_LOST_WEBGL": 37442,
+    "UNPACK_COLORSPACE_CONVERSION_WEBGL": 37443,
+    "BROWSER_DEFAULT_WEBGL": 37444
+};
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLmethod.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLmethod.js
new file mode 100644
index 0000000..f2659be
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLmethod.js
@@ -0,0 +1,142 @@
+let i = 1;
+
+const GLmethod = {};
+
+GLmethod.activeTexture = i++;         //1
+GLmethod.attachShader = i++;
+GLmethod.bindAttribLocation = i++;
+GLmethod.bindBuffer = i++;
+GLmethod.bindFramebuffer = i++;
+GLmethod.bindRenderbuffer = i++;
+GLmethod.bindTexture = i++;
+GLmethod.blendColor = i++;
+GLmethod.blendEquation = i++;
+GLmethod.blendEquationSeparate = i++; //10
+GLmethod.blendFunc = i++;
+GLmethod.blendFuncSeparate = i++;
+GLmethod.bufferData = i++;
+GLmethod.bufferSubData = i++;
+GLmethod.checkFramebufferStatus = i++;
+GLmethod.clear = i++;
+GLmethod.clearColor = i++;
+GLmethod.clearDepth = i++;
+GLmethod.clearStencil = i++;
+GLmethod.colorMask = i++;              //20
+GLmethod.compileShader = i++;
+GLmethod.compressedTexImage2D = i++;
+GLmethod.compressedTexSubImage2D = i++;
+GLmethod.copyTexImage2D = i++;
+GLmethod.copyTexSubImage2D = i++;
+GLmethod.createBuffer = i++;
+GLmethod.createFramebuffer = i++;
+GLmethod.createProgram = i++;
+GLmethod.createRenderbuffer = i++;
+GLmethod.createShader = i++;           //30
+GLmethod.createTexture = i++;
+GLmethod.cullFace = i++;
+GLmethod.deleteBuffer = i++;
+GLmethod.deleteFramebuffer = i++;
+GLmethod.deleteProgram = i++;
+GLmethod.deleteRenderbuffer = i++;
+GLmethod.deleteShader = i++;
+GLmethod.deleteTexture = i++;
+GLmethod.depthFunc = i++;
+GLmethod.depthMask = i++;              //40
+GLmethod.depthRange = i++;
+GLmethod.detachShader = i++;
+GLmethod.disable = i++;
+GLmethod.disableVertexAttribArray = i++;
+GLmethod.drawArrays = i++;
+GLmethod.drawArraysInstancedANGLE = i++;
+GLmethod.drawElements = i++;
+GLmethod.drawElementsInstancedANGLE = i++;
+GLmethod.enable = i++;
+GLmethod.enableVertexAttribArray = i++;    //50
+GLmethod.flush = i++;
+GLmethod.framebufferRenderbuffer = i++;
+GLmethod.framebufferTexture2D = i++;
+GLmethod.frontFace = i++;
+GLmethod.generateMipmap = i++;
+GLmethod.getActiveAttrib = i++;
+GLmethod.getActiveUniform = i++;
+GLmethod.getAttachedShaders = i++;
+GLmethod.getAttribLocation = i++;
+GLmethod.getBufferParameter = i++;         //60
+GLmethod.getContextAttributes = i++;
+GLmethod.getError = i++;
+GLmethod.getExtension = i++;
+GLmethod.getFramebufferAttachmentParameter = i++;
+GLmethod.getParameter = i++;
+GLmethod.getProgramInfoLog = i++;
+GLmethod.getProgramParameter = i++;
+GLmethod.getRenderbufferParameter = i++;
+GLmethod.getShaderInfoLog = i++;
+GLmethod.getShaderParameter = i++;         //70
+GLmethod.getShaderPrecisionFormat = i++;
+GLmethod.getShaderSource = i++;
+GLmethod.getSupportedExtensions = i++;
+GLmethod.getTexParameter = i++;
+GLmethod.getUniform = i++;
+GLmethod.getUniformLocation = i++;
+GLmethod.getVertexAttrib = i++;
+GLmethod.getVertexAttribOffset = i++;
+GLmethod.isBuffer = i++;
+GLmethod.isContextLost = i++;              //80
+GLmethod.isEnabled = i++;
+GLmethod.isFramebuffer = i++;
+GLmethod.isProgram = i++;
+GLmethod.isRenderbuffer = i++;
+GLmethod.isShader = i++;
+GLmethod.isTexture = i++;
+GLmethod.lineWidth = i++;
+GLmethod.linkProgram = i++;
+GLmethod.pixelStorei = i++;
+GLmethod.polygonOffset = i++;              //90
+GLmethod.readPixels = i++;
+GLmethod.renderbufferStorage = i++;
+GLmethod.sampleCoverage = i++;
+GLmethod.scissor = i++;
+GLmethod.shaderSource = i++;
+GLmethod.stencilFunc = i++;
+GLmethod.stencilFuncSeparate = i++;
+GLmethod.stencilMask = i++;
+GLmethod.stencilMaskSeparate = i++;
+GLmethod.stencilOp = i++;                  //100
+GLmethod.stencilOpSeparate = i++;
+GLmethod.texImage2D = i++;
+GLmethod.texParameterf = i++;
+GLmethod.texParameteri = i++;
+GLmethod.texSubImage2D = i++;
+GLmethod.uniform1f = i++;
+GLmethod.uniform1fv = i++;
+GLmethod.uniform1i = i++;
+GLmethod.uniform1iv = i++;
+GLmethod.uniform2f = i++;                  //110
+GLmethod.uniform2fv = i++;
+GLmethod.uniform2i = i++;
+GLmethod.uniform2iv = i++;
+GLmethod.uniform3f = i++;
+GLmethod.uniform3fv = i++;
+GLmethod.uniform3i = i++;
+GLmethod.uniform3iv = i++;
+GLmethod.uniform4f = i++;
+GLmethod.uniform4fv = i++;
+GLmethod.uniform4i = i++;                  //120
+GLmethod.uniform4iv = i++;
+GLmethod.uniformMatrix2fv = i++;
+GLmethod.uniformMatrix3fv = i++;
+GLmethod.uniformMatrix4fv = i++;
+GLmethod.useProgram = i++;
+GLmethod.validateProgram = i++;
+GLmethod.vertexAttrib1f = i++; //new
+GLmethod.vertexAttrib2f = i++; //new
+GLmethod.vertexAttrib3f = i++; //new
+GLmethod.vertexAttrib4f = i++; //new       //130
+GLmethod.vertexAttrib1fv = i++; //new
+GLmethod.vertexAttrib2fv = i++; //new
+GLmethod.vertexAttrib3fv = i++; //new
+GLmethod.vertexAttrib4fv = i++; //new
+GLmethod.vertexAttribPointer = i++;
+GLmethod.viewport = i++;
+
+export default GLmethod;
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLtype.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLtype.js
new file mode 100644
index 0000000..695abcb
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/GLtype.js
@@ -0,0 +1,23 @@
+const GLtype = {};
+
+[
+    "GLbitfield",    
+    "GLboolean",
+    "GLbyte",
+    "GLclampf",
+    "GLenum",
+    "GLfloat",
+    "GLint",
+    "GLintptr",
+    "GLsizei",
+    "GLsizeiptr",
+    "GLshort",
+    "GLubyte",
+    "GLuint",
+    "GLushort"
+].sort().map((typeName, i) => GLtype[typeName] = 1 >> (i + 1));
+
+export default GLtype;
+
+
+
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Program.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Program.js
new file mode 100644
index 0000000..6f5691c
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Program.js
@@ -0,0 +1,21 @@
+import {getTransferedObjectUUID} from './classUtils';
+
+const name = 'WebGLProgram';
+
+function uuid(id) {
+    return getTransferedObjectUUID(name, id);
+}
+
+export default class WebGLProgram {
+    className = name;
+
+    constructor(id) {
+        this.id = id;
+    }
+
+    static uuid = uuid;
+
+    uuid() {
+        return uuid(this.id);
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Renderbuffer.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Renderbuffer.js
new file mode 100644
index 0000000..d3182ae
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Renderbuffer.js
@@ -0,0 +1,21 @@
+import {getTransferedObjectUUID} from './classUtils';
+
+const name = 'WebGLRenderBuffer';
+
+function uuid(id) {
+    return getTransferedObjectUUID(name, id);
+}
+
+export default class WebGLRenderbuffer {
+    className = name;
+
+    constructor(id) {
+        this.id = id;
+    }
+
+    static uuid = uuid;
+
+    uuid() {
+        return uuid(this.id);
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/RenderingContext.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/RenderingContext.js
new file mode 100644
index 0000000..5f9608f
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/RenderingContext.js
@@ -0,0 +1,1191 @@
+import GLenum from './GLenum';
+import ActiveInfo from './ActiveInfo';
+import Buffer from './Buffer';
+import Framebuffer from './Framebuffer';
+import Renderbuffer from './Renderbuffer';
+import Texture from './Texture';
+import Program from './Program';
+import Shader from './Shader';
+import ShaderPrecisionFormat from './ShaderPrecisionFormat';
+import UniformLocation from './UniformLocation';
+import GLmethod from './GLmethod';
+
+const processArray = (array, checkArrayType = false) => {
+
+    function joinArray(arr, sep) {
+        let res = '';
+        for (let i = 0; i < arr.length; i++) {
+            if (i !== 0) {
+                res += sep;
+            }
+            res += arr[i];
+        }
+        return res;
+    }
+
+    let type = 'Float32Array';
+    if (checkArrayType) {
+        if (array instanceof Uint8Array) {
+            type = 'Uint8Array'
+        } else if (array instanceof Uint16Array) {
+            type = 'Uint16Array';
+        } else if (array instanceof Uint32Array) {
+            type = 'Uint32Array';
+        } else if (array instanceof Float32Array) {
+            type = 'Float32Array';
+        } else {
+            throw new Error('Check array type failed. Array type is ' + typeof array);
+        }
+    }
+
+    const ArrayTypes = {
+        Uint8Array: 1,
+        Uint16Array: 2,
+        Uint32Array: 4,
+        Float32Array: 14
+    };
+    return ArrayTypes[type] + ',' + btoa(joinArray(array, ','))
+}
+
+export default class WebGLRenderingContext {
+
+    // static GBridge = null;
+
+    className = 'WebGLRenderingContext';
+
+    constructor(canvas, type, attrs) {
+        this._canvas = canvas;
+        this._type = type;
+        this._version = 'WebGL 1.0';
+        this._attrs = attrs;
+        this._map = new Map();
+
+        Object.keys(GLenum)
+            .forEach(name => Object.defineProperty(this, name, {
+                value: GLenum[name]
+            }));
+    }
+
+    get canvas() {
+        return this._canvas;
+    }
+
+    activeTexture = function (textureUnit) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.activeTexture + ',' + textureUnit,
+            true
+        );
+    }
+
+    attachShader = function (progarm, shader) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.attachShader + ',' + progarm.id + ',' + shader.id,
+            true
+        );
+    }
+
+    bindAttribLocation = function (program, index, name) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.bindAttribLocation + ',' + program.id + ',' + index + ',' + name,
+            true
+        )
+    }
+
+    bindBuffer = function (target, buffer) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.bindBuffer + ',' + target + ',' + (buffer ? buffer.id : 0),
+            true
+        );
+    }
+
+    bindFramebuffer = function (target, framebuffer) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.bindFramebuffer + ',' + target + ',' + (framebuffer ? framebuffer.id : 0),
+            true
+        )
+    }
+
+    bindRenderbuffer = function (target, renderBuffer) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.bindRenderbuffer + ',' + target + ',' + (renderBuffer ? renderBuffer.id : 0),
+            true
+        )
+    }
+
+    bindTexture = function (target, texture) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.bindTexture + ',' + target + ',' + (texture ? texture.id : 0),
+            true
+        )
+    }
+
+    blendColor = function (r, g, b, a) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.blendColor + ',' + target + ',' + r + ',' + g + ',' + b + ',' + a,
+            true
+        )
+    }
+
+    blendEquation = function (mode) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.blendEquation + ',' + mode,
+            true
+        )
+    }
+
+    blendEquationSeparate = function (modeRGB, modeAlpha) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.blendEquationSeparate + ',' + modeRGB + ',' + modeAlpha,
+            true
+        )
+    }
+
+
+    blendFunc = function (sfactor, dfactor) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.blendFunc + ',' + sfactor + ',' + dfactor,
+            true
+        );
+    }
+
+    blendFuncSeparate = function (srcRGB, dstRGB, srcAlpha, dstAlpha) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.blendFuncSeparate + ',' + srcRGB + ',' + dstRGB + ',' + srcAlpha + ',' + dstAlpha,
+            true
+        );
+    }
+
+    bufferData = function (target, data, usage) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.bufferData + ',' + target + ',' + processArray(data, true) + ',' + usage,
+            true
+        )
+    }
+
+    bufferSubData = function (target, offset, data) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.bufferSubData + ',' + target + ',' + offset + ',' + processArray(data, true),
+            true
+        )
+    }
+
+    checkFramebufferStatus = function (target) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.checkFramebufferStatus + ',' + target
+        );
+        return Number(result);
+    }
+
+    clear = function (mask) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.clear + ',' + mask
+        );
+        this._canvas._needRender = true;
+    }
+
+    clearColor = function (r, g, b, a) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.clearColor + ',' + r + ',' + g + ',' + b,
+            true
+        )
+    }
+
+    clearDepth = function (depth) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.clearDepth + ',' + depth,
+            true
+        )
+    }
+
+    clearStencil = function (s) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.clearStencil + ',' + s
+        );
+    }
+
+    colorMask = function (r, g, b, a) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.colorMask + ',' + r + ',' + g + ',' + b + ',' + a
+        )
+    }
+
+    compileShader = function (shader) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.compileShader + ',' + shader.id,
+            true
+        )
+    }
+
+    compressedTexImage2D = function (target, level, internalformat, width, height, border, pixels) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.compressedTexImage2D + ',' + target + ',' + level + ',' + internalformat + ',' +
+            width + ',' + height + ',' + border + ',' + processArray(pixels),
+            true
+        )
+    }
+
+    compressedTexSubImage2D = function (target, level, xoffset, yoffset, width, height, format, pixels) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.compressedTexSubImage2D + ',' + target + ',' + level + ',' + xoffset + ',' + yoffset + ',' +
+            width + ',' + height + ',' + format + ',' + processArray(pixels),
+            true
+        )
+    }
+
+
+    copyTexImage2D = function (target, level, internalformat, x, y, width, height, border) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.copyTexImage2D + ',' + target + ',' + level + ',' + internalformat + ',' + x + ',' + y + ',' +
+            width + ',' + height + ',' + border,
+            true
+        );
+    }
+
+    copyTexSubImage2D = function (target, level, xoffset, yoffset, x, y, width, height) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.copyTexSubImage2D + ',' + target + ',' + level + ',' + xoffset + ',' + yoffset + ',' + x + ',' + y + ',' +
+            width + ',' + height
+        );
+    }
+
+    createBuffer = function () {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.createBuffer + ''
+        );
+        const buffer = new Buffer(result);
+        this._map.set(buffer.uuid(), buffer);
+        return buffer;
+    }
+
+    createFramebuffer = function () {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.createFramebuffer + ''
+        );
+        const framebuffer = new Framebuffer(result);
+        this._map.set(framebuffer.uuid(), framebuffer);
+        return framebuffer;
+    }
+
+
+    createProgram = function () {
+        const id = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.createProgram + ''
+        );
+        const program = new Program(id);
+        this._map.set(program.uuid(), program);
+        return program;
+    }
+
+    createRenderbuffer = function () {
+        const id = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.createRenderbuffer + ''
+        )
+        const renderBuffer = new Renderbuffer(id);
+        this._map.set(renderBuffer.uuid(), renderBuffer);
+        return renderBuffer;
+    }
+
+    createShader = function (type) {
+        const id = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.createShader + ',' + type
+        )
+        const shader = new Shader(id, type);
+        this._map.set(shader.uuid(), shader);
+        return shader;
+    }
+
+    createTexture = function () {
+        const id = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.createTexture + ''
+        );
+        const texture = new Texture(id);
+        this._map.set(texture.uuid(), texture);
+        return texture;
+    }
+
+    cullFace = function (mode) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.cullFace + ',' + mode,
+            true
+        )
+    }
+
+
+    deleteBuffer = function (buffer) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.deleteBuffer + ',' + buffer.id,
+            true
+        )
+    }
+
+    deleteFramebuffer = function (framebuffer) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.deleteFramebuffer + ',' + framebuffer.id,
+            true
+        )
+    }
+
+    deleteProgram = function (program) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.deleteProgram + ',' + program.id,
+            true
+        )
+    }
+
+    deleteRenderbuffer = function (renderbuffer) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.deleteRenderbuffer + ',' + renderbuffer.id,
+            true
+        )
+    }
+
+    deleteShader = function (shader) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.deleteShader + ',' + shader.id,
+            true
+        )
+    }
+
+    deleteTexture = function (texture) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.deleteTexture + ',' + texture.id,
+            true
+        )
+    }
+
+    depthFunc = function (func) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.depthFunc + ',' + func
+        )
+    }
+
+    depthMask = function (flag) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.depthMask + ',' + Number(flag),
+            true
+        )
+    }
+
+    depthRange = function (zNear, zFar) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.depthRange + ',' + zNear + ',' + zFar,
+            true
+        )
+    }
+
+    detachShader = function (program, shader) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.detachShader + ',' + program.id + ',' + shader.id,
+            true
+        )
+    }
+
+    disable = function (cap) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.disable + ',' + cap,
+            true
+        )
+    }
+
+    disableVertexAttribArray = function (index) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.disableVertexAttribArray + ',' + index,
+            true
+        );
+    }
+
+    drawArrays = function (mode, first, count) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.drawArrays + ',' + mode + ',' + first + ',' + count
+        )
+        this._canvas._needRender = true;
+    }
+
+    drawElements = function (mode, count, type, offset) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.drawElements + ',' + mode + ',' + count + ',' + type + ',' + offset + ';'
+        );
+        this._canvas._needRender = true;
+    }
+
+    enable = function (cap) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.enable + ',' + cap,
+            true
+        );
+    }
+
+    enableVertexAttribArray = function (index) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.enableVertexAttribArray + ',' + index,
+            true
+        )
+    }
+
+
+    flush = function () {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.flush + ''
+        )
+    }
+
+    framebufferRenderbuffer = function (target, attachment, textarget, texture, level) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.framebufferRenderbuffer + ',' + target + ',' + attachment + ',' + textarget + ',' + (texture ? texture.id : 0) + ',' + level,
+            true
+        )
+    }
+
+    framebufferTexture2D = function (target, attachment, textarget, texture, level) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.framebufferTexture2D + ',' + target + ',' + attachment + ',' + textarget + ',' + (texture ? texture.id : 0) + ',' + level,
+            true
+        )
+    }
+
+    frontFace = function (mode) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.frontFace + ',' + mode,
+            true
+        )
+    }
+
+    generateMipmap = function (target) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.generateMipmap + ',' + target,
+            true
+        )
+    }
+
+    getActiveAttrib = function (progarm, index) {
+        const resultString = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getActiveAttrib + ',' + progarm.id + ',' + index
+        )
+        const [type, size, name] = resultString.split(',');
+        return new ActiveInfo({
+            type: Number(type),
+            size: Number(size),
+            name
+        });
+    }
+
+    getActiveUniform = function (progarm, index) {
+        const resultString = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getActiveUniform + ',' + progarm.id + ',' + index
+        );
+        const [type, size, name] = resultString.split(',');
+        return new ActiveInfo({
+            type: Number(type),
+            size: Number(size),
+            name
+        })
+    }
+
+    getAttachedShaders = function (progarm) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getAttachedShaders + ',' + progarm.id
+        );
+        const [type, ...ids] = result;
+        return ids.map(id => this._map.get(Shader.uuid(id)));
+    }
+
+    getAttribLocation = function (progarm, name) {
+        return WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getAttribLocation + ',' + progarm.id + ',' + name
+        )
+    }
+
+    getBufferParameter = function (target, pname) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getBufferParameter + ',' + target + ',' + pname
+        );
+        const [type, res] = getBufferParameter;
+        return res;
+    }
+
+    getError = function () {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getError + ''
+        )
+        return result;
+    }
+
+    getExtension = function (name) {
+        return null;
+    }
+
+    getFramebufferAttachmentParameter = function (target, attachment, pname) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getFramebufferAttachmentParameter + ',' + target + ',' + attachment + ',' + pname
+        )
+        switch (pname) {
+            case GLenum.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME:
+                return this._map.get(Renderbuffer.uuid(result)) || this._map.get(Texture.uuid(result)) || null;
+            default:
+                return result;
+        }
+    }
+
+    getParameter = function (pname) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getParameter + ',' + pname
+        )
+        switch (pname) {
+            case GLenum.VERSION:
+                return this._version;
+            case GLenum.ARRAY_BUFFER_BINDING: // buffer
+            case GLenum.ELEMENT_ARRAY_BUFFER_BINDING: // buffer
+                return this._map.get(Buffer.uuid(result)) || null;
+            case GLenum.CURRENT_PROGRAM: // program
+                return this._map.get(Program.uuid(result)) || null;
+            case GLenum.FRAMEBUFFER_BINDING: // framebuffer
+                return this._map.get(Framebuffer.uuid(result)) || null;
+            case GLenum.RENDERBUFFER_BINDING: // renderbuffer
+                return this._map.get(Renderbuffer.uuid(result)) || null;
+            case GLenum.TEXTURE_BINDING_2D: // texture
+            case GLenum.TEXTURE_BINDING_CUBE_MAP: // texture
+                return this._map.get(Texture.uuid(result)) || null;
+            case GLenum.ALIASED_LINE_WIDTH_RANGE: // Float32Array
+            case GLenum.ALIASED_POINT_SIZE_RANGE: // Float32Array
+            case GLenum.BLEND_COLOR: // Float32Array
+            case GLenum.COLOR_CLEAR_VALUE: // Float32Array
+            case GLenum.DEPTH_RANGE: // Float32Array
+            case GLenum.MAX_VIEWPORT_DIMS: // Int32Array
+            case GLenum.SCISSOR_BOX: // Int32Array
+            case GLenum.VIEWPORT: // Int32Array            
+            case GLenum.COMPRESSED_TEXTURE_FORMATS: // Uint32Array
+            default:
+                const [type, ...res] = result.split(',');
+                if (res.length === 1) {
+                    return Number(res[0]);
+                } else {
+                    return res.map(Number);
+                }
+        }
+    }
+
+    getProgramInfoLog = function (progarm) {
+        return WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getProgramInfoLog + ',' + progarm.id
+        )
+    }
+
+    getProgramParameter = function (program, pname) {
+        const res = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getProgramParameter + ',' + program.id + ',' + pname
+        );
+
+        const [type, result] = res.split(',').map(i => parseInt(i));
+
+        if (type === 1) {
+            return Boolean(result);
+        } else if (type === 2) {
+            return result;
+        } else {
+            throw new Error('Unrecongized program paramater ' + res + ', type: ' + typeof res);
+        }
+    }
+
+
+    getRenderbufferParameter = function (target, pname) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getRenderbufferParameter + ',' + target + ',' + pname
+        )
+        return result;
+    }
+
+
+    getShaderInfoLog = function (shader) {
+        return WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getShaderInfoLog + ',' + shader.id
+        );
+    }
+
+    getShaderParameter = function (shader, pname) {
+        return WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getShaderParameter + ',' + shader.id + ',' + pname
+        )
+    }
+
+    getShaderPrecisionFormat = function (shaderType, precisionType) {
+        const [rangeMin, rangeMax, precision] = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getShaderPrecisionFormat + ',' + shaderType + ',' + precisionType
+        );
+        const shaderPrecisionFormat = new ShaderPrecisionFormat({
+            rangeMin: Number(rangeMin),
+            rangeMax: Number(rangeMax),
+            precision: Number(precision)
+        });
+        return shaderPrecisionFormat;
+    }
+
+    getShaderSource = function (shader) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getShaderSource + ',' + shader.id
+        );
+        return result;
+    }
+
+    getSupportedExtensions = function () {
+        return Object.keys({});
+    }
+
+    getTexParameter = function (target, pname) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getTexParameter + ',' + target + ',' + pname
+        )
+        return result;
+    }
+
+    getUniformLocation = function (program, name) {
+        const id = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getUniformLocation + ',' + program.id + ',' + name
+        );
+        if (id === -1) {
+            return null;
+        } else {
+            return new UniformLocation(Number(id));
+        }
+    }
+
+    getVertexAttrib = function (index, pname) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getVertexAttrib + ',' + index + ',' + pname
+        );
+        switch (pname) {
+            case GLenum.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING:
+                return this._map.get(Buffer.uuid(result)) || null;
+            case GLenum.CURRENT_VERTEX_ATTRIB: // Float32Array
+            default:
+                return result;
+        }
+    }
+
+    getVertexAttribOffset = function (index, pname) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.getVertexAttribOffset + ',' + index + ',' + pname
+        )
+        return Number(result);
+    }
+
+    isBuffer = function (buffer) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.isBuffer + ',' + buffer.id
+        )
+        return Boolean(result);
+    }
+
+    isContextLost = function () {
+        return false;
+    }
+
+    isEnabled = function (cap) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.isEnabled + ',' + cap
+        )
+        return Boolean(result);
+    }
+
+    isFramebuffer = function (framebuffer) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.isFramebuffer + ',' + framebuffer.id
+        )
+        return Boolean(result);
+    }
+
+    isProgram = function (program) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.isProgram + ',' + program.id
+        )
+        return Boolean(result);
+    }
+
+    isRenderbuffer = function (renderBuffer) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.isRenderbuffer + ',' + renderbuffer.id
+        )
+        return Boolean(result);
+    }
+
+    isShader = function (shader) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.isShader + ',' + shader.id
+        )
+        return Boolean(result);
+    }
+
+    isTexture = function (texture) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.isTexture + ',' + texture.id
+        );
+        return Boolean(result);
+    }
+
+    lineWidth = function (width) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.lineWidth + ',' + width,
+            true
+        )
+    }
+
+    linkProgram = function (program) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.linkProgram + ',' + program.id,
+            true
+        );
+    }
+
+
+    pixelStorei = function (pname, param) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.pixelStorei + ',' + pname + ',' + Number(param)
+        )
+    }
+
+    polygonOffset = function (factor, units) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.polygonOffset + ',' + factor + ',' + units
+        )
+    }
+
+    readPixels = function (x, y, width, height, format, type, pixels) {
+        const result = WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.readPixels + ',' + x + ',' + y + ',' + width + ',' + height + ',' + format + ',' + type
+        )
+        return result;
+    }
+
+    renderbufferStorage = function (target, internalFormat, width, height) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.renderbufferStorage + ',' + target + ',' + internalFormat + ',' + width + ',' + height,
+            true
+        )
+    }
+
+    sampleCoverage = function (value, invert) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.sampleCoverage + ',' + value + ',' + Number(invert),
+            true
+        )
+    }
+
+    scissor = function (x, y, width, height) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.scissor + ',' + x + ',' + y + ',' + width + ',' + height,
+            true
+        )
+    }
+
+    shaderSource = function (shader, source) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.shaderSource + ',' + shader.id + ',' + source
+        )
+    }
+
+    stencilFunc = function (func, ref, mask) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.stencilFunc + ',' + func + ',' + ref + ',' + mask,
+            true
+        )
+    }
+
+    stencilFuncSeparate = function (face, func, ref, mask) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.stencilFuncSeparate + ',' + face + ',' + func + ',' + ref + ',' + mask,
+            true
+        )
+    }
+
+    stencilMask = function (mask) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.stencilMask + ',' + mask,
+            true
+        )
+    }
+
+    stencilMaskSeparate = function (face, mask) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.stencilMaskSeparate + ',' + face + ',' + mask,
+            true
+        )
+    }
+
+    stencilOp = function (fail, zfail, zpass) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.stencilOp + ',' + fail + ',' + zfail + ',' + zpass
+        )
+    }
+
+    stencilOpSeparate = function (face, fail, zfail, zpass) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.stencilOp + ',' + face + ',' + fail + ',' + zfail + ',' + zpass,
+            true
+        )
+    }
+
+    texImage2D = function (...args) {
+        WebGLRenderingContext.GBridge.texImage2D(this._canvas.id, ...args);
+    }
+
+
+    texParameterf = function (target, pname, param) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.texParameterf + ',' + target + ',' + pname + ',' + param,
+            true
+        )
+    }
+
+    texParameteri = function (target, pname, param) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.texParameteri + ',' + target + ',' + pname + ',' + param
+        )
+    }
+
+    texSubImage2D = function (...args) {
+        WebGLRenderingContext.GBridge.texSubImage2D(this._canvas.id, ...args);
+    }
+
+    uniform1f = function (location, v0) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform1f + ',' + location.id + ',' + v0
+        )
+    }
+
+    uniform1fv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform1fv + ',' + location.id + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniform1i = function (location, v0) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform1i + ',' + location.id + ',' + v0,
+            // true
+        )
+    }
+
+    uniform1iv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform1iv + ',' + location.id + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniform2f = function (location, v0, v1) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform2f + ',' + location.id + ',' + v0 + ',' + v1,
+            true
+        )
+    }
+
+    uniform2fv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform2fv + ',' + location.id + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniform2i = function (location, v0, v1) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform2i + ',' + location.id + ',' + v0 + ',' + v1,
+            true
+        )
+    }
+
+    uniform2iv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform2iv + ',' + location.id + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniform3f = function (location, v0, v1, v2) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform3f + ',' + location.id + ',' + v0 + ',' + v1 + ',' + v2,
+            true
+        )
+    }
+
+    uniform3fv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform3fv + ',' + location.id + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniform3i = function (location, v0, v1, v2) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform3i + ',' + location.id + ',' + v0 + ',' + v1 + ',' + v2,
+            true
+        )
+    }
+
+    uniform3iv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform3iv + ',' + location.id + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniform4f = function (location, v0, v1, v2, v3) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform4f + ',' + location.id + ',' + v0 + ',' + v1 + ',' + v2 + ',' + v3,
+            true
+        )
+    }
+
+    uniform4fv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform4fv + ',' + location.id + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniform4i = function (location, v0, v1, v2, v3) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform4i + ',' + location.id + ',' + v0 + ',' + v1 + ',' + v2 + ',' + v3,
+            true
+        )
+    }
+
+    uniform4iv = function (location, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniform4iv + ',' + location.id + ',' + processArray(value, true),
+            true
+        )
+    }
+
+    uniformMatrix2fv = function (location, transpose, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniformMatrix2fv + ',' + location.id + ',' + Number(transpose) + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniformMatrix3fv = function (location, transpose, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniformMatrix3fv + ',' + location.id + ',' + Number(transpose) + ',' + processArray(value),
+            true
+        )
+    }
+
+    uniformMatrix4fv = function (location, transpose, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.uniformMatrix4fv + ',' + location.id + ',' + Number(transpose) + ',' + processArray(value),
+            true
+        );
+    }
+
+    useProgram = function (progarm) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.useProgram + ',' + progarm.id + '',
+            true
+        )
+    }
+
+
+    validateProgram = function (program) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.validateProgram + ',' + program.id,
+            true
+        )
+    }
+
+    vertexAttrib1f = function (index, v0) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib1f + ',' + index + ',' + v0,
+            true
+        )
+    }
+
+    vertexAttrib2f = function (index, v0, v1) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib2f + ',' + index + ',' + v0 + ',' + v1,
+            true
+        )
+    }
+
+    vertexAttrib3f = function (index, v0, v1, v2) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib3f + ',' + index + ',' + v0 + ',' + v1 + ',' + v2,
+            true
+        )
+    }
+
+    vertexAttrib4f = function (index, v0, v1, v2, v3) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib4f + ',' + index + ',' + v0 + ',' + v1 + ',' + v2 + ',' + v3,
+            true
+        )
+    }
+
+    vertexAttrib1fv = function (index, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib1fv + ',' + index + ',' + processArray(value),
+            true
+        )
+    }
+
+    vertexAttrib2fv = function (index, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib2fv + ',' + index + ',' + processArray(value),
+            true
+        )
+    }
+
+    vertexAttrib3fv = function (index, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib3fv + ',' + index + ',' + processArray(value),
+            true
+        )
+    }
+
+    vertexAttrib4fv = function (index, value) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttrib4fv + ',' + index + ',' + processArray(value),
+            true
+        )
+    }
+
+    vertexAttribPointer = function (index, size, type, normalized, stride, offset) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.vertexAttribPointer + ',' + index + ',' + size + ',' + type + ',' + Number(normalized) + ',' + stride + ',' + offset,
+            true
+        )
+    }
+
+    viewport = function (x, y, width, height) {
+        WebGLRenderingContext.GBridge.callNative(
+            this._canvas.id,
+            GLmethod.viewport + ',' + x + ',' + y + ',' + width + ',' + height,
+            true
+        )
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Shader.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Shader.js
new file mode 100644
index 0000000..a763886
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Shader.js
@@ -0,0 +1,22 @@
+import {getTransferedObjectUUID} from './classUtils';
+
+const name = 'WebGLShader';
+
+function uuid(id) {
+    return getTransferedObjectUUID(name, id);
+}
+
+export default class WebGLShader {
+    className = name;
+
+    constructor(id, type) {
+        this.id = id;
+        this.type = type;
+    }
+
+    static uuid = uuid;
+
+    uuid() {
+        return uuid(this.id);
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ShaderPrecisionFormat.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ShaderPrecisionFormat.js
new file mode 100644
index 0000000..208d6c1
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/ShaderPrecisionFormat.js
@@ -0,0 +1,11 @@
+export default class WebGLShaderPrecisionFormat {
+    className = 'WebGLShaderPrecisionFormat';
+
+    constructor({
+        rangeMin, rangeMax, precision
+    }) {
+        this.rangeMin = rangeMin;
+        this.rangeMax = rangeMax;
+        this.precision = precision;
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Texture.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Texture.js
new file mode 100644
index 0000000..de4d806
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/Texture.js
@@ -0,0 +1,22 @@
+import {getTransferedObjectUUID} from './classUtils';
+
+const name = 'WebGLTexture';
+
+function uuid(id) {
+    return getTransferedObjectUUID(name, id);
+}
+
+export default class WebGLTexture {
+    className = name;
+
+    constructor(id, type) {
+        this.id = id;
+        this.type = type;
+    }
+
+    static uuid = uuid;
+
+    uuid() {
+        return uuid(this.id);
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/UniformLocation.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/UniformLocation.js
new file mode 100644
index 0000000..f5e99dc
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/UniformLocation.js
@@ -0,0 +1,22 @@
+import {getTransferedObjectUUID} from './classUtils';
+
+const name = 'WebGLUniformLocation';
+
+function uuid(id) {
+    return getTransferedObjectUUID(name, id);
+}
+
+export default class WebGLUniformLocation {
+    className = name;
+
+    constructor(id, type) {
+        this.id = id;
+        this.type = type;
+    }
+
+    static uuid = uuid;
+
+    uuid() {
+        return uuid(this.id);
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/classUtils.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/classUtils.js
new file mode 100644
index 0000000..88716be
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/context-webgl/classUtils.js
@@ -0,0 +1,3 @@
+export function getTransferedObjectUUID(name, id) {
+    return `${name.toLowerCase()}-${id}`;
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/canvas.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/canvas.js
new file mode 100644
index 0000000..a8d9bb9
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/canvas.js
@@ -0,0 +1,74 @@
+import GContext2D from '../context-2d/RenderingContext';
+import GContextWebGL from '../context-webgl/RenderingContext';
+
+export default class GCanvas {
+
+    // static GBridge = null;
+
+    id = null;
+
+    _needRender = true;
+
+    constructor(id, { disableAutoSwap }) {
+        this.id = id;
+
+        this._disableAutoSwap = disableAutoSwap;
+        if (disableAutoSwap) {
+            this._swapBuffers = () => {
+                GCanvas.GBridge.render(this.id);
+            }
+        }
+    }
+
+    getContext(type) {
+
+        let context = null;
+
+        if (type.match(/webgl/i)) {
+            context = new GContextWebGL(this);
+
+            context.componentId = this.id;
+
+            if (!this._disableAutoSwap) {
+                const render = () => {
+                    if (this._needRender) {
+                        GCanvas.GBridge.render(this.id);
+                        this._needRender = false;
+                    }
+                }
+                setInterval(render, 16);
+            }
+
+            GCanvas.GBridge.callSetContextType(this.id, 1); // 0 for 2d; 1 for webgl
+        } else if (type.match(/2d/i)) {
+            context = new GContext2D(this);
+
+            context.componentId = this.id;
+
+//             const render = ( callback ) => {
+// 
+//                 const commands = context._drawCommands;
+//                 context._drawCommands = '';
+// 
+//                 GCanvas.GBridge.render2d(this.id, commands, callback);
+//                 this._needRender = false;
+//             }
+// 			//draw方法触发
+// 			context._flush = render;
+//             //setInterval(render, 16);
+
+            GCanvas.GBridge.callSetContextType(this.id, 0);
+        } else {
+            throw new Error('not supported context ' + type);
+        }
+
+        return context;
+
+    }
+
+    reset() {
+        GCanvas.GBridge.callReset(this.id);
+    }
+
+
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/image.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/image.js
new file mode 100644
index 0000000..9499a51
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/image.js
@@ -0,0 +1,96 @@
+let incId = 1;
+
+const noop = function () { };
+
+class GImage {
+
+    static GBridge = null;
+
+    constructor() {
+        this._id = incId++;
+        this._width = 0;
+        this._height = 0;
+        this._src = undefined;
+        this._onload = noop;
+        this._onerror = noop;
+        this.complete = false;
+    }
+
+    get width() {
+        return this._width;
+    }
+    set width(v) {
+        this._width = v;
+    }
+
+    get height() {
+        return this._height;
+    }
+
+    set height(v) {
+        this._height = v;
+    }
+
+    get src() {
+        return this._src;
+    }
+
+    set src(v) {
+
+        if (v.startsWith('//')) {
+            v = 'http:' + v;
+        }
+
+        this._src = v;
+
+        GImage.GBridge.perloadImage([this._src, this._id], (data) => {
+            if (typeof data === 'string') {
+                data = JSON.parse(data);
+            }
+            if (data.error) {
+                var evt = { type: 'error', target: this };
+                this.onerror(evt);
+            } else {
+                this.complete = true;
+                this.width = typeof data.width === 'number' ? data.width : 0;
+                this.height = typeof data.height === 'number' ? data.height : 0;
+                var evt = { type: 'load', target: this };
+                this.onload(evt);
+            }
+        });
+    }
+
+    addEventListener(name, listener) {
+        if (name === 'load') {
+            this.onload = listener;
+        } else if (name === 'error') {
+            this.onerror = listener;
+        }
+    }
+
+    removeEventListener(name, listener) {
+        if (name === 'load') {
+            this.onload = noop;
+        } else if (name === 'error') {
+            this.onerror = noop;
+        }
+    }
+
+    get onload() {
+        return this._onload;
+    }
+
+    set onload(v) {
+        this._onload = v;
+    }
+
+    get onerror() {
+        return this._onerror;
+    }
+
+    set onerror(v) {
+        this._onerror = v;
+    }
+}
+
+export default GImage;
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/tool.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/tool.js
new file mode 100644
index 0000000..d3fb398
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/env/tool.js
@@ -0,0 +1,24 @@
+
+export function ArrayBufferToBase64 (buffer) {
+    var binary = '';
+    var bytes = new Uint8ClampedArray(buffer);
+    for (var len = bytes.byteLength, i = 0; i < len; i++) {
+        binary += String.fromCharCode(bytes[i]);
+    }
+    return btoa(binary);
+}
+	
+export function Base64ToUint8ClampedArray(base64String) {
+	const padding = '='.repeat((4 - base64String.length % 4) % 4);
+	const base64 = (base64String + padding)
+		.replace(/\-/g, '+')
+		.replace(/_/g, '/');
+
+	const rawData = atob(base64);
+	const outputArray = new Uint8ClampedArray(rawData.length);
+
+	for (let i = 0; i < rawData.length; ++i) {
+		outputArray[i] = rawData.charCodeAt(i);
+	}
+	return outputArray;
+}
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/index.js b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/index.js
new file mode 100644
index 0000000..a34ad58
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/gcanvas/index.js
@@ -0,0 +1,39 @@
+import GCanvas from './env/canvas';
+import GImage from './env/image';
+
+import GWebGLRenderingContext from './context-webgl/RenderingContext';
+import GContext2D from './context-2d/RenderingContext';
+
+import GBridgeWeex from './bridge/bridge-weex';
+
+export let Image = GImage;
+
+export let WeexBridge = GBridgeWeex;
+
+export function enable(el, { bridge, debug, disableAutoSwap, disableComboCommands } = {}) {
+
+    const GBridge = GImage.GBridge = GCanvas.GBridge = GWebGLRenderingContext.GBridge = GContext2D.GBridge = bridge;
+
+    GBridge.callEnable(el.ref, [
+        0,      // renderMode: 0--RENDERMODE_WHEN_DIRTY, 1--RENDERMODE_CONTINUOUSLY
+        -1,     // hybridLayerType:  0--LAYER_TYPE_NONE 1--LAYER_TYPE_SOFTWARE 2--LAYER_TYPE_HARDWARE
+        false,  // supportScroll
+        false,  // newCanvasMode
+        1,      // compatible
+        'white',// clearColor
+        false   // sameLevel: newCanvasMode = true && true => GCanvasView and Webview is same level
+    ]);
+
+    if (debug === true) {
+        GBridge.callEnableDebug();
+    }
+    if (disableComboCommands) {
+        GBridge.callEnableDisableCombo();
+    }
+
+    var canvas = new GCanvas(el.ref, { disableAutoSwap });
+    canvas.width = el.style.width;
+    canvas.height = el.style.height;
+
+    return canvas;
+};
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js b/uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js
new file mode 100644
index 0000000..2290ab3
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js
@@ -0,0 +1,34 @@
+//---------------------------------------------------------------------
+// uQRCode二维码生成插件 v4.0.6
+// 
+// uQRCode是一款基于Javascript环境开发的二维码生成插件，适用所有Javascript运行环境的前端应用和Node.js。
+// 
+// Copyright (c) Sansnn uQRCode All rights reserved.
+// 
+// Licensed under the Apache License, Version 2.0.
+//   http://www.apache.org/licenses/LICENSE-2.0
+// 
+// github地址：
+//   https://github.com/Sansnn/uQRCode
+// 
+// npm地址：
+//   https://www.npmjs.com/package/uqrcodejs
+// 
+// uni-app插件市场地址：
+//   https://ext.dcloud.net.cn/plugin?id=1287
+// 
+// 复制使用请保留本段注释，感谢支持开源！
+// 
+//---------------------------------------------------------------------
+
+//---------------------------------------------------------------------
+// 当前文件格式为 es，将 bundle 保留为 ES 模块文件，适用于其他打包工具以及支持 <script type=module> 标签的浏览器（别名: esm，module）
+// 如需在其他环境使用，请获取环境对应的格式文件
+// 格式说明：
+// amd - 异步模块定义，适用于 RequireJS 等模块加载器
+// cjs - CommonJS，适用于 Node 环境和其他打包工具（别名：commonjs）
+// es - 将 bundle 保留为 ES 模块文件，适用于其他打包工具以及支持 <script type=module> 标签的浏览器（别名: esm，module）
+// umd - 通用模块定义，生成的包同时支持 amd、cjs 和 iife 三种格式
+//---------------------------------------------------------------------
+
+function o(o){this.mode=r.MODE_8BIT_BYTE,this.data=o;}function e(o,e){this.typeNumber=o,this.errorCorrectLevel=e,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=new Array;}o.prototype={getLength:function(o){return this.data.length},write:function(o){for(var e=0;e<this.data.length;e++)o.put(this.data.charCodeAt(e),8);}},e.prototype={addData:function(e){var r=new o(e);this.dataList.push(r),this.dataCache=null;},isDark:function(o,e){if(o<0||this.moduleCount<=o||e<0||this.moduleCount<=e)throw new Error(o+","+e);return this.modules[o][e]},getModuleCount:function(){return this.moduleCount},make:function(){if(this.typeNumber<1){var o=1;for(o=1;o<40;o++){for(var e=v.getRSBlocks(o,this.errorCorrectLevel),r=new p,t=0,i=0;i<e.length;i++)t+=e[i].dataCount;for(i=0;i<this.dataList.length;i++){var n=this.dataList[i];r.put(n.mode,4),r.put(n.getLength(),h.getLengthInBits(n.mode,o)),n.write(r);}if(r.getLengthInBits()<=8*t)break}this.typeNumber=o;}this.makeImpl(!1,this.getBestMaskPattern());},makeImpl:function(o,r){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var t=0;t<this.moduleCount;t++){this.modules[t]=new Array(this.moduleCount);for(var i=0;i<this.moduleCount;i++)this.modules[t][i]=null;}this.setupPositionProbePattern(0,0),this.setupPositionProbePattern(this.moduleCount-7,0),this.setupPositionProbePattern(0,this.moduleCount-7),this.setupPositionAdjustPattern(),this.setupTimingPattern(),this.setupTypeInfo(o,r),this.typeNumber>=7&&this.setupTypeNumber(o),null==this.dataCache&&(this.dataCache=e.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,r);},setupPositionProbePattern:function(o,e){for(var r=-1;r<=7;r++)if(!(o+r<=-1||this.moduleCount<=o+r))for(var t=-1;t<=7;t++)e+t<=-1||this.moduleCount<=e+t||(this.modules[o+r][e+t]=0<=r&&r<=6&&(0==t||6==t)||0<=t&&t<=6&&(0==r||6==r)||2<=r&&r<=4&&2<=t&&t<=4);},getBestMaskPattern:function(){for(var o=0,e=0,r=0;r<8;r++){this.makeImpl(!0,r);var t=h.getLostPoint(this);(0==r||o>t)&&(o=t,e=r);}return e},createMovieClip:function(o,e,r){var t=o.createEmptyMovieClip(e,r);this.make();for(var i=0;i<this.modules.length;i++)for(var n=1*i,a=0;a<this.modules[i].length;a++){var d=1*a;this.modules[i][a]&&(t.beginFill(0,100),t.moveTo(d,n),t.lineTo(d+1,n),t.lineTo(d+1,n+1),t.lineTo(d,n+1),t.endFill());}return t},setupTimingPattern:function(){for(var o=8;o<this.moduleCount-8;o++)null==this.modules[o][6]&&(this.modules[o][6]=o%2==0);for(var e=8;e<this.moduleCount-8;e++)null==this.modules[6][e]&&(this.modules[6][e]=e%2==0);},setupPositionAdjustPattern:function(){for(var o=h.getPatternPosition(this.typeNumber),e=0;e<o.length;e++)for(var r=0;r<o.length;r++){var t=o[e],i=o[r];if(null==this.modules[t][i])for(var n=-2;n<=2;n++)for(var a=-2;a<=2;a++)this.modules[t+n][i+a]=-2==n||2==n||-2==a||2==a||0==n&&0==a;}},setupTypeNumber:function(o){for(var e=h.getBCHTypeNumber(this.typeNumber),r=0;r<18;r++){var t=!o&&1==(e>>r&1);this.modules[Math.floor(r/3)][r%3+this.moduleCount-8-3]=t;}for(r=0;r<18;r++){t=!o&&1==(e>>r&1);this.modules[r%3+this.moduleCount-8-3][Math.floor(r/3)]=t;}},setupTypeInfo:function(o,e){for(var r=this.errorCorrectLevel<<3|e,t=h.getBCHTypeInfo(r),i=0;i<15;i++){var n=!o&&1==(t>>i&1);i<6?this.modules[i][8]=n:i<8?this.modules[i+1][8]=n:this.modules[this.moduleCount-15+i][8]=n;}for(i=0;i<15;i++){n=!o&&1==(t>>i&1);i<8?this.modules[8][this.moduleCount-i-1]=n:i<9?this.modules[8][15-i-1+1]=n:this.modules[8][15-i-1]=n;}this.modules[this.moduleCount-8][8]=!o;},mapData:function(o,e){for(var r=-1,t=this.moduleCount-1,i=7,n=0,a=this.moduleCount-1;a>0;a-=2)for(6==a&&a--;;){for(var d=0;d<2;d++)if(null==this.modules[t][a-d]){var u=!1;n<o.length&&(u=1==(o[n]>>>i&1)),h.getMask(e,t,a-d)&&(u=!u),this.modules[t][a-d]=u,-1==--i&&(n++,i=7);}if((t+=r)<0||this.moduleCount<=t){t-=r,r=-r;break}}}},e.PAD0=236,e.PAD1=17,e.createData=function(o,r,t){for(var i=v.getRSBlocks(o,r),n=new p,a=0;a<t.length;a++){var d=t[a];n.put(d.mode,4),n.put(d.getLength(),h.getLengthInBits(d.mode,o)),d.write(n);}var u=0;for(a=0;a<i.length;a++)u+=i[a].dataCount;if(n.getLengthInBits()>8*u)throw new Error("code length overflow. ("+n.getLengthInBits()+">"+8*u+")");for(n.getLengthInBits()+4<=8*u&&n.put(0,4);n.getLengthInBits()%8!=0;)n.putBit(!1);for(;!(n.getLengthInBits()>=8*u||(n.put(e.PAD0,8),n.getLengthInBits()>=8*u));)n.put(e.PAD1,8);return e.createBytes(n,i)},e.createBytes=function(o,e){for(var r=0,t=0,i=0,n=new Array(e.length),a=new Array(e.length),d=0;d<e.length;d++){var u=e[d].dataCount,s=e[d].totalCount-u;t=Math.max(t,u),i=Math.max(i,s),n[d]=new Array(u);for(var g=0;g<n[d].length;g++)n[d][g]=255&o.buffer[g+r];r+=u;var l=h.getErrorCorrectPolynomial(s),c=new f(n[d],l.getLength()-1).mod(l);a[d]=new Array(l.getLength()-1);for(g=0;g<a[d].length;g++){var m=g+c.getLength()-a[d].length;a[d][g]=m>=0?c.get(m):0;}}var v=0;for(g=0;g<e.length;g++)v+=e[g].totalCount;var p=new Array(v),C=0;for(g=0;g<t;g++)for(d=0;d<e.length;d++)g<n[d].length&&(p[C++]=n[d][g]);for(g=0;g<i;g++)for(d=0;d<e.length;d++)g<a[d].length&&(p[C++]=a[d][g]);return p};for(var r={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},t={L:1,M:0,Q:3,H:2},i=0,n=1,a=2,d=3,u=4,s=5,g=6,l=7,h={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(o){for(var e=o<<10;h.getBCHDigit(e)-h.getBCHDigit(h.G15)>=0;)e^=h.G15<<h.getBCHDigit(e)-h.getBCHDigit(h.G15);return (o<<10|e)^h.G15_MASK},getBCHTypeNumber:function(o){for(var e=o<<12;h.getBCHDigit(e)-h.getBCHDigit(h.G18)>=0;)e^=h.G18<<h.getBCHDigit(e)-h.getBCHDigit(h.G18);return o<<12|e},getBCHDigit:function(o){for(var e=0;0!=o;)e++,o>>>=1;return e},getPatternPosition:function(o){return h.PATTERN_POSITION_TABLE[o-1]},getMask:function(o,e,r){switch(o){case i:return (e+r)%2==0;case n:return e%2==0;case a:return r%3==0;case d:return (e+r)%3==0;case u:return (Math.floor(e/2)+Math.floor(r/3))%2==0;case s:return e*r%2+e*r%3==0;case g:return (e*r%2+e*r%3)%2==0;case l:return (e*r%3+(e+r)%2)%2==0;default:throw new Error("bad maskPattern:"+o)}},getErrorCorrectPolynomial:function(o){for(var e=new f([1],0),r=0;r<o;r++)e=e.multiply(new f([1,c.gexp(r)],0));return e},getLengthInBits:function(o,e){if(1<=e&&e<10)switch(o){case r.MODE_NUMBER:return 10;case r.MODE_ALPHA_NUM:return 9;case r.MODE_8BIT_BYTE:case r.MODE_KANJI:return 8;default:throw new Error("mode:"+o)}else if(e<27)switch(o){case r.MODE_NUMBER:return 12;case r.MODE_ALPHA_NUM:return 11;case r.MODE_8BIT_BYTE:return 16;case r.MODE_KANJI:return 10;default:throw new Error("mode:"+o)}else {if(!(e<41))throw new Error("type:"+e);switch(o){case r.MODE_NUMBER:return 14;case r.MODE_ALPHA_NUM:return 13;case r.MODE_8BIT_BYTE:return 16;case r.MODE_KANJI:return 12;default:throw new Error("mode:"+o)}}},getLostPoint:function(o){for(var e=o.getModuleCount(),r=0,t=0;t<e;t++)for(var i=0;i<e;i++){for(var n=0,a=o.isDark(t,i),d=-1;d<=1;d++)if(!(t+d<0||e<=t+d))for(var u=-1;u<=1;u++)i+u<0||e<=i+u||0==d&&0==u||a==o.isDark(t+d,i+u)&&n++;n>5&&(r+=3+n-5);}for(t=0;t<e-1;t++)for(i=0;i<e-1;i++){var s=0;o.isDark(t,i)&&s++,o.isDark(t+1,i)&&s++,o.isDark(t,i+1)&&s++,o.isDark(t+1,i+1)&&s++,0!=s&&4!=s||(r+=3);}for(t=0;t<e;t++)for(i=0;i<e-6;i++)o.isDark(t,i)&&!o.isDark(t,i+1)&&o.isDark(t,i+2)&&o.isDark(t,i+3)&&o.isDark(t,i+4)&&!o.isDark(t,i+5)&&o.isDark(t,i+6)&&(r+=40);for(i=0;i<e;i++)for(t=0;t<e-6;t++)o.isDark(t,i)&&!o.isDark(t+1,i)&&o.isDark(t+2,i)&&o.isDark(t+3,i)&&o.isDark(t+4,i)&&!o.isDark(t+5,i)&&o.isDark(t+6,i)&&(r+=40);var g=0;for(i=0;i<e;i++)for(t=0;t<e;t++)o.isDark(t,i)&&g++;return r+=10*(Math.abs(100*g/e/e-50)/5)}},c={glog:function(o){if(o<1)throw new Error("glog("+o+")");return c.LOG_TABLE[o]},gexp:function(o){for(;o<0;)o+=255;for(;o>=256;)o-=255;return c.EXP_TABLE[o]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},m=0;m<8;m++)c.EXP_TABLE[m]=1<<m;for(m=8;m<256;m++)c.EXP_TABLE[m]=c.EXP_TABLE[m-4]^c.EXP_TABLE[m-5]^c.EXP_TABLE[m-6]^c.EXP_TABLE[m-8];for(m=0;m<255;m++)c.LOG_TABLE[c.EXP_TABLE[m]]=m;function f(o,e){if(null==o.length)throw new Error(o.length+"/"+e);for(var r=0;r<o.length&&0==o[r];)r++;this.num=new Array(o.length-r+e);for(var t=0;t<o.length-r;t++)this.num[t]=o[t+r];}function v(o,e){this.totalCount=o,this.dataCount=e;}function p(){this.buffer=new Array,this.length=0;}function C(o){return o.setFillStyle=o.setFillStyle||function(e){o.fillStyle=e;},o.setFontSize=o.setFontSize||function(e){o.font=`${e}px`;},o.setTextAlign=o.setTextAlign||function(e){o.textAlign=e;},o.setTextBaseline=o.setTextBaseline||function(e){o.textBaseline=e;},o.setGlobalAlpha=o.setGlobalAlpha||function(e){o.globalAlpha=e;},o.setStrokeStyle=o.setStrokeStyle||function(e){o.strokeStyle=e;},o.setShadow=o.setShadow||function(e,r,t,i){o.shadowOffsetX=e,o.shadowOffsetY=r,o.shadowBlur=t,o.shadowColor=i;},o.draw=o.draw||function(o,e){e&&e();},o.clearRect=o.clearRect||function(e,r,t,i){o.draw(!1);},o}function b(o,e){var r=this.data="",t=this.size=200;this.useDynamicSize=!1,this.dynamicSize=t;var i=this.typeNumber=-1;this.errorCorrectLevel=b.errorCorrectLevel.H;var n=this.margin=0;this.areaColor="#FFFFFF",this.backgroundColor="rgba(255,255,255,0)",this.backgroundImageSrc=void 0;var a=this.backgroundImageWidth=void 0,d=this.backgroundImageHeight=void 0,u=this.backgroundImageX=void 0,s=this.backgroundImageY=void 0;this.backgroundImageAlpha=1,this.backgroundImageBorderRadius=0;var g=this.backgroundPadding=0;this.foregroundColor="#000000",this.foregroundImageSrc=void 0;var l=this.foregroundImageWidth=void 0,h=this.foregroundImageHeight=void 0,c=this.foregroundImageX=void 0,m=this.foregroundImageY=void 0,f=this.foregroundImagePadding=0;this.foregroundImageBackgroundColor="#FFFFFF";var v=this.foregroundImageBorderRadius=0,p=this.foregroundImageShadowOffsetX=0,k=this.foregroundImageShadowOffsetY=0,y=this.foregroundImageShadowBlur=0;this.foregroundImageShadowColor="#808080";var w=this.foregroundPadding=0,I=this.positionProbeBackgroundColor=void 0,B=this.positionProbeForegroundColor=void 0,S=this.separatorColor=void 0,P=this.positionAdjustBackgroundColor=void 0,L=this.positionAdjustForegroundColor=void 0,D=this.timingBackgroundColor=void 0,A=this.timingForegroundColor=void 0,E=this.typeNumberBackgroundColor=void 0,T=this.typeNumberForegroundColor=void 0,N=this.darkBlockColor=void 0;this.base=void 0,this.modules=[],this.moduleCount=0,this.drawModules=[];var M=this.canvasContext=void 0;this.loadImage,this.drawReserve=!1,this.isMaked=!1,Object.defineProperties(this,{data:{get(){if(""===r||void 0===r)throw console.error("[uQRCode]: data must be set!"),new b.Error("data must be set!");return r},set(o){r=String(o);}},size:{get:()=>t,set(o){t=Number(o);}},typeNumber:{get:()=>i,set(o){i=Number(o);}},margin:{get:()=>n,set(o){n=Number(o);}},backgroundImageWidth:{get(){return void 0===a?this.dynamicSize:this.useDynamicSize?this.dynamicSize/this.size*a:a},set(o){a=Number(o);}},backgroundImageHeight:{get(){return void 0===d?this.dynamicSize:this.useDynamicSize?this.dynamicSize/this.size*d:d},set(o){d=Number(o);}},backgroundImageX:{get(){return void 0===u?0:this.useDynamicSize?this.dynamicSize/this.size*u:u},set(o){u=Number(o);}},backgroundImageY:{get(){return void 0===s?0:this.useDynamicSize?this.dynamicSize/this.size*s:s},set(o){s=Number(o);}},backgroundPadding:{get:()=>g,set(o){g=o>1?1:o<0?0:o;}},foregroundImageWidth:{get(){return void 0===l?(this.dynamicSize-2*this.margin)/4:this.useDynamicSize?this.dynamicSize/this.size*l:l},set(o){l=Number(o);}},foregroundImageHeight:{get(){return void 0===h?(this.dynamicSize-2*this.margin)/4:this.useDynamicSize?this.dynamicSize/this.size*h:h},set(o){h=Number(o);}},foregroundImageX:{get(){return void 0===c?this.dynamicSize/2-this.foregroundImageWidth/2:this.useDynamicSize?this.dynamicSize/this.size*c:c},set(o){c=Number(o);}},foregroundImageY:{get(){return void 0===m?this.dynamicSize/2-this.foregroundImageHeight/2:this.useDynamicSize?this.dynamicSize/this.size*m:m},set(o){m=Number(o);}},foregroundImagePadding:{get(){return this.useDynamicSize?this.dynamicSize/this.size*f:f},set(o){f=Number(o);}},foregroundImageBorderRadius:{get(){return this.useDynamicSize?this.dynamicSize/this.size*v:v},set(o){v=Number(o);}},foregroundImageShadowOffsetX:{get(){return this.useDynamicSize?this.dynamicSize/this.size*p:p},set(o){p=Number(o);}},foregroundImageShadowOffsetY:{get(){return this.useDynamicSize?this.dynamicSize/this.size*k:k},set(o){k=Number(o);}},foregroundImageShadowBlur:{get(){return this.useDynamicSize?this.dynamicSize/this.size*y:y},set(o){y=Number(o);}},foregroundPadding:{get:()=>w,set(o){w=o>1?1:o<0?0:o;}},positionProbeBackgroundColor:{get(){return I||this.backgroundColor},set(o){I=o;}},positionProbeForegroundColor:{get(){return B||this.foregroundColor},set(o){B=o;}},separatorColor:{get(){return S||this.backgroundColor},set(o){S=o;}},positionAdjustBackgroundColor:{get(){return P||this.backgroundColor},set(o){P=o;}},positionAdjustForegroundColor:{get(){return L||this.foregroundColor},set(o){L=o;}},timingBackgroundColor:{get(){return D||this.backgroundColor},set(o){D=o;}},timingForegroundColor:{get(){return A||this.foregroundColor},set(o){A=o;}},typeNumberBackgroundColor:{get(){return E||this.backgroundColor},set(o){E=o;}},typeNumberForegroundColor:{get(){return T||this.foregroundColor},set(o){T=o;}},darkBlockColor:{get(){return N||this.foregroundColor},set(o){N=o;}},canvasContext:{get(){if(void 0===M)throw console.error("[uQRCode]: use drawCanvas, you need to set the canvasContext!"),new b.Error("use drawCanvas, you need to set the canvasContext!");return M},set(o){M=C(o);}}}),b.plugins.forEach((o=>o(b,this,!1))),o&&this.setOptions(o),e&&(this.canvasContext=C(e));}f.prototype={get:function(o){return this.num[o]},getLength:function(){return this.num.length},multiply:function(o){for(var e=new Array(this.getLength()+o.getLength()-1),r=0;r<this.getLength();r++)for(var t=0;t<o.getLength();t++)e[r+t]^=c.gexp(c.glog(this.get(r))+c.glog(o.get(t)));return new f(e,0)},mod:function(o){if(this.getLength()-o.getLength()<0)return this;for(var e=c.glog(this.get(0))-c.glog(o.get(0)),r=new Array(this.getLength()),t=0;t<this.getLength();t++)r[t]=this.get(t);for(t=0;t<o.getLength();t++)r[t]^=c.gexp(c.glog(o.get(t))+e);return new f(r,0).mod(o)}},v.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],v.getRSBlocks=function(o,e){var r=v.getRsBlockTable(o,e);if(null==r)throw new Error("bad rs block @ typeNumber:"+o+"/errorCorrectLevel:"+e);for(var t=r.length/3,i=new Array,n=0;n<t;n++)for(var a=r[3*n+0],d=r[3*n+1],u=r[3*n+2],s=0;s<a;s++)i.push(new v(d,u));return i},v.getRsBlockTable=function(o,e){switch(e){case t.L:return v.RS_BLOCK_TABLE[4*(o-1)+0];case t.M:return v.RS_BLOCK_TABLE[4*(o-1)+1];case t.Q:return v.RS_BLOCK_TABLE[4*(o-1)+2];case t.H:return v.RS_BLOCK_TABLE[4*(o-1)+3];default:return}},p.prototype={get:function(o){var e=Math.floor(o/8);return 1==(this.buffer[e]>>>7-o%8&1)},put:function(o,e){for(var r=0;r<e;r++)this.putBit(1==(o>>>e-r-1&1));},getLengthInBits:function(){return this.length},putBit:function(o){var e=Math.floor(this.length/8);this.buffer.length<=e&&this.buffer.push(0),o&&(this.buffer[e]|=128>>>this.length%8),this.length++;}},e.errorCorrectLevel=t,b.errorCorrectLevel=e.errorCorrectLevel,b.Error=function(o){this.errMsg="[uQRCode]: "+o;},b.plugins=[],b.use=function(o){"function"==typeof o&&b.plugins.push(o);},b.prototype.loadImage=function(o){return Promise.resolve(o)},b.prototype.setOptions=function(o){var e,r,t,i,n,a,d,u,s,g,l,h,c,m,f,v,p,C,b,k,y,w,I,B,S,P,L,D,A,E,T,N,M,z,R,_,O,F,x,H,X,Y,j,W,G,K,Q,U,$,J,q,V,Z,oo,eo,ro;o&&(Object.keys(o).forEach((e=>{this[e]=o[e];})),function(o={},e={},r=!1){let t;t=r?o:{...o};for(let o in e){var i=e[o];null!=i&&(i.constructor==Object?t[o]=this.deepReplace(t[o],i):i.constructor!=String||i?t[o]=i:t[o]=t[o]);}}(this,{data:o.data||o.text,size:o.size,useDynamicSize:o.useDynamicSize,typeNumber:o.typeNumber,errorCorrectLevel:o.errorCorrectLevel,margin:o.margin,areaColor:o.areaColor,backgroundColor:o.backgroundColor||(null===(e=o.background)||void 0===e?void 0:e.color),backgroundImageSrc:o.backgroundImageSrc||(null===(r=o.background)||void 0===r||null===(t=r.image)||void 0===t?void 0:t.src),backgroundImageWidth:o.backgroundImageWidth||(null===(i=o.background)||void 0===i||null===(n=i.image)||void 0===n?void 0:n.width),backgroundImageHeight:o.backgroundImageHeight||(null===(a=o.background)||void 0===a||null===(d=a.image)||void 0===d?void 0:d.height),backgroundImageX:o.backgroundImageX||(null===(u=o.background)||void 0===u||null===(s=u.image)||void 0===s?void 0:s.x),backgroundImageY:o.backgroundImageY||(null===(g=o.background)||void 0===g||null===(l=g.image)||void 0===l?void 0:l.y),backgroundImageAlpha:o.backgroundImageAlpha||(null===(h=o.background)||void 0===h||null===(c=h.image)||void 0===c?void 0:c.alpha),backgroundImageBorderRadius:o.backgroundImageBorderRadius||(null===(m=o.background)||void 0===m||null===(f=m.image)||void 0===f?void 0:f.borderRadius),backgroundPadding:o.backgroundPadding,foregroundColor:o.foregroundColor||(null===(v=o.foreground)||void 0===v?void 0:v.color),foregroundImageSrc:o.foregroundImageSrc||(null===(p=o.foreground)||void 0===p||null===(C=p.image)||void 0===C?void 0:C.src),foregroundImageWidth:o.foregroundImageWidth||(null===(b=o.foreground)||void 0===b||null===(k=b.image)||void 0===k?void 0:k.width),foregroundImageHeight:o.foregroundImageHeight||(null===(y=o.foreground)||void 0===y||null===(w=y.image)||void 0===w?void 0:w.height),foregroundImageX:o.foregroundImageX||(null===(I=o.foreground)||void 0===I||null===(B=I.image)||void 0===B?void 0:B.x),foregroundImageY:o.foregroundImageY||(null===(S=o.foreground)||void 0===S||null===(P=S.image)||void 0===P?void 0:P.y),foregroundImagePadding:o.foregroundImagePadding||(null===(L=o.foreground)||void 0===L||null===(D=L.image)||void 0===D?void 0:D.padding),foregroundImageBackgroundColor:o.foregroundImageBackgroundColor||(null===(A=o.foreground)||void 0===A||null===(E=A.image)||void 0===E?void 0:E.backgroundColor),foregroundImageBorderRadius:o.foregroundImageBorderRadius||(null===(T=o.foreground)||void 0===T||null===(N=T.image)||void 0===N?void 0:N.borderRadius),foregroundImageShadowOffsetX:o.foregroundImageShadowOffsetX||(null===(M=o.foreground)||void 0===M||null===(z=M.image)||void 0===z?void 0:z.shadowOffsetX),foregroundImageShadowOffsetY:o.foregroundImageShadowOffsetY||(null===(R=o.foreground)||void 0===R||null===(_=R.image)||void 0===_?void 0:_.shadowOffsetY),foregroundImageShadowBlur:o.foregroundImageShadowBlur||(null===(O=o.foreground)||void 0===O||null===(F=O.image)||void 0===F?void 0:F.shadowBlur),foregroundImageShadowColor:o.foregroundImageShadowColor||(null===(x=o.foreground)||void 0===x||null===(H=x.image)||void 0===H?void 0:H.shadowColor),foregroundPadding:o.foregroundPadding,positionProbeBackgroundColor:o.positionProbeBackgroundColor||(null===(X=o.positionProbe)||void 0===X?void 0:X.backgroundColor)||(null===(Y=o.positionDetection)||void 0===Y?void 0:Y.backgroundColor),positionProbeForegroundColor:o.positionProbeForegroundColor||(null===(j=o.positionProbe)||void 0===j?void 0:j.foregroundColor)||(null===(W=o.positionDetection)||void 0===W?void 0:W.foregroundColor),separatorColor:o.separatorColor||(null===(G=o.separator)||void 0===G?void 0:G.color),positionAdjustBackgroundColor:o.positionAdjustBackgroundColor||(null===(K=o.positionAdjust)||void 0===K?void 0:K.backgroundColor)||(null===(Q=o.alignment)||void 0===Q?void 0:Q.backgroundColor),positionAdjustForegroundColor:o.positionAdjustForegroundColor||(null===(U=o.positionAdjust)||void 0===U?void 0:U.foregroundColor)||(null===($=o.alignment)||void 0===$?void 0:$.foregroundColor),timingBackgroundColor:o.timingBackgroundColor||(null===(J=o.timing)||void 0===J?void 0:J.backgroundColor),timingForegroundColor:o.timingForegroundColor||(null===(q=o.timing)||void 0===q?void 0:q.foregroundColor),typeNumberBackgroundColor:o.typeNumberBackgroundColor||(null===(V=o.typeNumber)||void 0===V?void 0:V.backgroundColor)||(null===(Z=o.versionInformation)||void 0===Z?void 0:Z.backgroundColor),typeNumberForegroundColor:o.typeNumberForegroundColor||(null===(oo=o.typeNumber)||void 0===oo?void 0:oo.foregroundColor)||(null===(eo=o.versionInformation)||void 0===eo?void 0:eo.foregroundColor),darkBlockColor:o.darkBlockColor||(null===(ro=o.darkBlock)||void 0===ro?void 0:ro.color)},!0));},b.prototype.make=function(){let{foregroundColor:o,backgroundColor:r,typeNumber:t,errorCorrectLevel:i,data:n,size:a,margin:d,useDynamicSize:u}=this;if(o===r)throw console.error("[uQRCode]: foregroundColor and backgroundColor cannot be the same!"),new b.Error("foregroundColor and backgroundColor cannot be the same!");var s=new e(t,i);s.addData(function(o){o=o.toString();for(var e,r="",t=0;t<o.length;t++)(e=o.charCodeAt(t))>=1&&e<=127?r+=o.charAt(t):e>2047?(r+=String.fromCharCode(224|e>>12&15),r+=String.fromCharCode(128|e>>6&63),r+=String.fromCharCode(128|e>>0&63)):(r+=String.fromCharCode(192|e>>6&31),r+=String.fromCharCode(128|e>>0&63));return r}(n)),s.make(),this.base=s,this.typeNumber=s.typeNumber,this.modules=s.modules,this.moduleCount=s.moduleCount,this.dynamicSize=u?Math.ceil((a-2*d)/s.moduleCount)*s.moduleCount+2*d:a,function(o){let{dynamicSize:e,margin:r,backgroundColor:t,backgroundPadding:i,foregroundColor:n,foregroundPadding:a,modules:d,moduleCount:u}=o,s=(e-2*r)/u,g=s,l=0;i>0&&(l=g*i/2,g-=2*l);let h=s,c=0;a>0&&(c=h*a/2,h-=2*c);for(var m=0;m<u;m++)for(var f=0;f<u;f++){var v=f*s+r,p=m*s+r;if(d[m][f]){var C=c,b=v+c,k=p+c,y=h,w=h;d[m][f]={type:["foreground"],color:n,isBlack:!0,isDrawn:!1,destX:v,destY:p,destWidth:s,destHeight:s,x:b,y:k,width:y,height:w,paddingTop:C,paddingRight:C,paddingBottom:C,paddingLeft:C};}else C=l,b=v+l,k=p+l,y=g,w=g,d[m][f]={type:["background"],color:t,isBlack:!1,isDrawn:!1,destX:v,destY:p,destWidth:s,destHeight:s,x:b,y:k,width:y,height:w,paddingTop:C,paddingRight:C,paddingBottom:C,paddingLeft:C};}}(this),function(o){let{modules:e,moduleCount:r,positionProbeBackgroundColor:t,positionProbeForegroundColor:i}=o,n=r-7;[[0,0,1],[1,0,1],[2,0,1],[3,0,1],[4,0,1],[5,0,1],[6,0,1],[0,1,1],[1,1,0],[2,1,0],[3,1,0],[4,1,0],[5,1,0],[6,1,1],[0,2,1],[1,2,0],[2,2,1],[3,2,1],[4,2,1],[5,2,0],[6,2,1],[0,3,1],[1,3,0],[2,3,1],[3,3,1],[4,3,1],[5,3,0],[6,3,1],[0,4,1],[1,4,0],[2,4,1],[3,4,1],[4,4,1],[5,4,0],[6,4,1],[0,5,1],[1,5,0],[2,5,0],[3,5,0],[4,5,0],[5,5,0],[6,5,1],[0,6,1],[1,6,1],[2,6,1],[3,6,1],[4,6,1],[5,6,1],[6,6,1]].forEach((o=>{var r=e[o[0]][o[1]],a=e[o[0]+n][o[1]],d=e[o[0]][o[1]+n];d.type.push("positionProbe"),a.type.push("positionProbe"),r.type.push("positionProbe"),r.color=1==o[2]?i:t,a.color=1==o[2]?i:t,d.color=1==o[2]?i:t;}));}(this),function(o){let{modules:e,moduleCount:r,separatorColor:t}=o;[[7,0],[7,1],[7,2],[7,3],[7,4],[7,5],[7,6],[7,7],[0,7],[1,7],[2,7],[3,7],[4,7],[5,7],[6,7]].forEach((o=>{var i=e[o[0]][o[1]],n=e[r-o[0]-1][o[1]],a=e[o[0]][r-o[1]-1];a.type.push("separator"),n.type.push("separator"),i.type.push("separator"),i.color=t,n.color=t,a.color=t;}));}(this),function(o){let{typeNumber:e,modules:r,moduleCount:t,foregroundColor:i,backgroundColor:n,positionAdjustForegroundColor:a,positionAdjustBackgroundColor:d,timingForegroundColor:u,timingBackgroundColor:s}=o;const g=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]][e-1];if(g){const o=[[-2,-2,1],[-1,-2,1],[0,-2,1],[1,-2,1],[2,-2,1],[-2,-1,1],[-1,-1,0],[0,-1,0],[1,-1,0],[2,-1,1],[-2,0,1],[-1,0,0],[0,0,1],[1,0,0],[2,0,1],[-2,1,1],[-1,1,0],[0,1,0],[1,1,0],[2,1,1],[-2,2,1],[-1,2,1],[0,2,1],[1,2,1],[2,2,1]],e=g.length;for(let l=0;l<e;l++)for(let h=0;h<e;h++){let{x:e,y:c}={x:g[l],y:g[h]};e<9&&c<9||e>t-9-1&&c<9||c>t-9-1&&e<9||o.forEach((o=>{var t=r[e+o[0]][c+o[1]];t.type.push("positionAdjust"),t.type.includes("timing")?1==o[2]?t.color=a==i?u:a:t.color=a==i&&d==n?s:d:t.color=1==o[2]?a:d;}));}}}(this),function(o){let{modules:e,moduleCount:r,timingForegroundColor:t,timingBackgroundColor:i}=o,n=r-16;for(let o=0;o<n;o++){var a=e[6][8+o],d=e[8+o][6];a.type.push("timing"),d.type.push("timing"),a.color=1&o^1?t:i,d.color=1&o^1?t:i;}}(this),function(o){let{modules:e,moduleCount:r,darkBlockColor:t}=o;var i=e[r-7-1][8];i.type.push("darkBlock"),i.color=t;}(this),function(o){let{typeNumber:e,modules:r,moduleCount:t,typeNumberBackgroundColor:i,typeNumberForegroundColor:n}=o;if(e<7)return r;const a=[0,0,0,0,0,0,0,"000111110010010100","001000010110111100","001001101010011001","001010010011010011","001011101111110110","001100011101100010","001101100001000111","001110011000001101","001111100100101000","010000101101111000","010001010001011101","010010101000010111","010011010100110010","010100100110100110","010101011010000011","010110100011001001","010111011111101100","011000111011000100","011001000111100001","011010111110101011","011011000010001110","011100110000011010","011101001100111111","011110110101110101","011111001001010000","100000100111010101","100001011011110000","100010100010111010","100011011110011111","100100101100001011","100101010000101110","100110101001100100","100111010101000001","101000110001101001"];let d=a[e]+a[e],u=[t-11,t-10,t-9];[[5,u[2]],[5,u[1]],[5,u[0]],[4,u[2]],[4,u[1]],[4,u[0]],[3,u[2]],[3,u[1]],[3,u[0]],[2,u[2]],[2,u[1]],[2,u[0]],[1,u[2]],[1,u[1]],[1,u[0]],[0,u[2]],[0,u[1]],[0,u[0]],[u[2],5],[u[1],5],[u[0],5],[u[2],4],[u[1],4],[u[0],4],[u[2],3],[u[1],3],[u[0],3],[u[2],2],[u[1],2],[u[0],2],[u[2],1],[u[1],1],[u[0],1],[u[2],0],[u[1],0],[u[0],0]].forEach(((o,e)=>{var t=r[o[0]][o[1]];t.type.push("typeNumber"),t.color="1"==d[e]?n:i;}));}(this),this.isMaked=!0,this.drawModules=[];},b.prototype.getDrawModules=function(){if(this.drawModules&&this.drawModules.length>0)return this.drawModules;let o=this.drawModules=[],{modules:e,moduleCount:r,dynamicSize:t,areaColor:i,backgroundImageSrc:n,backgroundImageX:a,backgroundImageY:d,backgroundImageWidth:u,backgroundImageHeight:s,backgroundImageAlpha:g,backgroundImageBorderRadius:l,foregroundImageSrc:h,foregroundImageX:c,foregroundImageY:m,foregroundImageWidth:f,foregroundImageHeight:v,foregroundImagePadding:p,foregroundImageBackgroundColor:C,foregroundImageBorderRadius:b,foregroundImageShadowOffsetX:k,foregroundImageShadowOffsetY:y,foregroundImageShadowBlur:w,foregroundImageShadowColor:I}=this;i&&o.push({name:"area",type:"area",color:i,x:0,y:0,width:t,height:t}),n&&o.push({name:"backgroundImage",type:"image",imageSrc:n,mappingName:"backgroundImageSrc",x:a,y:d,width:u,height:s,alpha:g,borderRadius:l});for(var B=0;B<r;B++)for(var S=0;S<r;S++){var P=e[B][S];P.isDrawn||(P.type.includes("foreground")?o.push({name:"foreground",type:"tile",color:P.color,destX:P.destX,destY:P.destY,destWidth:P.destWidth,destHeight:P.destHeight,x:P.x,y:P.y,width:P.width,height:P.height,paddingTop:P.paddingTop,paddingRight:P.paddingRight,paddingBottom:P.paddingBottom,paddingLeft:P.paddingLeft,rowIndex:B,colIndex:S}):o.push({name:"background",type:"tile",color:P.color,destX:P.destX,destY:P.destY,destWidth:P.destWidth,destHeight:P.destHeight,x:P.x,y:P.y,width:P.width,height:P.height,paddingTop:P.paddingTop,paddingRight:P.paddingRight,paddingBottom:P.paddingBottom,paddingLeft:P.paddingLeft,rowIndex:B,colIndex:S}),P.isDrawn=!0);}return h&&o.push({name:"foregroundImage",type:"image",imageSrc:h,mappingName:"foregroundImageSrc",x:c,y:m,width:f,height:v,padding:p,backgroundColor:C,borderRadius:b,shadowOffsetX:k,shadowOffsetY:y,shadowBlur:w,shadowColor:I}),o},b.prototype.isBlack=function(o,e){var r=this.moduleCount;return !(0>o||0>e||o>=r||e>=r)&&this.modules[o][e].isBlack},b.prototype.drawCanvas=function(){let{isMaked:o,canvasContext:e,useDynamicSize:r,dynamicSize:t,foregroundColor:i,foregroundPadding:n,backgroundColor:a,backgroundPadding:d,drawReserve:u,margin:s}=this;if(!o)return console.error("[uQRCode]: please execute the make method first!"),Promise.reject(new b.Error("please execute the make method first!"));let g=this.getDrawModules(),l=async(o,r)=>{try{e.clearRect(0,0,t,t),e.draw(!1);for(var i=0;i<g.length;i++){var n=g[i];switch(e.save(),n.type){case"area":e.setFillStyle(n.color),e.fillRect(n.x,n.y,n.width,n.height);break;case"tile":var a=n.x,d=n.y,s=n.width,l=n.height;e.setFillStyle(n.color),e.fillRect(a,d,s,l);break;case"image":if("backgroundImage"===n.name){a=Math.round(n.x),d=Math.round(n.y),s=Math.round(n.width),l=Math.round(n.height);s<2*(c=Math.round(n.borderRadius))&&(c=s/2),l<2*c&&(c=l/2),e.setGlobalAlpha(n.alpha),c>0&&(e.beginPath(),e.moveTo(a+c,d),e.arcTo(a+s,d,a+s,d+l,c),e.arcTo(a+s,d+l,a,d+l,c),e.arcTo(a,d+l,a,d,c),e.arcTo(a,d,a+s,d,c),e.closePath(),e.setStrokeStyle("rgba(0,0,0,0)"),e.stroke(),e.clip());try{var h=await this.loadImage(n.imageSrc);e.drawImage(h,a,d,s,l);}catch(o){throw console.error(`[uQRCode]: ${n.mappingName} invalid!`),new b.Error(`${n.mappingName} invalid!`)}}else if("foregroundImage"===n.name){a=Math.round(n.x),d=Math.round(n.y),s=Math.round(n.width),l=Math.round(n.height);var c,m=Math.round(n.padding);s<2*(c=Math.round(n.borderRadius))&&(c=s/2),l<2*c&&(c=l/2);var f=a-m,v=d-m,p=s+2*m,C=l+2*m,k=Math.round(p/s*c);p<2*k&&(k=p/2),C<2*k&&(k=C/2),e.save(),e.setShadow(n.shadowOffsetX,n.shadowOffsetY,n.shadowBlur,n.shadowColor),k>0?(e.beginPath(),e.moveTo(f+k,v),e.arcTo(f+p,v,f+p,v+C,k),e.arcTo(f+p,v+C,f,v+C,k),e.arcTo(f,v+C,f,v,k),e.arcTo(f,v,f+p,v,k),e.closePath(),e.setFillStyle(n.backgroundColor),e.fill()):(e.setFillStyle(n.backgroundColor),e.fillRect(f,v,p,C)),e.restore(),e.save(),k>0?(e.beginPath(),e.moveTo(f+k,v),e.arcTo(f+p,v,f+p,v+C,k),e.arcTo(f+p,v+C,f,v+C,k),e.arcTo(f,v+C,f,v,k),e.arcTo(f,v,f+p,v,k),e.closePath(),e.setFillStyle(m>0?n.backgroundColor:"rgba(0,0,0,0)"),e.fill()):(e.setFillStyle(m>0?n.backgroundColor:"rgba(0,0,0,0)"),e.fillRect(f,v,p,C)),e.restore(),c>0&&(e.beginPath(),e.moveTo(a+c,d),e.arcTo(a+s,d,a+s,d+l,c),e.arcTo(a+s,d+l,a,d+l,c),e.arcTo(a,d+l,a,d,c),e.arcTo(a,d,a+s,d,c),e.closePath(),e.setStrokeStyle("rgba(0,0,0,0)"),e.stroke(),e.clip());try{h=await this.loadImage(n.imageSrc);e.drawImage(h,a,d,s,l);}catch(o){throw console.error(`[uQRCode]: ${n.mappingName} invalid!`),new b.Error(`${n.mappingName} invalid!`)}}}u&&e.draw(!0),e.restore();}e.draw(!0),setTimeout(o,150);}catch(o){if(!(o instanceof b.Error))throw o;r(o);}};return new Promise(((o,e)=>{l(o,e);}))},b.prototype.draw=function(){return this.drawCanvas()},b.prototype.register=function(o){o&&o(b,this,!0);};export{b as default};
\ No newline at end of file
diff --git a/uni_modules/Sansnn-uQRCode/package.json b/uni_modules/Sansnn-uQRCode/package.json
new file mode 100644
index 0000000..af2df9e
--- /dev/null
+++ b/uni_modules/Sansnn-uQRCode/package.json
@@ -0,0 +1,79 @@
+{
+  "id": "Sansnn-uQRCode",
+  "displayName": "uQRCode 全端二维码生成插件 支持nvue 支持nodejs服务端",
+  "version": "4.0.6",
+  "description": "uQRCode是一款基于Javascript环境开发的二维码生成插件，适用所有Javascript运行环境的前端应用和Node.js。",
+  "keywords": [
+    "二维码",
+    "uQRCode",
+    "qrcode",
+    "qr"
+],
+  "repository": "https://github.com/Sansnn/uQRCode",
+"engines": {
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/uqrcodejs",
+    "type": "sdk-js"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/utils/encrypt copy.js b/utils/encrypt copy.js
new file mode 100644
index 0000000..5841fcb
--- /dev/null
+++ b/utils/encrypt copy.js	
@@ -0,0 +1,45 @@
+import CryptoJS from "crypto-js";
+
+// 十六位十六进制数作为密钥
+const SECRET_KEY = CryptoJS.enc.Utf8.parse("xiaoyout!#@12345");
+// 十六位十六进制数作为密钥偏移量
+const SECRET_IV = CryptoJS.enc.Utf8.parse("xiaoyout!#@12345");
+/**
+ * 加密方法
+ * @param data
+ * @returns {string}
+ */
+export function encrypt(data) {
+  if (typeof data === "object") {
+    try {
+      // eslint-disable-next-line no-param-reassign
+      data = JSON.stringify(data);
+    } catch (error) {
+      console.log("encrypt error:", error);
+    }
+  }
+  const dataHex = CryptoJS.enc.Utf8.parse(data);
+  const encrypted = CryptoJS.AES.encrypt(dataHex, SECRET_KEY, {
+    iv: SECRET_IV,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  });
+  return encrypted.ciphertext.toString();
+}
+
+/**
+ * 解密方法
+ * @param data
+ * @returns {string}
+ */
+export function decrypt(data) {
+  const encryptedHexStr = CryptoJS.enc.Hex.parse(data);
+  const str = CryptoJS.enc.Base64.stringify(encryptedHexStr);
+  const decrypt = CryptoJS.AES.decrypt(str, SECRET_KEY, {
+    iv: SECRET_IV,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  });
+  const decryptedStr = decrypt.toString(CryptoJS.enc.Utf8);
+  return decryptedStr.toString();
+}
\ No newline at end of file
diff --git a/utils/encrypt.js b/utils/encrypt.js
new file mode 100644
index 0000000..82a7bc4
--- /dev/null
+++ b/utils/encrypt.js
@@ -0,0 +1,25 @@
+import CryptoJS from 'crypto-js';
+
+// AES 加密密钥
+const AES_KEY = 'xiaoyout!#@12345'; // 这里使用一个固定的密钥，实际应用中建议使用更安全的密钥管理方式
+
+// AES 加密函数
+export function aesEncrypt(data) {
+  const key = CryptoJS.enc.Utf8.parse(AES_KEY);
+  const encrypted = CryptoJS.AES.encrypt(data, key, {
+    mode: CryptoJS.mode.ECB,
+    padding: CryptoJS.pad.Pkcs7
+  });
+  return encrypted.toString();
+}
+
+// AES 解密函数
+export function aesDecrypt(encryptedData) {
+  const key = CryptoJS.enc.Utf8.parse(AES_KEY);
+  const decrypted = CryptoJS.AES.decrypt(encryptedData, key, {
+    mode: CryptoJS.mode.ECB,
+    padding: CryptoJS.pad.Pkcs7
+  });
+  return decrypted.toString(CryptoJS.enc.Utf8);
+} 
+
diff --git a/utils/faceVerify.js b/utils/faceVerify.js
new file mode 100644
index 0000000..338f515
--- /dev/null
+++ b/utils/faceVerify.js
@@ -0,0 +1,28 @@
+/**
+ * 前往人脸核验
+ */
+export function toBaiduApi(vm) {
+  vm.$u.api.getAPIToken().then((res) => {
+    const token = res.result.verify_token;
+
+    // 获取当前域名
+    const currentDomain = window.location.origin;
+
+    // 编码回调URL - 使用相对路径，让uni-app处理路由
+    // 百度人脸核验会在回调URL后附加verify_result和verify_info参数
+    const successUrl = encodeURIComponent(
+      `${currentDomain}/#/pages/login/recognitionResult/recognitionResult?token=${token}`
+    );
+    const failedUrl = encodeURIComponent(
+      `${currentDomain}/#/pages/login/recognitionResult/recognitionFailed?token=${token}`
+    );
+
+    // 构建跳转URL
+    const verifyUrl = `https://brain.baidu.com/face/print/verify/verify?token=${token}&successUrl=${successUrl}&failedUrl=${failedUrl}`;
+
+    console.log("跳转到百度人脸核验页面:", verifyUrl);
+
+    // 直接跳转到百度人脸核验页面
+    window.location.href = verifyUrl;
+  });
+}
diff --git a/uview-ui/LICENSE b/uview-ui/LICENSE
new file mode 100644
index 0000000..8e39ead
--- /dev/null
+++ b/uview-ui/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 www.uviewui.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/uview-ui/README.md b/uview-ui/README.md
new file mode 100644
index 0000000..06d5676
--- /dev/null
+++ b/uview-ui/README.md
@@ -0,0 +1,106 @@
+<p align="center">
+    <img alt="logo" src="https://uviewui.com/common/logo.png" width="120" height="120" style="margin-bottom: 10px;">
+</p>
+<h3 align="center" style="margin: 30px 0 30px;font-weight: bold;font-size:40px;">uView</h3>
+<h3 align="center">多平台快速开发的UI框架</h3>
+
+
+## 说明
+
+uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水
+
+## 特性
+
+- 兼容安卓，iOS，微信小程序，H5，QQ小程序，百度小程序，支付宝小程序，头条小程序
+- 60+精选组件，功能丰富，多端兼容，让您快速集成，开箱即用
+- 众多贴心的JS利器，让您飞镖在手，召之即来，百步穿杨
+- 众多的常用页面和布局，让您专注逻辑，事半功倍
+- 详尽的文档支持，现代化的演示效果
+- 按需引入，精简打包体积
+
+
+## 安装
+
+```bash
+# npm方式安装
+npm i uview-ui
+```
+
+## 快速上手
+
+1. `main.js`引入uView库
+```js
+// main.js
+import uView from 'uview-ui';
+Vue.use(uView);
+```
+
+2. `App.vue`引入基础样式(注意style标签需声明scss属性支持)
+```css
+/* App.vue */
+<style lang="scss">
+@import "uview-ui/index.scss";
+</style>
+```
+
+3. `uni.scss`引入全局scss变量文件
+```css
+/* uni.scss */
+@import "uview-ui/theme.scss";
+```
+
+4. `pages.json`配置easycom规则(按需引入)
+
+```js
+// pages.json
+{
+	"easycom": {
+		// npm安装的方式不需要前面的"@/"，下载安装的方式需要"@/"
+		// npm安装方式
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+		// 下载安装方式
+		// "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+	},
+	// 此为本身已有的内容
+	"pages": [
+		// ......
+	]
+}
+```
+
+请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容 
+
+## 使用方法
+配置easycom规则后，自动按需引入，无需`import`组件，直接引用即可。
+
+```html
+<template>
+	<u-button>按钮</u-button>
+</template>
+```
+
+请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容 
+
+## 链接
+
+- [官方文档](https://uviewui.com/)
+- [更新日志](https://uviewui.com/components/changelog.html)
+- [升级指南](https://uviewui.com/components/changelog.html)
+- [关于我们](https://uviewui.com/cooperation/about.html)
+
+## 预览
+
+您可以通过**微信**扫码，查看最佳的演示效果。
+<br>
+<br>
+<img src="https://uviewui.com/common/weixin_mini_qrcode.png" width="220" height="220" >
+
+<!-- ## 捐赠uView的研发
+
+uView文档和源码全部开源免费，如果您认为uView帮到了您的开发工作，您可以捐赠uView的研发工作，捐赠无门槛，哪怕是一杯可乐也好(相信这比打赏主播更有意义)。
+
+<img src="https://uviewui.com/common/wechat.png" width="220" >
+<img style="margin-left: 100px;" src="https://uviewui.com/common/alipay.png" width="220" >
+ -->
+## 版权信息
+uView遵循[MIT](https://en.wikipedia.org/wiki/MIT_License)开源协议，意味着您无需支付任何费用，也无需授权，即可将uView应用到您的产品中。
diff --git a/uview-ui/components/u-action-sheet/u-action-sheet.vue b/uview-ui/components/u-action-sheet/u-action-sheet.vue
new file mode 100644
index 0000000..722b668
--- /dev/null
+++ b/uview-ui/components/u-action-sheet/u-action-sheet.vue
@@ -0,0 +1,190 @@
+<template>
+	<u-popup mode="bottom" :border-radius="borderRadius" :popup="false" v-model="value" :maskCloseAble="maskCloseAble"
+	    length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :z-index="uZIndex">
+		<view class="u-tips u-border-bottom" v-if="tips.text" :style="[tipsStyle]">
+			{{tips.text}}
+		</view>
+		<block v-for="(item, index) in list" :key="index">
+			<view 
+				@touchmove.stop.prevent 
+				@tap="itemClick(index)" 
+				:style="[itemStyle(index)]" 
+				class="u-action-sheet-item u-line-1" 
+				:class="[index < list.length - 1 ? 'u-border-bottom' : '']"
+				:hover-stay-time="150"
+			>
+				<text>{{item.text}}</text>
+				<text class="u-action-sheet-item__subtext u-line-1" v-if="item.subText">{{item.subText}}</text>
+			</view>
+		</block>
+		<view class="u-gab" v-if="cancelBtn">
+		</view>
+		<view @touchmove.stop.prevent class="u-actionsheet-cancel u-action-sheet-item" hover-class="u-hover-class"
+		    :hover-stay-time="150" v-if="cancelBtn" @tap="close">{{cancelText}}</view>
+	</u-popup>
+</template>
+
+<script>
+	/**
+	 * actionSheet 操作菜单
+	 * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
+	 * @tutorial https://www.uviewui.com/components/actionSheet.html
+	 * @property {Array<Object>} list 按钮的文字数组，见官方文档示例
+	 * @property {Object} tips 顶部的提示文字，见官方文档示例
+	 * @property {String} cancel-text 取消按钮的提示文字
+	 * @property {Boolean} cancel-btn 是否显示底部的取消按钮（默认true）
+	 * @property {Number String} border-radius 弹出部分顶部左右的圆角值，单位rpx（默认0）
+	 * @property {Boolean} mask-close-able 点击遮罩是否可以关闭（默认true）
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+	 * @property {Number String} z-index z-index值（默认1075）
+	 * @property {String} cancel-text 取消按钮的提示文字
+	 * @event {Function} click 点击ActionSheet列表项时触发
+	 * @event {Function} close 点击取消按钮时触发
+	 * @example <u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
+	 */
+	export default {
+		name: "u-action-sheet",
+		props: {
+			// 点击遮罩是否可以关闭actionsheet
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 按钮的文字数组，可以自定义颜色和字体大小，字体单位为rpx
+			list: {
+				type: Array,
+				default () {
+					// 如下
+					// return [{
+					// 	text: '确定',
+					// 	color: '',
+					// 	fontSize: ''
+					// }]
+					return [];
+				}
+			},
+			// 顶部的提示文字
+			tips: {
+				type: Object,
+				default () {
+					return {
+						text: '',
+						color: '',
+						fontSize: '26'
+					}
+				}
+			},
+			// 底部的取消按钮
+			cancelBtn: {
+				type: Boolean,
+				default: true
+			},
+			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 通过双向绑定控制组件的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 弹出的顶部圆角值
+			borderRadius: {
+				type: [String, Number],
+				default: 0
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			},
+			// 取消按钮的文字提示
+			cancelText: {
+				type: String,
+				default: '取消'
+			}
+		},
+		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 = '#c0c4cc';
+					return style;
+				}
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		methods: {
+			// 点击取消按钮
+			close() {
+				// 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
+				// 这是一个vue发送事件的特殊用法
+				this.popupClose();
+				this.$emit('close');
+			},
+			// 弹窗关闭
+			popupClose() {
+				this.$emit('input', false);
+			},
+			// 点击某一个item
+			itemClick(index) {
+				// disabled的项禁止点击
+				if(this.list[index].disabled) return;
+				this.$emit('click', index);
+				this.$emit('input', false);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-tips {
+		font-size: 26rpx;
+		text-align: center;
+		padding: 34rpx 0;
+		line-height: 1;
+		color: $u-tips-color;
+	}
+
+	.u-action-sheet-item {
+		@include vue-flex;;
+		line-height: 1;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		padding: 34rpx 0;
+		flex-direction: column;
+	}
+	
+	.u-action-sheet-item__subtext {
+		font-size: 24rpx;
+		color: $u-tips-color;
+		margin-top: 20rpx;
+	}
+
+	.u-gab {
+		height: 12rpx;
+		background-color: rgb(234, 234, 236);
+	}
+
+	.u-actionsheet-cancel {
+		color: $u-main-color;
+	}
+</style>
diff --git a/uview-ui/components/u-alert-tips/u-alert-tips.vue b/uview-ui/components/u-alert-tips/u-alert-tips.vue
new file mode 100644
index 0000000..e81fc37
--- /dev/null
+++ b/uview-ui/components/u-alert-tips/u-alert-tips.vue
@@ -0,0 +1,256 @@
+<template>
+	<view class="u-alert-tips" v-if="show" :class="[
+		!show ? 'u-close-alert-tips': '',
+		type ? 'u-alert-tips--bg--' + type + '-light' : '',
+		type ? 'u-alert-tips--border--' + type + '-disabled' : '',
+	]" :style="{
+		backgroundColor: bgColor,
+		borderColor: borderColor
+	}">
+		<view class="u-icon-wrap">
+			<u-icon v-if="showIcon" :name="uIcon" :size="description ? 40 : 32" class="u-icon" :color="uIconType" :custom-style="iconStyle"></u-icon>
+		</view>
+		<view class="u-alert-content" @tap.stop="click">
+			<view class="u-alert-title" :style="[uTitleStyle]">
+				{{title}}
+			</view>
+			<view v-if="description" class="u-alert-desc" :style="[descStyle]">
+				{{description}}
+			</view>
+		</view>
+		<view class="u-icon-wrap">
+			<u-icon @click="close" v-if="closeAble && !closeText" hoverClass="u-type-error-hover-color" name="close" color="#c0c4cc"
+			 :size="22" class="u-close-icon" :style="{
+				top: description ? '18rpx' : '24rpx'
+			}"></u-icon>
+		</view>
+		<text v-if="closeAble && closeText" class="u-close-text" :style="{
+			top: description ? '18rpx' : '24rpx'
+		}">{{closeText}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * alertTips 警告提示
+	 * @description 警告提示，展现需要关注的信息
+	 * @tutorial https://uviewui.com/components/alertTips.html
+	 * @property {String} title 显示的标题文字
+	 * @property {String} description 辅助性文字，颜色比title浅一点，字号也小一点，可选
+	 * @property {String} type 关闭按钮(默认为叉号icon图标)
+	 * @property {String} icon 图标名称
+	 * @property {Object} icon-style 图标的样式，对象形式
+	 * @property {Object} title-style 标题的样式，对象形式
+	 * @property {Object} desc-style 描述的样式，对象形式
+	 * @property {String} close-able 用文字替代关闭图标，close-able为true时有效
+	 * @property {Boolean} show-icon 是否显示左边的辅助图标
+	 * @property {Boolean} show 显示或隐藏组件
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 */
+	export default {
+		name: 'u-alert-tips',
+		props: {
+			// 显示文字
+			title: {
+				type: String,
+				default: ''
+			},
+			// 主题，success/warning/info/error
+			type: {
+				type: String,
+				default: 'warning'
+			},
+			// 辅助性文字
+			description: {
+				type: String,
+				default: ''
+			},
+			// 是否可关闭
+			closeAble: {
+				type: Boolean,
+				default: false
+			},
+			// 关闭按钮自定义文本
+			closeText: {
+				type: String,
+				default: ''
+			},
+			// 是否显示图标
+			showIcon: {
+				type: Boolean,
+				default: false
+			},
+			// 文字颜色，如果定义了color值，icon会失效
+			color: {
+				type: String,
+				default: ''
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 边框颜色
+			borderColor: {
+				type: String,
+				default: ''
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 左边显示的icon
+			icon: {
+				type: String,
+				default: ''
+			},
+			// icon的样式
+			iconStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 标题的样式
+			titleStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 描述文字的样式
+			descStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+		},
+		data() {
+			return {
+			}
+		},
+		computed: {
+			uTitleStyle() {
+				let style = {};
+				// 如果有描述文字的话，标题进行加粗
+				style.fontWeight = this.description ? 500 : 'normal';
+				// 将用户传入样式对象和style合并，传入的优先级比style高，同属性会被覆盖
+				return this.$u.deepMerge(style, this.titleStyle);
+			},
+			uIcon() {
+				// 如果有设置icon名称就使用，否则根据type主题，推定一个默认的图标
+				return this.icon ? this.icon : this.$u.type2icon(this.type);
+			},
+			uIconType() {
+				// 如果有设置图标的样式，优先使用，没有的话，则用type的样式
+				return Object.keys(this.iconStyle).length ? '' : this.type;
+			}
+		},
+		methods: {
+			// 点击内容
+			click() {
+				this.$emit('click');
+			},
+			// 点击关闭按钮
+			close() {
+				this.$emit('close');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-alert-tips {
+		@include vue-flex;
+		align-items: center;
+		padding: 16rpx 30rpx;
+		border-radius: 8rpx;
+		position: relative;
+		transition: all 0.3s linear;
+		border: 1px solid #fff;
+		
+		&--bg--primary-light {
+			background-color: $u-type-primary-light;
+		}
+		
+		&--bg--info-light {
+			background-color: $u-type-info-light;
+		}
+		
+		&--bg--success-light {
+			background-color: $u-type-success-light;
+		}
+		
+		&--bg--warning-light {
+			background-color: $u-type-warning-light;
+		}
+		
+		&--bg--error-light {
+			background-color: $u-type-error-light;
+		}
+		
+		&--border--primary-disabled {
+			border-color: $u-type-primary-disabled;
+		}
+		
+		&--border--success-disabled {
+			border-color: $u-type-success-disabled;
+		}
+		
+		&--border--error-disabled {
+			border-color: $u-type-error-disabled;
+		}
+		
+		&--border--warning-disabled {
+			border-color: $u-type-warning-disabled;
+		}
+		
+		&--border--info-disabled {
+			border-color: $u-type-info-disabled;
+		}
+	}
+
+	.u-close-alert-tips {
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.u-icon {
+		margin-right: 16rpx;
+	}
+
+	.u-alert-title {
+		font-size: 28rpx;
+		color: $u-main-color;
+	}
+
+	.u-alert-desc {
+		font-size: 26rpx;
+		text-align: left;
+		color: $u-content-color;
+	}
+
+	.u-close-icon {
+		position: absolute;
+		top: 20rpx;
+		right: 20rpx;
+	}
+
+	.u-close-hover {
+		color: red;
+	}
+	
+	.u-close-text {
+		font-size: 24rpx;
+		color: $u-tips-color;
+		position: absolute;
+		top: 20rpx;
+		right: 20rpx;
+		line-height: 1;
+	}
+</style>
diff --git a/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue b/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
new file mode 100644
index 0000000..c0992dd
--- /dev/null
+++ b/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue
@@ -0,0 +1,290 @@
+<template>
+	<view class="content">
+		<view class="cropper-wrapper" :style="{ height: cropperOpt.height + 'px' }">
+			<canvas
+				class="cropper"
+				:disable-scroll="true"
+				@touchstart="touchStart"
+				@touchmove="touchMove"
+				@touchend="touchEnd"
+				:style="{ width: cropperOpt.width, height: cropperOpt.height, backgroundColor: 'rgba(0, 0, 0, 0.8)' }"
+				canvas-id="cropper"
+				id="cropper"
+			></canvas>
+			<canvas
+				class="cropper"
+				:disable-scroll="true"
+				:style="{
+					position: 'fixed',
+					top: `-${cropperOpt.width * cropperOpt.pixelRatio}px`,
+					left: `-${cropperOpt.height * cropperOpt.pixelRatio}px`,
+					width: `${cropperOpt.width * cropperOpt.pixelRatio}px`,
+					height: `${cropperOpt.height * cropperOpt.pixelRatio}`
+				}"
+				canvas-id="targetId"
+				id="targetId"
+			></canvas>
+		</view>
+		<view class="cropper-buttons safe-area-padding" :style="{ height: bottomNavHeight + 'px' }">
+			<!-- #ifdef H5 -->
+			<view class="upload" @tap="uploadTap">选择图片</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<view class="upload" @tap="uploadTap">重新选择</view>
+			<!-- #endif -->
+			<view class="getCropperImage" @tap="getCropperImage(false)">确定</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import WeCropper from './weCropper.js';
+export default {
+	props: {
+		// 裁剪矩形框的样式，其中可包含的属性为lineWidth-边框宽度(单位rpx)，color: 边框颜色，
+		// mask-遮罩颜色，一般设置为一个rgba的透明度，如"rgba(0, 0, 0, 0.35)"
+		boundStyle: {
+			type: Object,
+			default() {
+				return {
+					lineWidth: 4,
+					borderColor: 'rgb(245, 245, 245)',
+					mask: 'rgba(0, 0, 0, 0.35)'
+				};
+			}
+		}
+		// // 裁剪框宽度，单位rpx
+		// rectWidth: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 裁剪框高度，单位rpx
+		// rectHeight: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 输出图片宽度，单位rpx
+		// destWidth: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 输出图片高度，单位rpx
+		// destHeight: {
+		// 	type: [String, Number],
+		// 	default: 400
+		// },
+		// // 输出的图片类型，如果发现裁剪的图片很大，可能是因为设置为了"png"，改成"jpg"即可
+		// fileType: {
+		// 	type: String,
+		// 	default: 'jpg',
+		// },
+		// // 生成的图片质量
+		// // H5上无效，目前不考虑使用此参数
+		// quality: {
+		// 	type: [Number, String],
+		// 	default: 1
+		// }
+	},
+	data() {
+		return {
+			// 底部导航的高度
+			bottomNavHeight: 50,
+			originWidth: 200,
+			width: 0,
+			height: 0,
+			cropperOpt: {
+				id: 'cropper',
+				targetId: 'targetCropper',
+				pixelRatio: 1,
+				width: 0,
+				height: 0,
+				scale: 2.5,
+				zoom: 8,
+				cut: {
+					x: (this.width - this.originWidth) / 2,
+					y: (this.height - this.originWidth) / 2,
+					width: this.originWidth,
+					height: this.originWidth
+				},
+				boundStyle: {
+					lineWidth: uni.upx2px(this.boundStyle.lineWidth),
+					mask: this.boundStyle.mask,
+					color: this.boundStyle.borderColor
+				}
+			},
+			// 裁剪框和输出图片的尺寸，高度默认等于宽度
+			// 输出图片宽度，单位px
+			destWidth: 200,
+			// 裁剪框宽度，单位px
+			rectWidth: 200,
+			// 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可
+			fileType: 'jpg',
+			src: '', // 选择的图片路径，用于在点击确定时，判断是否选择了图片
+		};
+	},
+	onLoad(option) {
+		let rectInfo = uni.getSystemInfoSync();
+		this.width = rectInfo.windowWidth;
+		this.height = rectInfo.windowHeight - this.bottomNavHeight;
+		this.cropperOpt.width = this.width;
+		this.cropperOpt.height = this.height;
+		this.cropperOpt.pixelRatio = rectInfo.pixelRatio;
+
+		if (option.destWidth) this.destWidth = option.destWidth;
+		if (option.rectWidth) {
+			let rectWidth = Number(option.rectWidth);
+			this.cropperOpt.cut = {
+				x: (this.width - rectWidth) / 2,
+				y: (this.height - rectWidth) / 2,
+				width: rectWidth,
+				height: rectWidth
+			};
+		}
+		this.rectWidth = option.rectWidth;
+		if (option.fileType) this.fileType = option.fileType;
+		// 初始化
+		this.cropper = new WeCropper(this.cropperOpt)
+			.on('ready', ctx => {
+				// wecropper is ready for work!
+			})
+			.on('beforeImageLoad', ctx => {
+				// before picture loaded, i can do something
+			})
+			.on('imageLoad', ctx => {
+				// picture loaded
+			})
+			.on('beforeDraw', (ctx, instance) => {
+				// before canvas draw,i can do something
+			});
+		// 设置导航栏样式，以免用户在page.json中没有设置为黑色背景
+		uni.setNavigationBarColor({
+			frontColor: '#ffffff',
+			backgroundColor: '#000000'
+		});
+		uni.chooseImage({
+			count: 1, // 默认9
+			sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+			success: res => {
+				this.src = res.tempFilePaths[0];
+				//  获取裁剪图片资源后，给data添加src属性及其值
+				this.cropper.pushOrign(this.src);
+			}
+		});
+	},
+	methods: {
+		touchStart(e) {
+			this.cropper.touchStart(e);
+		},
+		touchMove(e) {
+			this.cropper.touchMove(e);
+		},
+		touchEnd(e) {
+			this.cropper.touchEnd(e);
+		},
+		getCropperImage(isPre = false) {
+			if(!this.src) return this.$u.toast('请先选择图片再裁剪');
+
+			let cropper_opt = {
+				destHeight: Number(this.destWidth), // uni.canvasToTempFilePath要求这些参数为数值
+				destWidth: Number(this.destWidth),
+				fileType: this.fileType
+			};
+			this.cropper.getCropperImage(cropper_opt, (path, err) => {
+				if (err) {
+					uni.showModal({
+						// title: '温馨提示',
+						content: err.message
+					});
+				} else {
+					if (isPre) {
+						uni.previewImage({
+							current: '', // 当前显示图片的 http 链接
+							urls: [path] // 需要预览的图片 http 链接列表
+						});
+					} else {
+						uni.$emit('uAvatarCropper', path);
+						this.$u.route({
+							type: 'back'
+						});
+					}
+				}
+			});
+		},
+		uploadTap() {
+			const self = this;
+			uni.chooseImage({
+				count: 1, // 默认9
+				sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+				success: (res) => {
+					self.src = res.tempFilePaths[0];
+					//  获取裁剪图片资源后，给data添加src属性及其值
+
+					self.cropper.pushOrign(this.src);
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../libs/css/style.components.scss';
+
+.content {
+	background: rgba(255, 255, 255, 1);
+}
+
+.cropper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 11;
+}
+
+.cropper-buttons {
+	background-color: #000000;
+	color: #eee;
+}
+
+.cropper-wrapper {
+	position: relative;
+	@include vue-flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	background-color: #000;
+}
+
+.cropper-buttons {
+	width: 100vw;
+	@include vue-flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	font-size: 28rpx;
+}
+
+.cropper-buttons .upload,
+.cropper-buttons .getCropperImage {
+	width: 50%;
+	text-align: center;
+}
+
+.cropper-buttons .upload {
+	text-align: left;
+	padding-left: 50rpx;
+}
+
+.cropper-buttons .getCropperImage {
+	text-align: right;
+	padding-right: 50rpx;
+}
+</style>
diff --git a/uview-ui/components/u-avatar-cropper/weCropper.js b/uview-ui/components/u-avatar-cropper/weCropper.js
new file mode 100644
index 0000000..df02483
--- /dev/null
+++ b/uview-ui/components/u-avatar-cropper/weCropper.js
@@ -0,0 +1,1265 @@
+/**
+ * we-cropper v1.3.9
+ * (c) 2020 dlhandsome
+ * @license MIT
+ */
+(function(global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+		typeof define === 'function' && define.amd ? define(factory) :
+		(global.WeCropper = factory());
+}(this, (function() {
+	'use strict';
+
+	var device = void 0;
+	var TOUCH_STATE = ['touchstarted', 'touchmoved', 'touchended'];
+
+	function firstLetterUpper(str) {
+		return str.charAt(0).toUpperCase() + str.slice(1)
+	}
+
+	function setTouchState(instance) {
+		var arg = [],
+			len = arguments.length - 1;
+		while (len-- > 0) arg[len] = arguments[len + 1];
+
+		TOUCH_STATE.forEach(function(key, i) {
+			if (arg[i] !== undefined) {
+				instance[key] = arg[i];
+			}
+		});
+	}
+
+	function validator(instance, o) {
+		Object.defineProperties(instance, o);
+	}
+
+	function getDevice() {
+		if (!device) {
+			device = uni.getSystemInfoSync();
+		}
+		return device
+	}
+
+	var tmp = {};
+
+	var ref = getDevice();
+	var pixelRatio = ref.pixelRatio;
+
+	var DEFAULT = {
+		id: {
+			default: 'cropper',
+			get: function get() {
+				return tmp.id
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'string') {
+					console.error(("id：" + value + " is invalid"));
+				}
+				tmp.id = value;
+			}
+		},
+		width: {
+			default: 750,
+			get: function get() {
+				return tmp.width
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'number') {
+					console.error(("width：" + value + " is invalid"));
+				}
+				tmp.width = value;
+			}
+		},
+		height: {
+			default: 750,
+			get: function get() {
+				return tmp.height
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'number') {
+					console.error(("height：" + value + " is invalid"));
+				}
+				tmp.height = value;
+			}
+		},
+		pixelRatio: {
+			default: pixelRatio,
+			get: function get() {
+				return tmp.pixelRatio
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'number') {
+					console.error(("pixelRatio：" + value + " is invalid"));
+				}
+				tmp.pixelRatio = value;
+			}
+		},
+		scale: {
+			default: 2.5,
+			get: function get() {
+				return tmp.scale
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'number') {
+					console.error(("scale：" + value + " is invalid"));
+				}
+				tmp.scale = value;
+			}
+		},
+		zoom: {
+			default: 5,
+			get: function get() {
+				return tmp.zoom
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'number') {
+					console.error(("zoom：" + value + " is invalid"));
+				} else if (value < 0 || value > 10) {
+					console.error("zoom should be ranged in 0 ~ 10");
+				}
+				tmp.zoom = value;
+			}
+		},
+		src: {
+			default: '',
+			get: function get() {
+				return tmp.src
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'string') {
+					console.error(("src：" + value + " is invalid"));
+				}
+				tmp.src = value;
+			}
+		},
+		cut: {
+			default: {},
+			get: function get() {
+				return tmp.cut
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'object') {
+					console.error(("cut：" + value + " is invalid"));
+				}
+				tmp.cut = value;
+			}
+		},
+		boundStyle: {
+			default: {},
+			get: function get() {
+				return tmp.boundStyle
+			},
+			set: function set(value) {
+				if (typeof(value) !== 'object') {
+					console.error(("boundStyle：" + value + " is invalid"));
+				}
+				tmp.boundStyle = value;
+			}
+		},
+		onReady: {
+			default: null,
+			get: function get() {
+				return tmp.ready
+			},
+			set: function set(value) {
+				tmp.ready = value;
+			}
+		},
+		onBeforeImageLoad: {
+			default: null,
+			get: function get() {
+				return tmp.beforeImageLoad
+			},
+			set: function set(value) {
+				tmp.beforeImageLoad = value;
+			}
+		},
+		onImageLoad: {
+			default: null,
+			get: function get() {
+				return tmp.imageLoad
+			},
+			set: function set(value) {
+				tmp.imageLoad = value;
+			}
+		},
+		onBeforeDraw: {
+			default: null,
+			get: function get() {
+				return tmp.beforeDraw
+			},
+			set: function set(value) {
+				tmp.beforeDraw = value;
+			}
+		}
+	};
+
+	var ref$1 = getDevice();
+	var windowWidth = ref$1.windowWidth;
+
+	function prepare() {
+		var self = this;
+
+		// v1.4.0 版本中将不再自动绑定we-cropper实例
+		self.attachPage = function() {
+			var pages = getCurrentPages();
+			// 获取到当前page上下文
+			var pageContext = pages[pages.length - 1];
+			// 把this依附在Page上下文的wecropper属性上，便于在page钩子函数中访问
+			Object.defineProperty(pageContext, 'wecropper', {
+				get: function get() {
+					console.warn(
+						'Instance will not be automatically bound to the page after v1.4.0\n\n' +
+						'Please use a custom instance name instead\n\n' +
+						'Example: \n' +
+						'this.mycropper = new WeCropper(options)\n\n' +
+						'// ...\n' +
+						'this.mycropper.getCropperImage()'
+					);
+					return self
+				},
+				configurable: true
+			});
+		};
+
+		self.createCtx = function() {
+			var id = self.id;
+			var targetId = self.targetId;
+
+			if (id) {
+				self.ctx = self.ctx || uni.createCanvasContext(id);
+				self.targetCtx = self.targetCtx || uni.createCanvasContext(targetId);
+			} else {
+				console.error("constructor: create canvas context failed, 'id' must be valuable");
+			}
+		};
+
+		self.deviceRadio = windowWidth / 750;
+	}
+
+	var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !==
+		'undefined' ? self : {};
+
+
+
+
+
+	function createCommonjsModule(fn, module) {
+		return module = {
+			exports: {}
+		}, fn(module, module.exports), module.exports;
+	}
+
+	var tools = createCommonjsModule(function(module, exports) {
+		/**
+		 * String type check
+		 */
+		exports.isStr = function(v) {
+			return typeof v === 'string';
+		};
+		/**
+		 * Number type check
+		 */
+		exports.isNum = function(v) {
+			return typeof v === 'number';
+		};
+		/**
+		 * Array type check
+		 */
+		exports.isArr = Array.isArray;
+		/**
+		 * undefined type check
+		 */
+		exports.isUndef = function(v) {
+			return v === undefined;
+		};
+
+		exports.isTrue = function(v) {
+			return v === true;
+		};
+
+		exports.isFalse = function(v) {
+			return v === false;
+		};
+		/**
+		 * Function type check
+		 */
+		exports.isFunc = function(v) {
+			return typeof v === 'function';
+		};
+		/**
+		 * Quick object check - this is primarily used to tell
+		 * Objects from primitive values when we know the value
+		 * is a JSON-compliant type.
+		 */
+		exports.isObj = exports.isObject = function(obj) {
+			return obj !== null && typeof obj === 'object'
+		};
+
+		/**
+		 * Strict object type check. Only returns true
+		 * for plain JavaScript objects.
+		 */
+		var _toString = Object.prototype.toString;
+		exports.isPlainObject = function(obj) {
+			return _toString.call(obj) === '[object Object]'
+		};
+
+		/**
+		 * Check whether the object has the property.
+		 */
+		var hasOwnProperty = Object.prototype.hasOwnProperty;
+		exports.hasOwn = function(obj, key) {
+			return hasOwnProperty.call(obj, key)
+		};
+
+		/**
+		 * Perform no operation.
+		 * Stubbing args to make Flow happy without leaving useless transpiled code
+		 * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/)
+		 */
+		exports.noop = function(a, b, c) {};
+
+		/**
+		 * Check if val is a valid array index.
+		 */
+		exports.isValidArrayIndex = function(val) {
+			var n = parseFloat(String(val));
+			return n >= 0 && Math.floor(n) === n && isFinite(val)
+		};
+	});
+
+	var tools_7 = tools.isFunc;
+	var tools_10 = tools.isPlainObject;
+
+	var EVENT_TYPE = ['ready', 'beforeImageLoad', 'beforeDraw', 'imageLoad'];
+
+	function observer() {
+		var self = this;
+
+		self.on = function(event, fn) {
+			if (EVENT_TYPE.indexOf(event) > -1) {
+				if (tools_7(fn)) {
+					event === 'ready' ?
+						fn(self) :
+						self[("on" + (firstLetterUpper(event)))] = fn;
+				}
+			} else {
+				console.error(("event: " + event + " is invalid"));
+			}
+			return self
+		};
+	}
+
+	function wxPromise(fn) {
+		return function(obj) {
+			var args = [],
+				len = arguments.length - 1;
+			while (len-- > 0) args[len] = arguments[len + 1];
+
+			if (obj === void 0) obj = {};
+			return new Promise(function(resolve, reject) {
+				obj.success = function(res) {
+					resolve(res);
+				};
+				obj.fail = function(err) {
+					reject(err);
+				};
+				fn.apply(void 0, [obj].concat(args));
+			})
+		}
+	}
+
+	function draw(ctx, reserve) {
+		if (reserve === void 0) reserve = false;
+
+		return new Promise(function(resolve) {
+			ctx.draw(reserve, resolve);
+		})
+	}
+
+	var getImageInfo = wxPromise(uni.getImageInfo);
+
+	var canvasToTempFilePath = wxPromise(uni.canvasToTempFilePath);
+
+	var base64 = createCommonjsModule(function(module, exports) {
+		/*! http://mths.be/base64 v0.1.0 by @mathias | MIT license */
+		(function(root) {
+
+			// Detect free variables `exports`.
+			var freeExports = 'object' == 'object' && exports;
+
+			// Detect free variable `module`.
+			var freeModule = 'object' == 'object' && module &&
+				module.exports == freeExports && module;
+
+			// Detect free variable `global`, from Node.js or Browserified code, and use
+			// it as `root`.
+			var freeGlobal = typeof commonjsGlobal == 'object' && commonjsGlobal;
+			if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
+				root = freeGlobal;
+			}
+
+			/*--------------------------------------------------------------------------*/
+
+			var InvalidCharacterError = function(message) {
+				this.message = message;
+			};
+			InvalidCharacterError.prototype = new Error;
+			InvalidCharacterError.prototype.name = 'InvalidCharacterError';
+
+			var error = function(message) {
+				// Note: the error messages used throughout this file match those used by
+				// the native `atob`/`btoa` implementation in Chromium.
+				throw new InvalidCharacterError(message);
+			};
+
+			var TABLE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+			// http://whatwg.org/html/common-microsyntaxes.html#space-character
+			var REGEX_SPACE_CHARACTERS = /[\t\n\f\r ]/g;
+
+			// `decode` is designed to be fully compatible with `atob` as described in the
+			// HTML Standard. http://whatwg.org/html/webappapis.html#dom-windowbase64-atob
+			// The optimized base64-decoding algorithm used is based on @atk’s excellent
+			// implementation. https://gist.github.com/atk/1020396
+			var decode = function(input) {
+				input = String(input)
+					.replace(REGEX_SPACE_CHARACTERS, '');
+				var length = input.length;
+				if (length % 4 == 0) {
+					input = input.replace(/==?$/, '');
+					length = input.length;
+				}
+				if (
+					length % 4 == 1 ||
+					// http://whatwg.org/C#alphanumeric-ascii-characters
+					/[^+a-zA-Z0-9/]/.test(input)
+				) {
+					error(
+						'Invalid character: the string to be decoded is not correctly encoded.'
+					);
+				}
+				var bitCounter = 0;
+				var bitStorage;
+				var buffer;
+				var output = '';
+				var position = -1;
+				while (++position < length) {
+					buffer = TABLE.indexOf(input.charAt(position));
+					bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
+					// Unless this is the first of a group of 4 characters…
+					if (bitCounter++ % 4) {
+						// …convert the first 8 bits to a single ASCII character.
+						output += String.fromCharCode(
+							0xFF & bitStorage >> (-2 * bitCounter & 6)
+						);
+					}
+				}
+				return output;
+			};
+
+			// `encode` is designed to be fully compatible with `btoa` as described in the
+			// HTML Standard: http://whatwg.org/html/webappapis.html#dom-windowbase64-btoa
+			var encode = function(input) {
+				input = String(input);
+				if (/[^\0-\xFF]/.test(input)) {
+					// Note: no need to special-case astral symbols here, as surrogates are
+					// matched, and the input is supposed to only contain ASCII anyway.
+					error(
+						'The string to be encoded contains characters outside of the ' +
+						'Latin1 range.'
+					);
+				}
+				var padding = input.length % 3;
+				var output = '';
+				var position = -1;
+				var a;
+				var b;
+				var c;
+				var buffer;
+				// Make sure any padding is handled outside of the loop.
+				var length = input.length - padding;
+
+				while (++position < length) {
+					// Read three bytes, i.e. 24 bits.
+					a = input.charCodeAt(position) << 16;
+					b = input.charCodeAt(++position) << 8;
+					c = input.charCodeAt(++position);
+					buffer = a + b + c;
+					// Turn the 24 bits into four chunks of 6 bits each, and append the
+					// matching character for each of them to the output.
+					output += (
+						TABLE.charAt(buffer >> 18 & 0x3F) +
+						TABLE.charAt(buffer >> 12 & 0x3F) +
+						TABLE.charAt(buffer >> 6 & 0x3F) +
+						TABLE.charAt(buffer & 0x3F)
+					);
+				}
+
+				if (padding == 2) {
+					a = input.charCodeAt(position) << 8;
+					b = input.charCodeAt(++position);
+					buffer = a + b;
+					output += (
+						TABLE.charAt(buffer >> 10) +
+						TABLE.charAt((buffer >> 4) & 0x3F) +
+						TABLE.charAt((buffer << 2) & 0x3F) +
+						'='
+					);
+				} else if (padding == 1) {
+					buffer = input.charCodeAt(position);
+					output += (
+						TABLE.charAt(buffer >> 2) +
+						TABLE.charAt((buffer << 4) & 0x3F) +
+						'=='
+					);
+				}
+
+				return output;
+			};
+
+			var base64 = {
+				'encode': encode,
+				'decode': decode,
+				'version': '0.1.0'
+			};
+
+			// Some AMD build optimizers, like r.js, check for specific condition patterns
+			// like the following:
+			if (
+				typeof undefined == 'function' &&
+				typeof undefined.amd == 'object' &&
+				undefined.amd
+			) {
+				undefined(function() {
+					return base64;
+				});
+			} else if (freeExports && !freeExports.nodeType) {
+				if (freeModule) { // in Node.js or RingoJS v0.8.0+
+					freeModule.exports = base64;
+				} else { // in Narwhal or RingoJS v0.7.0-
+					for (var key in base64) {
+						base64.hasOwnProperty(key) && (freeExports[key] = base64[key]);
+					}
+				}
+			} else { // in Rhino or a web browser
+				root.base64 = base64;
+			}
+
+		}(commonjsGlobal));
+	});
+
+	function makeURI(strData, type) {
+		return 'data:' + type + ';base64,' + strData
+	}
+
+	function fixType(type) {
+		type = type.toLowerCase().replace(/jpg/i, 'jpeg');
+		var r = type.match(/png|jpeg|bmp|gif/)[0];
+		return 'image/' + r
+	}
+
+	function encodeData(data) {
+		var str = '';
+		if (typeof data === 'string') {
+			str = data;
+		} else {
+			for (var i = 0; i < data.length; i++) {
+				str += String.fromCharCode(data[i]);
+			}
+		}
+		return base64.encode(str)
+	}
+
+	/**
+	 * 获取图像区域隐含的像素数据
+	 * @param canvasId canvas标识
+	 * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
+	 * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
+	 * @param width 将要被提取的图像数据矩形区域的宽度
+	 * @param height 将要被提取的图像数据矩形区域的高度
+	 * @param done 完成回调
+	 */
+	function getImageData(canvasId, x, y, width, height, done) {
+		uni.canvasGetImageData({
+			canvasId: canvasId,
+			x: x,
+			y: y,
+			width: width,
+			height: height,
+			success: function success(res) {
+				done(res, null);
+			},
+			fail: function fail(res) {
+				done(null, res);
+			}
+		});
+	}
+
+	/**
+	 * 生成bmp格式图片
+	 * 按照规则生成图片响应头和响应体
+	 * @param oData 用来描述 canvas 区域隐含的像素数据 { data, width, height } = oData
+	 * @returns {*} base64字符串
+	 */
+	function genBitmapImage(oData) {
+		//
+		// BITMAPFILEHEADER: http://msdn.microsoft.com/en-us/library/windows/desktop/dd183374(v=vs.85).aspx
+		// BITMAPINFOHEADER: http://msdn.microsoft.com/en-us/library/dd183376.aspx
+		//
+		var biWidth = oData.width;
+		var biHeight = oData.height;
+		var biSizeImage = biWidth * biHeight * 3;
+		var bfSize = biSizeImage + 54; // total header size = 54 bytes
+
+		//
+		//  typedef struct tagBITMAPFILEHEADER {
+		//  	WORD bfType;
+		//  	DWORD bfSize;
+		//  	WORD bfReserved1;
+		//  	WORD bfReserved2;
+		//  	DWORD bfOffBits;
+		//  } BITMAPFILEHEADER;
+		//
+		var BITMAPFILEHEADER = [
+			// WORD bfType -- The file type signature; must be "BM"
+			0x42, 0x4D,
+			// DWORD bfSize -- The size, in bytes, of the bitmap file
+			bfSize & 0xff, bfSize >> 8 & 0xff, bfSize >> 16 & 0xff, bfSize >> 24 & 0xff,
+			// WORD bfReserved1 -- Reserved; must be zero
+			0, 0,
+			// WORD bfReserved2 -- Reserved; must be zero
+			0, 0,
+			// DWORD bfOffBits -- The offset, in bytes, from the beginning of the BITMAPFILEHEADER structure to the bitmap bits.
+			54, 0, 0, 0
+		];
+
+		//
+		//  typedef struct tagBITMAPINFOHEADER {
+		//  	DWORD biSize;
+		//  	LONG  biWidth;
+		//  	LONG  biHeight;
+		//  	WORD  biPlanes;
+		//  	WORD  biBitCount;
+		//  	DWORD biCompression;
+		//  	DWORD biSizeImage;
+		//  	LONG  biXPelsPerMeter;
+		//  	LONG  biYPelsPerMeter;
+		//  	DWORD biClrUsed;
+		//  	DWORD biClrImportant;
+		//  } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
+		//
+		var BITMAPINFOHEADER = [
+			// DWORD biSize -- The number of bytes required by the structure
+			40, 0, 0, 0,
+			// LONG biWidth -- The width of the bitmap, in pixels
+			biWidth & 0xff, biWidth >> 8 & 0xff, biWidth >> 16 & 0xff, biWidth >> 24 & 0xff,
+			// LONG biHeight -- The height of the bitmap, in pixels
+			biHeight & 0xff, biHeight >> 8 & 0xff, biHeight >> 16 & 0xff, biHeight >> 24 & 0xff,
+			// WORD biPlanes -- The number of planes for the target device. This value must be set to 1
+			1, 0,
+			// WORD biBitCount -- The number of bits-per-pixel, 24 bits-per-pixel -- the bitmap
+			// has a maximum of 2^24 colors (16777216, Truecolor)
+			24, 0,
+			// DWORD biCompression -- The type of compression, BI_RGB (code 0) -- uncompressed
+			0, 0, 0, 0,
+			// DWORD biSizeImage -- The size, in bytes, of the image. This may be set to zero for BI_RGB bitmaps
+			biSizeImage & 0xff, biSizeImage >> 8 & 0xff, biSizeImage >> 16 & 0xff, biSizeImage >> 24 & 0xff,
+			// LONG biXPelsPerMeter, unused
+			0, 0, 0, 0,
+			// LONG biYPelsPerMeter, unused
+			0, 0, 0, 0,
+			// DWORD biClrUsed, the number of color indexes of palette, unused
+			0, 0, 0, 0,
+			// DWORD biClrImportant, unused
+			0, 0, 0, 0
+		];
+
+		var iPadding = (4 - ((biWidth * 3) % 4)) % 4;
+
+		var aImgData = oData.data;
+
+		var strPixelData = '';
+		var biWidth4 = biWidth << 2;
+		var y = biHeight;
+		var fromCharCode = String.fromCharCode;
+
+		do {
+			var iOffsetY = biWidth4 * (y - 1);
+			var strPixelRow = '';
+			for (var x = 0; x < biWidth; x++) {
+				var iOffsetX = x << 2;
+				strPixelRow += fromCharCode(aImgData[iOffsetY + iOffsetX + 2]) +
+					fromCharCode(aImgData[iOffsetY + iOffsetX + 1]) +
+					fromCharCode(aImgData[iOffsetY + iOffsetX]);
+			}
+
+			for (var c = 0; c < iPadding; c++) {
+				strPixelRow += String.fromCharCode(0);
+			}
+
+			strPixelData += strPixelRow;
+		} while (--y)
+
+		var strEncoded = encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + encodeData(strPixelData);
+
+		return strEncoded
+	}
+
+	/**
+	 * 转换为图片base64
+	 * @param canvasId canvas标识
+	 * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
+	 * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
+	 * @param width 将要被提取的图像数据矩形区域的宽度
+	 * @param height 将要被提取的图像数据矩形区域的高度
+	 * @param type 转换图片类型
+	 * @param done 完成回调
+	 */
+	function convertToImage(canvasId, x, y, width, height, type, done) {
+		if (done === void 0) done = function() {};
+
+		if (type === undefined) {
+			type = 'png';
+		}
+		type = fixType(type);
+		if (/bmp/.test(type)) {
+			getImageData(canvasId, x, y, width, height, function(data, err) {
+				var strData = genBitmapImage(data);
+				tools_7(done) && done(makeURI(strData, 'image/' + type), err);
+			});
+		} else {
+			console.error('暂不支持生成\'' + type + '\'类型的base64图片');
+		}
+	}
+
+	var CanvasToBase64 = {
+		convertToImage: convertToImage,
+		// convertToPNG: function (width, height, done) {
+		//   return convertToImage(width, height, 'png', done)
+		// },
+		// convertToJPEG: function (width, height, done) {
+		//   return convertToImage(width, height, 'jpeg', done)
+		// },
+		// convertToGIF: function (width, height, done) {
+		//   return convertToImage(width, height, 'gif', done)
+		// },
+		convertToBMP: function(ref, done) {
+			if (ref === void 0) ref = {};
+			var canvasId = ref.canvasId;
+			var x = ref.x;
+			var y = ref.y;
+			var width = ref.width;
+			var height = ref.height;
+			if (done === void 0) done = function() {};
+
+			return convertToImage(canvasId, x, y, width, height, 'bmp', done)
+		}
+	};
+
+	function methods() {
+		var self = this;
+
+		var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
+		var boundHeight = self.height; // 裁剪框默认高度，即整个画布高度
+
+		var id = self.id;
+		var targetId = self.targetId;
+		var pixelRatio = self.pixelRatio;
+
+		var ref = self.cut;
+		var x = ref.x;
+		if (x === void 0) x = 0;
+		var y = ref.y;
+		if (y === void 0) y = 0;
+		var width = ref.width;
+		if (width === void 0) width = boundWidth;
+		var height = ref.height;
+		if (height === void 0) height = boundHeight;
+
+		self.updateCanvas = function(done) {
+			if (self.croperTarget) {
+				//  画布绘制图片
+				self.ctx.drawImage(
+					self.croperTarget,
+					self.imgLeft,
+					self.imgTop,
+					self.scaleWidth,
+					self.scaleHeight
+				);
+			}
+			tools_7(self.onBeforeDraw) && self.onBeforeDraw(self.ctx, self);
+
+			self.setBoundStyle(self.boundStyle); //	设置边界样式
+
+			self.ctx.draw(false, done);
+			return self
+		};
+
+		self.pushOrigin = self.pushOrign = function(src) {
+			self.src = src;
+
+			tools_7(self.onBeforeImageLoad) && self.onBeforeImageLoad(self.ctx, self);
+
+			return getImageInfo({
+					src: src
+				})
+				.then(function(res) {
+					var innerAspectRadio = res.width / res.height;
+					var customAspectRadio = width / height;
+
+					self.croperTarget = res.path;
+
+					if (innerAspectRadio < customAspectRadio) {
+						self.rectX = x;
+						self.baseWidth = width;
+						self.baseHeight = width / innerAspectRadio;
+						self.rectY = y - Math.abs((height - self.baseHeight) / 2);
+					} else {
+						self.rectY = y;
+						self.baseWidth = height * innerAspectRadio;
+						self.baseHeight = height;
+						self.rectX = x - Math.abs((width - self.baseWidth) / 2);
+					}
+
+					self.imgLeft = self.rectX;
+					self.imgTop = self.rectY;
+					self.scaleWidth = self.baseWidth;
+					self.scaleHeight = self.baseHeight;
+
+					self.update();
+
+					return new Promise(function(resolve) {
+						self.updateCanvas(resolve);
+					})
+				})
+				.then(function() {
+					tools_7(self.onImageLoad) && self.onImageLoad(self.ctx, self);
+				})
+		};
+
+		self.removeImage = function() {
+			self.src = '';
+			self.croperTarget = '';
+			return draw(self.ctx)
+		};
+
+		self.getCropperBase64 = function(done) {
+			if (done === void 0) done = function() {};
+
+			CanvasToBase64.convertToBMP({
+				canvasId: id,
+				x: x,
+				y: y,
+				width: width,
+				height: height
+			}, done);
+		};
+
+		self.getCropperImage = function(opt, fn) {
+			var customOptions = opt;
+
+			var canvasOptions = {
+				canvasId: id,
+				x: x,
+				y: y,
+				width: width,
+				height: height
+			};
+
+			var task = function() {
+				return Promise.resolve();
+			};
+
+			if (
+				tools_10(customOptions) &&
+				customOptions.original
+			) {
+				// original mode
+				task = function() {
+					self.targetCtx.drawImage(
+						self.croperTarget,
+						self.imgLeft * pixelRatio,
+						self.imgTop * pixelRatio,
+						self.scaleWidth * pixelRatio,
+						self.scaleHeight * pixelRatio
+					);
+
+					canvasOptions = {
+						canvasId: targetId,
+						x: x * pixelRatio,
+						y: y * pixelRatio,
+						width: width * pixelRatio,
+						height: height * pixelRatio
+					};
+
+					return draw(self.targetCtx)
+				};
+			}
+
+			return task()
+				.then(function() {
+					if (tools_10(customOptions)) {
+						canvasOptions = Object.assign({}, canvasOptions, customOptions);
+					}
+
+					if (tools_7(customOptions)) {
+						fn = customOptions;
+					}
+
+					var arg = canvasOptions.componentContext ?
+						[canvasOptions, canvasOptions.componentContext] :
+						[canvasOptions];
+
+					return canvasToTempFilePath.apply(null, arg)
+				})
+				.then(function(res) {
+					var tempFilePath = res.tempFilePath;
+
+					return tools_7(fn) ?
+						fn.call(self, tempFilePath, null) :
+						tempFilePath
+				})
+				.catch(function(err) {
+					if (tools_7(fn)) {
+						fn.call(self, null, err);
+					} else {
+						throw err
+					}
+				})
+		};
+	}
+
+	/**
+	 * 获取最新缩放值
+	 * @param oldScale 上一次触摸结束后的缩放值
+	 * @param oldDistance 上一次触摸结束后的双指距离
+	 * @param zoom 缩放系数
+	 * @param touch0 第一指touch对象
+	 * @param touch1 第二指touch对象
+	 * @returns {*}
+	 */
+	var getNewScale = function(oldScale, oldDistance, zoom, touch0, touch1) {
+		var xMove, yMove, newDistance;
+		// 计算二指最新距离
+		xMove = Math.round(touch1.x - touch0.x);
+		yMove = Math.round(touch1.y - touch0.y);
+		newDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
+
+		return oldScale + 0.001 * zoom * (newDistance - oldDistance)
+	};
+
+	function update() {
+		var self = this;
+
+		if (!self.src) {
+			return
+		}
+
+		self.__oneTouchStart = function(touch) {
+			self.touchX0 = Math.round(touch.x);
+			self.touchY0 = Math.round(touch.y);
+		};
+
+		self.__oneTouchMove = function(touch) {
+			var xMove, yMove;
+			// 计算单指移动的距离
+			if (self.touchended) {
+				return self.updateCanvas()
+			}
+			xMove = Math.round(touch.x - self.touchX0);
+			yMove = Math.round(touch.y - self.touchY0);
+
+			var imgLeft = Math.round(self.rectX + xMove);
+			var imgTop = Math.round(self.rectY + yMove);
+
+			self.outsideBound(imgLeft, imgTop);
+
+			self.updateCanvas();
+		};
+
+		self.__twoTouchStart = function(touch0, touch1) {
+			var xMove, yMove, oldDistance;
+
+			self.touchX1 = Math.round(self.rectX + self.scaleWidth / 2);
+			self.touchY1 = Math.round(self.rectY + self.scaleHeight / 2);
+
+			// 计算两指距离
+			xMove = Math.round(touch1.x - touch0.x);
+			yMove = Math.round(touch1.y - touch0.y);
+			oldDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
+
+			self.oldDistance = oldDistance;
+		};
+
+		self.__twoTouchMove = function(touch0, touch1) {
+			var oldScale = self.oldScale;
+			var oldDistance = self.oldDistance;
+			var scale = self.scale;
+			var zoom = self.zoom;
+
+			self.newScale = getNewScale(oldScale, oldDistance, zoom, touch0, touch1);
+
+			//  设定缩放范围
+			self.newScale <= 1 && (self.newScale = 1);
+			self.newScale >= scale && (self.newScale = scale);
+
+			self.scaleWidth = Math.round(self.newScale * self.baseWidth);
+			self.scaleHeight = Math.round(self.newScale * self.baseHeight);
+			var imgLeft = Math.round(self.touchX1 - self.scaleWidth / 2);
+			var imgTop = Math.round(self.touchY1 - self.scaleHeight / 2);
+
+			self.outsideBound(imgLeft, imgTop);
+
+			self.updateCanvas();
+		};
+
+		self.__xtouchEnd = function() {
+			self.oldScale = self.newScale;
+			self.rectX = self.imgLeft;
+			self.rectY = self.imgTop;
+		};
+	}
+
+	var handle = {
+		//  图片手势初始监测
+		touchStart: function touchStart(e) {
+			var self = this;
+			var ref = e.touches;
+			var touch0 = ref[0];
+			var touch1 = ref[1];
+
+			if (!self.src) {
+				return
+			}
+
+			setTouchState(self, true, null, null);
+
+			// 计算第一个触摸点的位置，并参照改点进行缩放
+			self.__oneTouchStart(touch0);
+
+			// 两指手势触发
+			if (e.touches.length >= 2) {
+				self.__twoTouchStart(touch0, touch1);
+			}
+		},
+
+		//  图片手势动态缩放
+		touchMove: function touchMove(e) {
+			var self = this;
+			var ref = e.touches;
+			var touch0 = ref[0];
+			var touch1 = ref[1];
+
+			if (!self.src) {
+				return
+			}
+
+			setTouchState(self, null, true);
+
+			// 单指手势时触发
+			if (e.touches.length === 1) {
+				self.__oneTouchMove(touch0);
+			}
+			// 两指手势触发
+			if (e.touches.length >= 2) {
+				self.__twoTouchMove(touch0, touch1);
+			}
+		},
+
+		touchEnd: function touchEnd(e) {
+			var self = this;
+
+			if (!self.src) {
+				return
+			}
+
+			setTouchState(self, false, false, true);
+			self.__xtouchEnd();
+		}
+	};
+
+	function cut() {
+		var self = this;
+		var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
+		var boundHeight = self.height;
+		// 裁剪框默认高度，即整个画布高度
+		var ref = self.cut;
+		var x = ref.x;
+		if (x === void 0) x = 0;
+		var y = ref.y;
+		if (y === void 0) y = 0;
+		var width = ref.width;
+		if (width === void 0) width = boundWidth;
+		var height = ref.height;
+		if (height === void 0) height = boundHeight;
+
+		/**
+		 * 设置边界
+		 * @param imgLeft 图片左上角横坐标值
+		 * @param imgTop 图片左上角纵坐标值
+		 */
+		self.outsideBound = function(imgLeft, imgTop) {
+			self.imgLeft = imgLeft >= x ?
+				x :
+				self.scaleWidth + imgLeft - x <= width ?
+				x + width - self.scaleWidth :
+				imgLeft;
+
+			self.imgTop = imgTop >= y ?
+				y :
+				self.scaleHeight + imgTop - y <= height ?
+				y + height - self.scaleHeight :
+				imgTop;
+		};
+
+		/**
+		 * 设置边界样式
+		 * @param color	边界颜色
+		 */
+		self.setBoundStyle = function(ref) {
+			if (ref === void 0) ref = {};
+			var color = ref.color;
+			if (color === void 0) color = '#04b00f';
+			var mask = ref.mask;
+			if (mask === void 0) mask = 'rgba(0, 0, 0, 0.3)';
+			var lineWidth = ref.lineWidth;
+			if (lineWidth === void 0) lineWidth = 1;
+
+			var half = lineWidth / 2;
+			var boundOption = [{
+					start: {
+						x: x - half,
+						y: y + 10 - half
+					},
+					step1: {
+						x: x - half,
+						y: y - half
+					},
+					step2: {
+						x: x + 10 - half,
+						y: y - half
+					}
+				},
+				{
+					start: {
+						x: x - half,
+						y: y + height - 10 + half
+					},
+					step1: {
+						x: x - half,
+						y: y + height + half
+					},
+					step2: {
+						x: x + 10 - half,
+						y: y + height + half
+					}
+				},
+				{
+					start: {
+						x: x + width - 10 + half,
+						y: y - half
+					},
+					step1: {
+						x: x + width + half,
+						y: y - half
+					},
+					step2: {
+						x: x + width + half,
+						y: y + 10 - half
+					}
+				},
+				{
+					start: {
+						x: x + width + half,
+						y: y + height - 10 + half
+					},
+					step1: {
+						x: x + width + half,
+						y: y + height + half
+					},
+					step2: {
+						x: x + width - 10 + half,
+						y: y + height + half
+					}
+				}
+			];
+
+			// 绘制半透明层
+			self.ctx.beginPath();
+			self.ctx.setFillStyle(mask);
+			self.ctx.fillRect(0, 0, x, boundHeight);
+			self.ctx.fillRect(x, 0, width, y);
+			self.ctx.fillRect(x, y + height, width, boundHeight - y - height);
+			self.ctx.fillRect(x + width, 0, boundWidth - x - width, boundHeight);
+			self.ctx.fill();
+
+			boundOption.forEach(function(op) {
+				self.ctx.beginPath();
+				self.ctx.setStrokeStyle(color);
+				self.ctx.setLineWidth(lineWidth);
+				self.ctx.moveTo(op.start.x, op.start.y);
+				self.ctx.lineTo(op.step1.x, op.step1.y);
+				self.ctx.lineTo(op.step2.x, op.step2.y);
+				self.ctx.stroke();
+			});
+		};
+	}
+
+	var version = "1.3.9";
+
+	var WeCropper = function WeCropper(params) {
+		var self = this;
+		var _default = {};
+
+		validator(self, DEFAULT);
+
+		Object.keys(DEFAULT).forEach(function(key) {
+			_default[key] = DEFAULT[key].default;
+		});
+		Object.assign(self, _default, params);
+
+		self.prepare();
+		self.attachPage();
+		self.createCtx();
+		self.observer();
+		self.cutt();
+		self.methods();
+		self.init();
+		self.update();
+
+		return self
+	};
+
+	WeCropper.prototype.init = function init() {
+		var self = this;
+		var src = self.src;
+
+		self.version = version;
+
+		typeof self.onReady === 'function' && self.onReady(self.ctx, self);
+
+		if (src) {
+			self.pushOrign(src);
+		} else {
+			self.updateCanvas();
+		}
+		setTouchState(self, false, false, false);
+
+		self.oldScale = 1;
+		self.newScale = 1;
+
+		return self
+	};
+
+	Object.assign(WeCropper.prototype, handle);
+
+	WeCropper.prototype.prepare = prepare;
+	WeCropper.prototype.observer = observer;
+	WeCropper.prototype.methods = methods;
+	WeCropper.prototype.cutt = cut;
+	WeCropper.prototype.update = update;
+
+	return WeCropper;
+
+})));
diff --git a/uview-ui/components/u-avatar/u-avatar.vue b/uview-ui/components/u-avatar/u-avatar.vue
new file mode 100644
index 0000000..289b9b0
--- /dev/null
+++ b/uview-ui/components/u-avatar/u-avatar.vue
@@ -0,0 +1,244 @@
+<template>
+	<view class="u-avatar" :style="[wrapStyle]" @tap="click">
+		<image
+			@error="loadError"
+			:style="[imgStyle]"
+			class="u-avatar__img"
+			v-if="!uText && avatar"
+			:src="avatar" 
+			:mode="imgMode"
+		></image>
+		<text class="u-line-1" v-else-if="uText" :style="{
+			fontSize: '38rpx'
+		}">{{uText}}</text>
+		<slot v-else></slot>
+		<view class="u-avatar__sex" v-if="showSex" :class="['u-avatar__sex--' + sexIcon]" :style="[uSexStyle]">
+			<u-icon :name="sexIcon" size="20"></u-icon>
+		</view>
+		<view class="u-avatar__level" v-if="showLevel" :style="[uLevelStyle]">
+			<u-icon :name="levelIcon" size="20"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	let base64Avatar = "data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYGCAsMCgoLCgoMEAwMDAwMDBAMDg8QDw4MExMUFBMTHBsbGxwfHx8fHx8fHx8fAQcHBw0MDRgQEBgaFREVGh8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx//wAARCADIAMgDAREAAhEBAxEB/8QAcQABAQEAAwEBAAAAAAAAAAAAAAUEAQMGAgcBAQAAAAAAAAAAAAAAAAAAAAAQAAIBAwICBgkDBQAAAAAAAAABAhEDBCEFMVFBYXGREiKBscHRMkJSEyOh4XLxYjNDFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8A/fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHbHFyZ/Dam+yLA+Z2L0Pjtyj2poD4AAAAAAAAAAAAAAAAAAAAAAAAKWFs9y6lcvvwQeqj8z9wFaziY1n/HbUX9XF97A7QAGXI23EvJ1goyfzR0YEfN269jeZ+a03pNe0DIAAAAAAAAAAAAAAAAAAAACvtO3RcVkXlWutuL9YFYAAAAAOJRjKLjJVi9GmB5/csH/mu1h/in8PU+QGMAAAAAAAAAAAAAAAAAAaMDG/6MmMH8C80+xAelSSVFolwQAAAAAAAHVlWI37ErUulaPk+hgeYnCUJuElSUXRrrQHAAAAAAAAAAAAAAAAABa2Oz4bM7r4zdF2ICmAAAAAAAAAg7zZ8GX41wuJP0rRgYAAAAAAAAAAAAAAAAAD0m2R8ODaXU33tsDSAAAAAAAAAlb9HyWZcnJd9PcBHAAAAAAAAAAAAAAAAAPS7e64Vn+KA0AAAAAAAAAJm+v8Ftf3ewCKAAAAAAAAAAAAAAAAAX9muqeGo9NttP06+0DcAAAAAAAAAjb7dTu2ra+VOT9P8AQCWAAAAAAAAAAAAAAAAAUNmyPt5Ltv4bui/kuAF0AAAAAAADiUlGLlJ0SVW+oDzOXfd/Ind6JPRdS0QHSAAAAAAAAAAAAAAAAAE2nVaNcGB6Lbs6OTao9LsF51z60BrAAAAAABJ3jOVHjW3r/sa9QEgAAAAAAAAAAAAAAAAAAAPu1duWriuW34ZR4MC9hbnZyEoy8l36XwfYBsAAADaSq9EuLAlZ+7xSdrGdW9Hc5dgEdtt1erfFgAAAAAAAAAAAAAAAAADVjbblX6NR8MH80tEBRs7HYivyzlN8lovaBPzduvY0m6eK10TXtAyAarO55lpJK54orolr+4GqO/Xaea1FvqbXvA+Z77kNeW3GPbV+4DJfzcm/pcm3H6Vou5AdAFLC2ed2Pjv1txa8sV8T6wOL+yZEKu1JXFy4MDBOE4ScZxcZLinoB8gAAAAAAAAAAAB242LeyJ+C3GvN9C7QLmJtePYpKS+5c+p8F2IDYAANJqj1T4oCfk7Nj3G5Wn9qXJax7gJ93Z82D8sVNc4v30A6Xg5i42Z+iLfqARwcyT0sz9MWvWBps7LlTf5Grce9/oBTxdtxseklHxT+uWr9AGoAB138ezfj4bsFJdD6V2MCPm7RdtJzs1uW1xXzL3gTgAAAAAAAAADRhYc8q74I6RWs5ckB6GxYtWLat21SK731sDsAAAAAAAAAAAAAAAASt021NO/YjrxuQXT1oCOAAAAAAABzGLlJRSq26JAelwsWONYjbXxcZvmwO8AAAAAAAAAAAAAAAAAAef3TEWPkVivx3NY9T6UBiAAAAAABo2+VmGXblddIJ8eivRUD0oAAAAAAAAAAAAAAAAAAAYt4tKeFKVNYNSXfRgefAAAAAAAAr7VuSSWPedKaW5v1MCsAAAAAAAAAAAAAAAAAAIe6bj96Ts2n+JPzSXzP3ATgAAAAAAAAFbbt1UUrOQ9FpC4/UwK6aaqtU+DAAAAAAAAAAAAAAA4lKMIuUmoxWrb4ARNx3R3q2rLpa4Sl0y/YCcAAAAAAAAAAANmFud7G8r89r6X0dgFvGzLGRGtuWvTF6NAdwAAAAAAAAAAAy5W442PVN+K59EePp5ARMvOv5MvO6QXCC4AZwAAAAAAAAAAAAAcxlKLUotprg1owN+PvORborq+7Hnwl3gUbO74VzRydt8pKn68ANcJwmqwkpLmnUDkAAAAfNy9atqtyagut0AxXt5xIV8Fbj6lRd7Am5G65V6qUvtwfyx94GMAAAAAAAAAAAAAAAAAAAOU2nVOj5gdsc3LiqRvTpyqwOxbnnrhdfpSfrQB7pnv/AGvuS9gHXPMy5/Fem1yq0v0A6W29XqwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf//Z";
+	/**
+	 * avatar 头像
+	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
+	 * @tutorial https://www.uviewui.com/components/avatar.html
+	 * @property {String} bg-color 背景颜色，一般显示文字时用（默认#ffffff）
+	 * @property {String} src 头像路径，如加载失败，将会显示默认头像
+	 * @property {String Number} size 头像尺寸，可以为指定字符串(large, default, mini)，或者数值，单位rpx（默认default）
+	 * @property {String} mode 显示类型，见上方说明（默认circle）
+	 * @property {String} sex-icon 性别图标，man-男，woman-女（默认man）
+	 * @property {String} level-icon 等级图标（默认level）
+	 * @property {String} sex-bg-color 性别图标背景颜色
+	 * @property {String} level-bg-color 等级图标背景颜色
+	 * @property {String} show-sex 是否显示性别图标（默认false）
+	 * @property {String} show-level 是否显示等级图标（默认false）
+	 * @property {String} img-mode 头像图片的裁剪类型，与uni的image组件的mode参数一致，如效果达不到需求，可尝试传widthFix值（默认aspectFill）
+	 * @property {String} index 用户传递的标识符值，如果是列表循环，可穿v-for的index值
+	 * @event {Function} click 头像被点击
+	 * @example <u-avatar :src="src"></u-avatar>
+	 */
+	export default {
+		name: 'u-avatar',
+		props: {
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: 'transparent'
+			},
+			// 头像路径
+			src: {
+				type: String,
+				default: ''
+			},
+			// 尺寸，large-大，default-中等，mini-小，如果为数值，则单位为rpx
+			// 宽度等于高度
+			size: {
+				type: [String, Number],
+				default: 'default'
+			},
+			// 头像模型，square-带圆角方形，circle-圆形
+			mode: {
+				type: String,
+				default: 'circle'
+			},
+			// 文字内容
+			text: {
+				type: String,
+				default: ''
+			},
+			// 图片的裁剪模型
+			imgMode: {
+				type: String,
+				default: 'aspectFill'
+			},
+			// 标识符
+			index: {
+				type: [String, Number],
+				default: ''
+			},
+			// 右上角性别角标，man-男，woman-女
+			sexIcon: {
+				type: String,
+				default: 'man'
+			},
+			// 右下角的等级图标
+			levelIcon: {
+				type: String,
+				default: 'level'
+			},
+			// 右下角等级图标背景颜色
+			levelBgColor: {
+				type: String,
+				default: ''
+			},
+			// 右上角性别图标的背景颜色
+			sexBgColor: {
+				type: String,
+				default: ''
+			},
+			// 是否显示性别图标
+			showSex: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示等级图标
+			showLevel: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				error: false,
+				// 头像的地址，因为如果加载错误，需要赋值为默认图片，props值无法修改，所以需要一个中间值
+                avatar: this.src ? this.src : base64Avatar, 
+			}
+		},
+        watch: {
+            src(n) {
+                // 用户可能会在头像加载失败时，再次修改头像值，所以需要重新赋值
+                if(!n) {
+					// 如果传入null或者''，或者undefined，显示默认头像
+					this.avatar = base64Avatar;
+					this.error = true;
+				} else {
+					this.avatar = n;
+					this.error = false;
+				}
+            }
+        },
+		computed: {
+			wrapStyle() {
+				let style = {};  
+				style.height = this.size == 'large' ? '120rpx' : this.size == 'default' ?
+				'90rpx' : this.size == 'mini' ? '70rpx' : this.size + 'rpx';
+				style.width = style.height;
+				style.flex = `0 0 ${style.height}`;
+				style.backgroundColor = this.bgColor;
+				style.borderRadius = this.mode == 'circle' ? '500px' : '5px';
+				if(this.text) style.padding = `0 6rpx`;
+				return style;
+			},
+			imgStyle() {
+				let style = {};
+				style.borderRadius = this.mode == 'circle' ? '500px' : '5px';
+				return style;
+			},
+			// 取字符串的第一个字符
+			uText() {
+				return String(this.text)[0];
+			},
+			// 性别图标的自定义样式
+			uSexStyle() {
+				let style = {};
+				if(this.sexBgColor) style.backgroundColor = this.sexBgColor;
+				return style;
+			},
+			// 等级图标的自定义样式
+			uLevelStyle() {
+				let style = {};
+				if(this.levelBgColor) style.backgroundColor = this.levelBgColor;
+				return style;
+			}
+		},
+		methods: {
+			// 图片加载错误时，显示默认头像
+			loadError() {
+				this.error = true;
+                this.avatar = base64Avatar;
+			},
+			click() {
+				this.$emit('click', this.index);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-avatar {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;		
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-content-color;
+		border-radius: 10px;
+		position: relative;
+		
+		&__img {
+			width: 100%;
+			height: 100%;
+		}
+		
+		&__sex {
+			position: absolute;
+			width: 32rpx;
+			color: #ffffff;
+			height: 32rpx;
+			@include vue-flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 100rpx;
+			top: 5%;
+			z-index: 1;
+			right: -7%;
+			border: 1px #ffffff solid;
+			
+			&--man {
+				background-color: $u-type-primary;
+			}
+			
+			&--woman {
+				background-color: $u-type-error;
+			}
+			
+			&--none {
+				background-color: $u-type-warning;
+			}
+		}
+		
+		&__level {
+			position: absolute;
+			width: 32rpx;
+			color: #ffffff;
+			height: 32rpx;
+			@include vue-flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 100rpx;
+			bottom: 5%; 
+			z-index: 1;
+			right: -7%;
+			border: 1px #ffffff solid;
+			background-color: $u-type-warning;
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-back-top/u-back-top.vue b/uview-ui/components/u-back-top/u-back-top.vue
new file mode 100644
index 0000000..7970fc7
--- /dev/null
+++ b/uview-ui/components/u-back-top/u-back-top.vue
@@ -0,0 +1,153 @@
+<template>
+	<view @tap="backToTop" class="u-back-top" :class="['u-back-top--mode--' + mode]" :style="[{
+		bottom: bottom + 'rpx',
+		right: right + 'rpx',
+		borderRadius: mode == 'circle' ? '10000rpx' : '8rpx',
+		zIndex: uZIndex,
+		opacity: opacity
+	}, customStyle]">
+		<view class="u-back-top__content" v-if="!$slots.default && !$slots.$default">
+			<u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon>
+			<view class="u-back-top__content__tips">
+				{{tips}}
+			</view>
+		</view>
+		<slot v-else />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'u-back-top',
+		props: {
+			// 返回顶部的形状，circle-圆形，square-方形
+			mode: {
+				type: String,
+				default: 'circle'
+			},
+			// 自定义图标
+			icon: {
+				type: String,
+				default: 'arrow-upward'
+			},
+			// 提示文字
+			tips: {
+				type: String,
+				default: ''
+			},
+			// 返回顶部滚动时间
+			duration: {
+				type: [Number, String],
+				default: 100
+			},
+			// 滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+			// 距离顶部多少距离显示，单位rpx
+			top: {
+				type: [Number, String],
+				default: 400
+			},
+			// 返回顶部按钮到底部的距离，单位rpx
+			bottom: {
+				type: [Number, String],
+				default: 200
+			},
+			// 返回顶部按钮到右边的距离，单位rpx
+			right: {
+				type: [Number, String],
+				default: 40
+			},
+			// 层级
+			zIndex: {
+				type: [Number, String],
+				default: '9'
+			},
+			// 图标的样式，对象形式
+			iconStyle: {
+				type: Object,
+				default() {
+					return {
+						color: '#909399',
+						fontSize: '38rpx'
+					}
+				}
+			},
+			// 整个组件的样式
+			customStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		watch: {
+			showBackTop(nVal, oVal) {
+				// 当组件的显示与隐藏状态发生跳变时，修改组件的层级和不透明度
+				// 让组件有显示和消失的动画效果，如果用v-if控制组件状态，将无设置动画效果
+				if(nVal) {
+					this.uZIndex = this.zIndex;
+					this.opacity = 1;
+				} else {
+					this.uZIndex = -1;
+					this.opacity = 0;
+				}
+			}
+		},
+		computed: {
+			showBackTop() {
+				// 由于scrollTop为页面的滚动距离，默认为px单位，这里将用于传入的top(rpx)值
+				// 转为px用于比较，如果滚动条到顶的距离大于设定的距离，就显示返回顶部的按钮
+				return this.scrollTop > uni.upx2px(this.top);
+			},
+		},
+		data() {
+			return {
+				// 不透明度，为了让组件有一个显示和隐藏的过渡动画
+				opacity: 0,
+				// 组件的z-index值，隐藏时设置为-1，就会看不到
+				uZIndex: -1
+			}
+		},
+		methods: {
+			backToTop() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: this.duration
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-back-top {
+		width: 80rpx;
+		height: 80rpx;
+		position: fixed;
+		z-index: 9;
+		@include vue-flex;
+		flex-direction: column;
+		justify-content: center;
+		background-color: #E1E1E1;
+		color: $u-content-color;
+		align-items: center;
+		transition: opacity 0.4s;
+		
+		&__content {
+			@include vue-flex;
+			flex-direction: column;
+			align-items: center;
+			
+			&__tips {
+				font-size: 24rpx;
+				transform: scale(0.8);
+				line-height: 1;
+			}
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-badge/u-badge.vue b/uview-ui/components/u-badge/u-badge.vue
new file mode 100644
index 0000000..e85b133
--- /dev/null
+++ b/uview-ui/components/u-badge/u-badge.vue
@@ -0,0 +1,216 @@
+<template>
+	<view v-if="show" class="u-badge" :class="[
+			isDot ? 'u-badge-dot' : '', 
+			size == 'mini' ? 'u-badge-mini' : '',
+			type ? 'u-badge--bg--' + type : ''
+		]" :style="[{
+			top: offset[0] + 'rpx',
+			right: offset[1] + 'rpx',
+			fontSize: fontSize + 'rpx',
+			position: absolute ? 'absolute' : 'static',
+			color: color,
+			backgroundColor: bgColor
+		}, boxStyle]"
+	>
+		{{showText}}
+	</view>
+</template>
+
+<script>
+	/**
+	 * badge 角标
+	 * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
+	 * @tutorial https://www.uviewui.com/components/badge.html
+	 * @property {String Number} count 展示的数字，大于 overflowCount 时显示为 ${overflowCount}+，为0且show-zero为false时隐藏
+	 * @property {Boolean} is-dot 不展示数字，只有一个小点（默认false）
+	 * @property {Boolean} absolute 组件是否绝对定位，为true时，offset参数才有效（默认true）
+	 * @property {String Number} overflow-count 展示封顶的数字值（默认99）
+	 * @property {String} type 使用预设的背景颜色（默认error）
+	 * @property {Boolean} show-zero 当数值为 0 时，是否展示 Badge（默认false）
+	 * @property {String} size Badge的尺寸，设为mini会得到小一号的Badge（默认default）
+	 * @property {Array} offset 设置badge的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx。absolute为true时有效（默认[20, 20]）
+	 * @property {String} color 字体颜色（默认#ffffff）
+	 * @property {String} bgColor 背景颜色，优先级比type高，如设置，type参数会失效
+	 * @property {Boolean} is-center 组件中心点是否和父组件右上角重合，优先级比offset高，如设置，offset参数会失效（默认false）
+	 * @example <u-badge type="error" count="7"></u-badge>
+	 */
+	export default {
+		name: 'u-badge',
+		props: {
+			// primary,warning,success,error,info
+			type: {
+				type: String,
+				default: 'error'
+			},
+			// default, mini
+			size: {
+				type: String,
+				default: 'default'
+			},
+			//是否是圆点
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			// 显示的数值内容
+			count: {
+				type: [Number, String],
+			},
+			// 展示封顶的数字值
+			overflowCount: {
+				type: Number,
+				default: 99
+			},
+			// 当数值为 0 时，是否展示 Badge
+			showZero: {
+				type: Boolean,
+				default: false
+			},
+			// 位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [20, 20]
+				}
+			},
+			// 是否开启绝对定位，开启了offset才会起作用
+			absolute: {
+				type: Boolean,
+				default: true
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: '24'
+			},
+			// 字体演示
+			color: {
+				type: String,
+				default: '#ffffff'
+			},
+			// badge的背景颜色
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 是否让badge组件的中心点和父组件右上角重合，配置的话，offset将会失效
+			isCenter: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			// 是否将badge中心与父组件右上角重合
+			boxStyle() {
+				let style = {};
+				if(this.isCenter) {
+					style.top = 0;
+					style.right = 0;
+					// Y轴-50%，意味着badge向上移动了badge自身高度一半，X轴50%，意味着向右移动了自身宽度一半
+					style.transform = "translateY(-50%) translateX(50%)";
+				} else {
+					style.top = this.offset[0] + 'rpx';
+					style.right = this.offset[1] + 'rpx';
+					style.transform = "translateY(0) translateX(0)";
+				}
+				// 如果尺寸为mini，后接上scal()
+				if(this.size == 'mini') {
+					style.transform = style.transform + " scale(0.8)";
+				}
+				return style;
+			},
+			// isDot类型时，不显示文字
+			showText() {
+				if(this.isDot) return '';
+				else {
+					if(this.count > this.overflowCount) return `${this.overflowCount}+`;
+					else return this.count;
+				}
+			},
+			// 是否显示组件
+			show() {
+				// 如果count的值为0，并且showZero设置为false，不显示组件
+				if(this.count == 0 && this.showZero == false) return false;
+				else return true;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-badge {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		line-height: 24rpx;
+		padding: 4rpx 8rpx;
+		border-radius: 100rpx;
+		z-index: 9;
+		
+		&--bg--primary {
+			background-color: $u-type-primary;
+		}
+		
+		&--bg--error {
+			background-color: $u-type-error;
+		}
+		
+		&--bg--success {
+			background-color: $u-type-success;
+		}
+		
+		&--bg--info {
+			background-color: $u-type-info;
+		}
+		
+		&--bg--warning {
+			background-color: $u-type-warning;
+		}
+	}
+	
+	.u-badge-dot {
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 100rpx;
+		line-height: 1;
+	}
+	
+	.u-badge-mini {
+		transform: scale(0.8);
+		transform-origin: center center;
+	}
+	
+	// .u-primary {
+	// 	background: $u-type-primary;
+	// 	color: #fff;
+	// }
+	
+	// .u-error {
+	// 	background: $u-type-error;
+	// 	color: #fff;
+	// }
+	
+	// .u-warning {
+	// 	background: $u-type-warning;
+	// 	color: #fff;
+	// }
+	
+	// .u-success {
+	// 	background: $u-type-success;
+	// 	color: #fff;
+	// }
+	
+	// .u-black {
+	// 	background: #585858;
+	// 	color: #fff;
+	// }
+	
+	.u-info {
+		background-color: $u-type-info;
+		color: #fff;
+	}
+</style>
\ No newline at end of file
diff --git a/uview-ui/components/u-button/u-button.vue b/uview-ui/components/u-button/u-button.vue
new file mode 100644
index 0000000..82c3a6f
--- /dev/null
+++ b/uview-ui/components/u-button/u-button.vue
@@ -0,0 +1,596 @@
+<template>
+	<button
+		id="u-wave-btn"
+		class="u-btn u-line-1 u-fix-ios-appearance"
+		:class="[
+			'u-size-' + size,
+			plain ? 'u-btn--' + type + '--plain' : '',
+			loading ? 'u-loading' : '',
+			shape == 'circle' ? 'u-round-circle' : '',
+			hairLine ? showHairLineBorder : 'u-btn--bold-border',
+			'u-btn--' + type,
+			disabled ? `u-btn--${type}--disabled` : '',
+		]"
+		:hover-start-time="Number(hoverStartTime)"
+		:hover-stay-time="Number(hoverStayTime)"
+		:disabled="disabled"
+		:form-type="formType"
+		:open-type="openType"
+		:app-parameter="appParameter"
+		:hover-stop-propagation="hoverStopPropagation"
+		:send-message-title="sendMessageTitle"
+		send-message-path="sendMessagePath"
+		:lang="lang"
+		:data-name="dataName"
+		:session-from="sessionFrom"
+		:send-message-img="sendMessageImg"
+		:show-message-card="showMessageCard"
+		@getphonenumber="getphonenumber"
+		@getuserinfo="getuserinfo"
+		@error="error"
+		@opensetting="opensetting"
+		@launchapp="launchapp"
+		:style="[customStyle, {
+			overflow: ripple ? 'hidden' : 'visible'
+		}]"
+		@tap.stop="click($event)"
+		:hover-class="getHoverClass"
+		:loading="loading"
+	>
+		<slot></slot>
+		<view
+			v-if="ripple"
+			class="u-wave-ripple"
+			:class="[waveActive ? 'u-wave-active' : '']"
+			:style="{
+				top: rippleTop + 'px',
+				left: rippleLeft + 'px',
+				width: fields.targetWidth + 'px',
+				height: fields.targetWidth + 'px',
+				'background-color': rippleBgColor || 'rgba(0, 0, 0, 0.15)'
+			}"
+		></view>
+	</button>
+</template>
+
+<script>
+/**
+ * button 按钮
+ * @description Button 按钮
+ * @tutorial https://www.uviewui.com/components/button.html
+ * @property {String} size 按钮的大小
+ * @property {Boolean} ripple 是否开启点击水波纹效果
+ * @property {String} ripple-bg-color 水波纹的背景色，ripple为true时有效
+ * @property {String} type 按钮的样式类型
+ * @property {Boolean} plain 按钮是否镂空，背景色透明
+ * @property {Boolean} disabled 是否禁用
+ * @property {Boolean} hair-line 是否显示按钮的细边框(默认true)
+ * @property {Boolean} shape 按钮外观形状，见文档说明
+ * @property {Boolean} loading 按钮名称前是否带 loading 图标(App-nvue 平台，在 ios 上为雪花，Android上为圆圈)
+ * @property {String} form-type 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
+ * @property {String} open-type 开放能力
+ * @property {String} data-name 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
+ * @property {String} hover-class 指定按钮按下去的样式类。当 hover-class="none" 时，没有点击态效果(App-nvue 平台暂不支持)
+ * @property {Number} hover-start-time 按住后多久出现点击态，单位毫秒
+ * @property {Number} hover-stay-time 手指松开后点击态保留时间，单位毫秒
+ * @property {Object} custom-style 对按钮的自定义样式，对象形式，见文档说明
+ * @event {Function} click 按钮点击
+ * @event {Function} getphonenumber open-type="getPhoneNumber"时有效
+ * @event {Function} getuserinfo 用户点击该按钮时，会返回获取到的用户信息，从返回参数的detail中获取到的值同uni.getUserInfo
+ * @event {Function} error 当使用开放能力时，发生错误的回调
+ * @event {Function} opensetting 在打开授权设置页并关闭后回调
+ * @event {Function} launchapp 打开 APP 成功的回调
+ * @example <u-button>月落</u-button>
+ */
+export default {
+	name: 'u-button',
+	props: {
+		// 是否细边框
+		hairLine: {
+			type: Boolean,
+			default: true
+		},
+		// 按钮的预置样式，default，primary，error，warning，success
+		type: {
+			type: String,
+			default: 'default'
+		},
+		// 按钮尺寸，default，medium，mini
+		size: {
+			type: String,
+			default: 'default'
+		},
+		// 按钮形状，circle（两边为半圆），square（带圆角）
+		shape: {
+			type: String,
+			default: 'square'
+		},
+		// 按钮是否镂空
+		plain: {
+			type: Boolean,
+			default: false
+		},
+		// 是否禁止状态
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 是否加载中
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		// 开放能力，具体请看uniapp稳定关于button组件部分说明
+		// https://uniapp.dcloud.io/component/button
+		openType: {
+			type: String,
+			default: ''
+		},
+		// 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
+		// 取值为submit（提交表单），reset（重置表单）
+		formType: {
+			type: String,
+			default: ''
+		},
+		// 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
+		// 只微信小程序、QQ小程序有效
+		appParameter: {
+			type: String,
+			default: ''
+		},
+		// 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
+		hoverStopPropagation: {
+			type: Boolean,
+			default: false
+		},
+		// 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
+		lang: {
+			type: String,
+			default: 'en'
+		},
+		// 会话来源，open-type="contact"时有效。只微信小程序有效
+		sessionFrom: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片标题，open-type="contact"时有效
+		// 默认当前标题，只微信小程序有效
+		sendMessageTitle: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
+		// 默认当前分享路径，只微信小程序有效
+		sendMessagePath: {
+			type: String,
+			default: ''
+		},
+		// 会话内消息卡片图片，open-type="contact"时有效
+		// 默认当前页面截图，只微信小程序有效
+		sendMessageImg: {
+			type: String,
+			default: ''
+		},
+		// 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
+		// 用户点击后可以快速发送小程序消息，open-type="contact"时有效
+		showMessageCard: {
+			type: Boolean,
+			default: false
+		},
+		// 手指按（触摸）按钮时按钮时的背景颜色
+		hoverBgColor: {
+			type: String,
+			default: ''
+		},
+		// 水波纹的背景颜色
+		rippleBgColor: {
+			type: String,
+			default: ''
+		},
+		// 是否开启水波纹效果
+		ripple: {
+			type: Boolean,
+			default: false
+		},
+		// 按下的类名
+		hoverClass: {
+			type: String,
+			default: ''
+		},
+		// 自定义样式，对象形式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
+		dataName: {
+			type: String,
+			default: ''
+		},
+		// 节流，一定时间内只能触发一次
+		throttleTime: {
+			type: [String, Number],
+			default: 1000
+		},
+		// 按住后多久出现点击态，单位毫秒
+		hoverStartTime: {
+			type: [String, Number],
+			default: 20
+		},
+		// 手指松开后点击态保留时间，单位毫秒
+		hoverStayTime: {
+			type: [String, Number],
+			default: 150
+		},
+	},
+	computed: {
+		// 当没有传bgColor变量时，按钮按下去的颜色类名
+		getHoverClass() {
+			// 如果开启水波纹效果，则不启用hover-class效果
+			if (this.loading || this.disabled || this.ripple || this.hoverClass) return '';
+			let hoverClass = '';
+			hoverClass = this.plain ? 'u-' + this.type + '-plain-hover' : 'u-' + this.type + '-hover';
+			return hoverClass;
+		},
+		// 在'primary', 'success', 'error', 'warning'类型下，不显示边框，否则会造成四角有毛刺现象
+		showHairLineBorder() {
+			if (['primary', 'success', 'error', 'warning'].indexOf(this.type) >= 0 && !this.plain) {
+				return '';
+			} else {
+				return 'u-hairline-border';
+			}
+		}
+	},
+	data() {
+		return {
+			rippleTop: 0, // 水波纹的起点Y坐标到按钮上边界的距离
+			rippleLeft: 0, // 水波纹起点X坐标到按钮左边界的距离
+			fields: {}, // 波纹按钮节点信息
+			waveActive: false // 激活水波纹
+		};
+	},
+	methods: {
+		// 按钮点击
+		click(e) {
+			// 进行节流控制，每this.throttle毫秒内，只在开始处执行
+			this.$u.throttle(() => {
+				// 如果按钮时disabled和loading状态，不触发水波纹效果
+				if (this.loading === true || this.disabled === true) return;
+				// 是否开启水波纹效果
+				if (this.ripple) {
+					// 每次点击时，移除上一次的类，再次添加，才能触发动画效果
+					this.waveActive = false;
+					this.$nextTick(function() {
+						this.getWaveQuery(e);
+					});
+				}
+				this.$emit('click', e);
+			}, this.throttleTime);
+		},
+		// 查询按钮的节点信息
+		getWaveQuery(e) {
+			this.getElQuery().then(res => {
+				// 查询返回的是一个数组节点
+				let data = res[0];
+				// 查询不到节点信息，不操作
+				if (!data.width || !data.width) return;
+				// 水波纹的最终形态是一个正方形(通过border-radius让其变为一个圆形)，这里要保证正方形的边长等于按钮的最长边
+				// 最终的方形（变换后的圆形）才能覆盖整个按钮
+				data.targetWidth = data.height > data.width ? data.height : data.width;
+				if (!data.targetWidth) return;
+				this.fields = data;
+				let touchesX = '',
+					touchesY = '';
+				// #ifdef MP-BAIDU
+				touchesX = e.changedTouches[0].clientX;
+				touchesY = e.changedTouches[0].clientY;
+				// #endif
+				// #ifdef MP-ALIPAY
+				touchesX = e.detail.clientX;
+				touchesY = e.detail.clientY;
+				// #endif
+				// #ifndef MP-BAIDU || MP-ALIPAY
+				touchesX = e.touches[0].clientX;
+				touchesY = e.touches[0].clientY;
+				// #endif
+				// 获取触摸点相对于按钮上边和左边的x和y坐标，原理是通过屏幕的触摸点（touchesY），减去按钮的上边界data.top
+				// 但是由于`transform-origin`默认是center，所以这里再减去半径才是水波纹view应该的位置
+				// 总的来说，就是把水波纹的矩形（变换后的圆形）的中心点，移动到我们的触摸点位置
+				this.rippleTop = touchesY - data.top - data.targetWidth / 2;
+				this.rippleLeft = touchesX - data.left - data.targetWidth / 2;
+				this.$nextTick(() => {
+					this.waveActive = true;
+				});
+			});
+		},
+		// 获取节点信息
+		getElQuery() {
+			return new Promise(resolve => {
+				let queryInfo = '';
+				// 获取元素节点信息，请查看uniapp相关文档
+				// https://uniapp.dcloud.io/api/ui/nodes-info?id=nodesrefboundingclientrect
+				queryInfo = uni.createSelectorQuery().in(this);
+				//#ifdef MP-ALIPAY
+				queryInfo = uni.createSelectorQuery();
+				//#endif
+				queryInfo.select('.u-btn').boundingClientRect();
+				queryInfo.exec(data => {
+					resolve(data);
+				});
+			});
+		},
+		// 下面为对接uniapp官方按钮开放能力事件回调的对接
+		getphonenumber(res) {
+			this.$emit('getphonenumber', res);
+		},
+		getuserinfo(res) {
+			this.$emit('getuserinfo', res);
+		},
+		error(res) {
+			this.$emit('error', res);
+		},
+		opensetting(res) {
+			this.$emit('opensetting', res);
+		},
+		launchapp(res) {
+			this.$emit('launchapp', res);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../libs/css/style.components.scss';
+.u-btn::after {
+	border: none;
+}
+
+.u-btn {
+	position: relative;
+	border: 0;
+	//border-radius: 10rpx;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	// 避免边框某些场景可能被“裁剪”，不能设置为hidden
+	overflow: visible;
+	line-height: 1;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	padding: 0 40rpx;
+	z-index: 1;
+	box-sizing: border-box;
+	transition: all 0.15s;
+	
+	&--bold-border {
+		border: 1px solid #ffffff;
+	}
+	
+	&--default {
+		color: $u-content-color;
+		border-color: #c0c4cc;
+		background-color: #ffffff;
+	}
+	
+	&--primary {
+		color: #ffffff;
+		border-color: $u-type-primary;
+		background-color: $u-type-primary;
+	}
+	
+	&--success {
+		color: #ffffff;
+		border-color: $u-type-success;
+		background-color: $u-type-success;
+	}
+	
+	&--error {
+		color: #ffffff;
+		border-color: $u-type-error;
+		background-color: $u-type-error;
+	}
+	
+	&--warning {
+		color: #ffffff;
+		border-color: $u-type-warning;
+		background-color: $u-type-warning;
+	}
+	
+	&--default--disabled {
+		color: #ffffff;
+		border-color: #e4e7ed;
+		background-color: #ffffff;
+	}
+	
+	&--primary--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-primary-disabled!important;
+		background-color: $u-type-primary-disabled!important;
+	}
+	
+	&--success--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-success-disabled!important;
+		background-color: $u-type-success-disabled!important;
+	}
+	
+	&--error--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-error-disabled!important;
+		background-color: $u-type-error-disabled!important;
+	}
+	
+	&--warning--disabled {
+		color: #ffffff!important;
+		border-color: $u-type-warning-disabled!important;
+		background-color: $u-type-warning-disabled!important;
+	}
+	
+	&--primary--plain {
+		color: $u-type-primary!important;
+		border-color: $u-type-primary-disabled!important;
+		background-color: $u-type-primary-light!important;
+	}
+	
+	&--success--plain {
+		color: $u-type-success!important;
+		border-color: $u-type-success-disabled!important;
+		background-color: $u-type-success-light!important;
+	}
+	
+	&--error--plain {
+		color: $u-type-error!important;
+		border-color: $u-type-error-disabled!important;
+		background-color: $u-type-error-light!important;
+	}
+	
+	&--warning--plain {
+		color: $u-type-warning!important;
+		border-color: $u-type-warning-disabled!important;
+		background-color: $u-type-warning-light!important;
+	}
+}
+
+.u-hairline-border:after {
+	content: ' ';
+	position: absolute;
+	pointer-events: none;
+	// 设置为border-box，意味着下面的scale缩小为0.5，实际上缩小的是伪元素的内容（border-box意味着内容不含border）
+	box-sizing: border-box;
+	// 中心点作为变形(scale())的原点
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	left: 0;
+	top: 0;
+	width: 199.8%;
+	height: 199.7%;
+	-webkit-transform: scale(0.5, 0.5);
+	transform: scale(0.5, 0.5);
+	border: 1px solid currentColor;
+	z-index: 1;
+}
+
+.u-wave-ripple {
+	z-index: 0;
+	position: absolute;
+	border-radius: 100%;
+	background-clip: padding-box;
+	pointer-events: none;
+	user-select: none;
+	transform: scale(0);
+	opacity: 1;
+	transform-origin: center;
+}
+
+.u-wave-ripple.u-wave-active {
+	opacity: 0;
+	transform: scale(2);
+	transition: opacity 1s linear, transform 0.4s linear;
+}
+
+.u-round-circle {
+	border-radius: 100rpx;
+}
+
+.u-round-circle::after {
+	border-radius: 100rpx;
+}
+
+.u-loading::after {
+	background-color: hsla(0, 0%, 100%, 0.35);
+}
+
+.u-size-default {
+	font-size: 30rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+}
+
+.u-size-medium {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	width: auto;
+	font-size: 26rpx;
+	height: 70rpx;
+	line-height: 70rpx;
+	padding: 0 80rpx;
+}
+
+.u-size-mini {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	width: auto;
+	font-size: 22rpx;
+	padding-top: 1px;
+	height: 50rpx;
+	line-height: 50rpx;
+	padding: 0 20rpx;
+}
+
+.u-primary-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-primary-dark !important;
+}
+
+.u-default-plain-hover {
+	color: $u-type-primary-dark !important;
+	background: $u-type-primary-light !important;
+}
+
+.u-success-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-success-dark !important;
+}
+
+.u-warning-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-warning-dark !important;
+}
+
+.u-error-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-error-dark !important;
+}
+
+.u-info-plain-hover {
+	color: #ffffff !important;
+	background: $u-type-info-dark !important;
+}
+
+.u-default-hover {
+	color: $u-type-primary-dark !important;
+	border-color: $u-type-primary-dark !important;
+	background-color: $u-type-primary-light !important;
+}
+
+.u-primary-hover {
+	background: $u-type-primary-dark !important;
+	color: #fff;
+}
+
+.u-success-hover {
+	background: $u-type-success-dark !important;
+	color: #fff;
+}
+
+.u-info-hover {
+	background: $u-type-info-dark !important;
+	color: #fff;
+}
+
+.u-warning-hover {
+	background: $u-type-warning-dark !important;
+	color: #fff;
+}
+
+.u-error-hover {
+	background: $u-type-error-dark !important;
+	color: #fff;
+}
+</style>
diff --git a/uview-ui/components/u-calendar/u-calendar.vue b/uview-ui/components/u-calendar/u-calendar.vue
new file mode 100644
index 0000000..2b30184
--- /dev/null
+++ b/uview-ui/components/u-calendar/u-calendar.vue
@@ -0,0 +1,639 @@
+<template>
+	<u-popup closeable :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
+	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex" :border-radius="borderRadius" :closeable="closeable">
+		<view class="u-calendar">
+			<view class="u-calendar__header">
+				<view class="u-calendar__header__text" v-if="!$slots['tooltip']">
+					{{toolTip}}
+				</view>
+				<slot v-else name="tooltip" />
+			</view>
+			<view class="u-calendar__action u-flex u-row-center">
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-left-double" :color="yearArrowColor" @click="changeYearHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-left" :color="monthArrowColor" @click="changeMonthHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__text">{{ showTitle }}</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-right" :color="monthArrowColor" @click="changeMonthHandler(1)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-right-double" :color="yearArrowColor" @click="changeYearHandler(1)"></u-icon>
+				</view>
+			</view>
+			<view class="u-calendar__week-day">
+				<view class="u-calendar__week-day__text" v-for="(item, index) in weekDayZh" :key="index">{{item}}</view>
+			</view>
+			<view class="u-calendar__content">
+				<!-- 前置空白部分 -->
+				<block v-for="(item, index) in weekdayArr" :key="index">
+					<view class="u-calendar__content__item"></view>
+				</block>
+				<view class="u-calendar__content__item" :class="{
+					'u-hover-class':openDisAbled(year,month,index+1),
+					'u-calendar__content--start-date': (mode == 'range' && startDate==`${year}-${month}-${index+1}`) || mode== 'date',
+					'u-calendar__content--end-date':(mode== 'range' && endDate==`${year}-${month}-${index+1}`) || mode == 'date'
+				}" :style="{backgroundColor: getColor(index,1)}" v-for="(item, index) in daysArr" :key="index"
+				 @tap="dateClick(index)">
+					<view class="u-calendar__content__item__inner" :style="{color: getColor(index,2)}">
+						<view>{{ index + 1 }}</view>
+					</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && startDate==`${year}-${month}-${index+1}` && startDate!=endDate">{{startText}}</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && endDate==`${year}-${month}-${index+1}`">{{endText}}</view>
+				</view>
+				<view class="u-calendar__content__bg-month">{{month}}</view>
+			</view>
+			<view class="u-calendar__bottom">
+				<view class="u-calendar__bottom__choose">
+					<text>{{mode == 'date' ? activeDate : startDate}}</text>
+					<text v-if="endDate">至{{endDate}}</text>
+				</view>
+				<view class="u-calendar__bottom__btn">
+					<u-button :type="btnType" shape="circle" size="default" @click="btnFix(false)">确定</u-button>
+				</view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+<script>
+	/**
+	 * calendar 日历
+	 * @description 此组件用于单个选择日期，范围选择日期等，日历被包裹在底部弹起的容器中。
+	 * @tutorial http://uviewui.com/components/calendar.html
+	 * @property {String} mode 选择日期的模式，date-为单个日期，range-为选择日期范围
+	 * @property {Boolean} v-model 布尔值变量，用于控制日历的弹出与收起
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+	 * @property {Boolean} change-year 是否显示顶部的切换年份方向的按钮(默认true)
+	 * @property {Boolean} change-month 是否显示顶部的切换月份方向的按钮(默认true)
+	 * @property {String Number} max-year 可切换的最大年份(默认2050)
+	 * @property {String Number} min-year 可切换的最小年份(默认1950)
+	 * @property {String Number} min-date 最小可选日期(默认1950-01-01)
+	 * @property {String Number} max-date 最大可选日期(默认当前日期)
+	 * @property {String Number} 弹窗顶部左右两边的圆角值，单位rpx(默认20)
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭日历(默认true)
+	 * @property {String} month-arrow-color 月份切换按钮箭头颜色(默认#606266)
+	 * @property {String} year-arrow-color 年份切换按钮箭头颜色(默认#909399)
+	 * @property {String} color 日期字体的默认颜色(默认#303133)
+	 * @property {String} active-bg-color 起始/结束日期按钮的背景色(默认#2979ff)
+	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
+	 * @property {String} active-color 起始/结束日期按钮的字体颜色(默认#ffffff)
+	 * @property {String} range-bg-color 起始/结束日期之间的区域的背景颜色(默认rgba(41,121,255,0.13))
+	 * @property {String} range-color 选择范围内字体颜色(默认#2979ff)
+	 * @property {String} start-text 起始日期底部的提示文字(默认 '开始')
+	 * @property {String} end-text 结束日期底部的提示文字(默认 '结束')
+	 * @property {String} btn-type 底部确定按钮的主题(默认 'primary')
+	 * @property {String} toolTip 顶部提示文字，如设置名为tooltip的slot，此参数将失效(默认 '选择日期')
+	 * @property {Boolean} closeable 是否显示右上角的关闭图标(默认true)
+	 * @example <u-calendar v-model="show" :mode="mode"></u-calendar>
+	 */
+	
+	export default {
+		name: 'u-calendar',
+		props: {
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 是否允许通过点击遮罩关闭Picker
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 通过双向绑定控制组件的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			},
+			// 是否允许切换年份
+			changeYear: {
+				type: Boolean,
+				default: true
+			},
+			// 是否允许切换月份
+			changeMonth: {
+				type: Boolean,
+				default: true
+			},
+			// date-单个日期选择，range-开始日期+结束日期选择
+			mode: {
+				type: String,
+				default: 'date'
+			},
+			// 可切换的最大年份
+			maxYear: {
+				type: [Number, String],
+				default: 2050
+			},
+			// 可切换的最小年份
+			minYear: {
+				type: [Number, String],
+				default: 1950
+			},
+			// 最小可选日期(不在范围内日期禁用不可选)
+			minDate: {
+				type: [Number, String],
+				default: '1950-01-01'
+			},
+			/**
+			 * 最大可选日期
+			 * 默认最大值为今天，之后的日期不可选
+			 * 2030-12-31
+			 * */
+			maxDate: {
+				type: [Number, String],
+				default: ''
+			},
+			// 弹窗顶部左右两边的圆角值
+			borderRadius: {
+				type: [String, Number],
+				default: 20
+			},
+			// 月份切换按钮箭头颜色
+			monthArrowColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 年份切换按钮箭头颜色
+			yearArrowColor: {
+				type: String,
+				default: '#909399'
+			},
+			// 默认日期字体颜色
+			color: {
+				type: String,
+				default: '#303133'
+			},
+			// 选中|起始结束日期背景色
+			activeBgColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 选中|起始结束日期字体颜色
+			activeColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 范围内日期背景色
+			rangeBgColor: {
+				type: String,
+				default: 'rgba(41,121,255,0.13)'
+			}, 
+			// 范围内日期字体颜色
+			rangeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// mode=range时生效，起始日期自定义文案
+			startText: {
+				type: String,
+				default: '开始'
+			},
+			// mode=range时生效，结束日期自定义文案
+			endText: {
+				type: String,
+				default: '结束'
+			},
+			//按钮样式类型
+			btnType: {
+				type: String,
+				default: 'primary'
+			},
+			// 当前选中日期带选中效果
+			isActiveCurrent: {
+				type: Boolean,
+				default: true
+			},
+			// 切换年月是否触发事件 mode=date时生效
+			isChange: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示右上角的关闭图标
+			closeable: {
+				type: Boolean,
+				default: true
+			},
+			// 顶部的提示文字
+			toolTip: {
+				type: String,
+				default: '选择日期'
+			}
+		},
+		data() {
+			return {
+				// 星期几,值为1-7
+				weekday: 1, 
+				weekdayArr:[],
+				// 当前月有多少天
+				days: 0, 
+				daysArr:[],
+				showTitle: '',
+				year: 2020,
+				month: 0,
+				day: 0,
+				startYear: 0,
+				startMonth: 0,
+				startDay: 0,
+				endYear: 0,
+				endMonth: 0,
+				endDay: 0,
+				today: '',
+				activeDate: '',
+				startDate: '',
+				endDate: '',
+				isStart: true,
+				min: null,
+				max: null,
+				weekDayZh: ['日', '一', '二', '三', '四', '五', '六']
+			};
+		},
+		computed: {
+			dataChange() {
+				return `${this.mode}-${this.minDate}-${this.maxDate}`;
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		watch: {
+			dataChange(val) {
+				this.init()
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			getColor(index, type) {
+				let color = type == 1 ? '' : 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.isActiveCurrent && this.activeDate == date) || this.startDate == date || this.endDate == date) {
+					color = type == 1 ? this.activeBgColor : this.activeColor;
+				} else if (this.endDate && timestamp > new Date(start).getTime() && timestamp < new Date(end).getTime()) {
+					color = type == 1 ? this.rangeBgColor : this.rangeColor;
+				}
+				return color;
+			},
+			init() {
+				let now = new Date();
+				this.year = now.getFullYear();
+				this.month = now.getMonth() + 1;
+				this.day = now.getDate();
+				this.today = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
+				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.endYear = 0;
+				this.endMonth = 0;
+				this.endDay = 0;
+				this.endDate = "";
+				this.isStart = true;
+				this.changeData();
+			},
+			//日期处理
+			initDate(date) {
+				let fdate = date.split('-');
+				return {
+					year: Number(fdate[0] || 1920),
+					month: Number(fdate[1] || 1),
+					day: Number(fdate[2] || 1)
+				}
+			},
+			openDisAbled: function(year, month, day) {
+				let bool = true;
+				let date = `${year}/${month}/${day}`;
+				// let today = this.today.replace(/\-/g, '/');
+				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()) {
+					bool = false;
+				}
+				return bool;
+			},
+			generateArray: function(start, end) {
+				return Array.from(new Array(end + 1).keys()).slice(start);
+			},
+			formatNum: function(num) {
+				return num < 10 ? '0' + num : num + '';
+			},
+			//一个月有多少天
+			getMonthDay(year, month) {
+				let days = new Date(year, month, 0).getDate();
+				return days;
+			},
+			getWeekday(year, month) {
+				let date = new Date(`${year}/${month}/01 00:00:00`);
+				return date.getDay();
+			},
+			checkRange(year) {
+				let overstep = false;
+				if (year < this.minYear || year > this.maxYear) {
+					uni.showToast({
+						title: "日期超出范围啦~",
+						icon: 'none'
+					})
+					overstep = true;
+				}
+				return overstep;
+			},
+			changeMonthHandler(isAdd) {
+				if (isAdd) {
+					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(isAdd) {
+				let year = isAdd ? this.year + 1 : this.year - 1;
+				if (!this.checkRange(year)) {
+					this.year = year;
+					this.changeData();
+				}
+			},
+			changeData() {
+				this.days = this.getMonthDay(this.year, this.month);
+				this.daysArr=this.generateArray(1,this.days)
+				this.weekday = this.getWeekday(this.year, this.month);
+				this.weekdayArr=this.generateArray(1,this.weekday)
+				this.showTitle = `${this.year}年${this.month}月`;
+				if (this.isChange && this.mode == 'date') {
+					this.btnFix(true);
+				}
+			},
+			dateClick: function(day) {
+				day += 1;
+				if (!this.openDisAbled(this.year, this.month, day)) {
+					this.day = day;
+					let date = `${this.year}-${this.month}-${day}`;
+					if (this.mode == 'date') {
+						this.activeDate = date;
+					} else {
+						let compare = new Date(date.replace(/\-/g, '/')).getTime() < new Date(this.startDate.replace(/\-/g, '/')).getTime()
+						if (this.isStart || compare) {
+							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.isStart = false;
+						} else {
+							this.endDate = date;
+							this.endYear = this.year;
+							this.endMonth = this.month;
+							this.endDay = this.day;
+							this.isStart = true;
+						}
+					}
+				}
+			},
+			close() {
+				// 修改通过v-model绑定的父组件变量的值为false，从而隐藏日历弹窗
+				this.$emit('input', false);
+			},
+			getWeekText(date) {
+				date = new Date(`${date.replace(/\-/g, '/')} 00:00:00`);
+				let week = date.getDay();
+				return '星期' + ['日', '一', '二', '三', '四', '五', '六'][week];
+			},
+			btnFix(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.formatNum(month)}-${this.formatNum(day)}`;
+					let weekText = this.getWeekText(result);
+					let isToday = false;
+					if (`${year}-${month}-${day}` == this.today) {
+						//今天
+						isToday = true;
+					}
+					this.$emit('change', {
+						year: year,
+						month: month,
+						day: day,
+						days: days,
+						result: result,
+						week: weekText,
+						isToday: isToday,
+						// switch: show //是否是切换年月操作
+					});
+				} else {
+					if (!this.startDate || !this.endDate) return;
+					let startMonth = this.formatNum(this.startMonth);
+					let startDay = this.formatNum(this.startDay);
+					let startDate = `${this.startYear}-${startMonth}-${startDay}`;
+					let startWeek = this.getWeekText(startDate)
+
+					let endMonth = this.formatNum(this.endMonth);
+					let endDay = this.formatNum(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: startDate,
+						startWeek: startWeek,
+						endYear: this.endYear,
+						endMonth: this.endMonth,
+						endDay: this.endDay,
+						endDate: endDate,
+						endWeek: endWeek
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-calendar {
+		color: $u-content-color;
+		
+		&__header {
+			width: 100%;
+			box-sizing: border-box;
+			font-size: 30rpx;
+			background-color: #fff;
+			color: $u-main-color;
+			
+			&__text {
+				margin-top: 30rpx;
+				padding: 0 60rpx;
+				@include vue-flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		
+		&__action {
+			padding: 40rpx 0 40rpx 0;
+			
+			&__icon {
+				margin: 0 16rpx;
+			}
+			
+			&__text {
+				padding: 0 16rpx;
+				color: $u-main-color;
+				font-size: 32rpx;
+				line-height: 32rpx;
+				font-weight: bold;
+			}
+		}
+	
+		&__week-day {
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			padding: 6px 0;
+			overflow: hidden;
+			
+			&__text {
+				flex: 1;
+				text-align: center;
+			}
+		}
+	
+		&__content {
+			width: 100%;
+			@include vue-flex;
+			flex-wrap: wrap;
+			padding: 6px 0;
+			box-sizing: border-box;
+			background-color: #fff;
+			position: relative;
+			
+			&--end-date {
+				border-top-right-radius: 8rpx;
+				border-bottom-right-radius: 8rpx;
+			}
+			
+			&--start-date {
+				border-top-left-radius: 8rpx;
+				border-bottom-left-radius: 8rpx;
+			}
+			
+			&__item {
+				width: 14.2857%;
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				padding: 6px 0;
+				overflow: hidden;
+				position: relative;
+				z-index: 2;
+				
+				&__inner {
+					height: 84rpx;
+					@include vue-flex;
+					align-items: center;
+					justify-content: center;
+					flex-direction: column;
+					font-size: 32rpx;
+					position: relative;
+					border-radius: 50%;
+					
+					&__desc {
+						width: 100%;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						transform: scale(0.75);
+						transform-origin: center center;
+						position: absolute;
+						left: 0;
+						text-align: center;
+						bottom: 2rpx;
+					}
+				}
+				
+				&__tips {
+					width: 100%;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					position: absolute;
+					left: 0;
+					transform: scale(0.8);
+					transform-origin: center center;
+					text-align: center;
+					bottom: 8rpx;
+					z-index: 2;
+				}
+			}
+			
+			&__bg-month {
+				position: absolute;
+				font-size: 130px;
+				line-height: 130px;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				color: #e4e7ed;
+				z-index: 1;
+			}
+		}
+	
+		&__bottom {
+			width: 100%;
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #fff;
+			padding: 0 40rpx 30rpx;
+			box-sizing: border-box;
+			font-size: 24rpx;
+			color: $u-tips-color;
+			
+			&__choose {
+				height: 50rpx;
+			}
+			
+			&__btn {
+				width: 100%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-ui/components/u-calendarWeek/u-calendarWeek.vue b/uview-ui/components/u-calendarWeek/u-calendarWeek.vue
new file mode 100644
index 0000000..137640b
--- /dev/null
+++ b/uview-ui/components/u-calendarWeek/u-calendarWeek.vue
@@ -0,0 +1,705 @@
+<template>
+	<u-popup closeable :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
+	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex" :border-radius="borderRadius" :closeable="closeable">
+		<view class="u-calendar">
+			<view class="u-calendar__header">
+				<view class="u-calendar__header__text" v-if="!$slots['tooltip']">
+					{{toolTip}}
+				</view>
+				<slot v-else name="tooltip" />
+				<!-- <view style="text-align: center;display: flex;align-items: center;justify-content: start;color:grey;padding-left:20rpx;"><view style="width: 20rpx;height: 20rpx;background-color: blue;margin-right: 10rpx;"></view>已预约</view> -->
+			</view>
+			<view class="u-calendar__action u-flex u-row-center">
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-left-double" :color="yearArrowColor" @click="changeYearHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-left" :color="monthArrowColor" @click="changeMonthHandler(0)"></u-icon>
+				</view>
+				<view class="u-calendar__action__text">{{ showTitle }}</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeMonth" name="arrow-right" :color="monthArrowColor" @click="changeMonthHandler(1)"></u-icon>
+				</view>
+				<view class="u-calendar__action__icon">
+					<u-icon v-if="changeYear" name="arrow-right-double" :color="yearArrowColor" @click="changeYearHandler(1)"></u-icon>
+				</view>
+			</view>
+			<view class="u-calendar__week-day">
+				<view class="u-calendar__week-day__text" v-for="(item, index) in weekDayZh" :key="index">{{item}}</view>
+			</view>
+			<view class="u-calendar__content">
+				<!-- 前置空白部分 -->
+				<block v-for="(item, index) in weekdayArr" :key="index">
+					<view class="u-calendar__content__item"></view>
+				</block>
+        <!-- {{ daysArr }} -->
+				<view class="u-calendar__content__item" :class="{
+					'u-hover-class':openDisAbled(year,month,index+1),
+					'disabled':openDisAbled(year,month,index+1),
+					'u-calendar__content--start-date': (mode == 'range' && startDate==`${year}-${month}-${index+1}`) || mode== 'date',
+					'u-calendar__content--end-date':(mode== 'range' && endDate==`${year}-${month}-${index+1}`) || mode == 'date'
+				}" :style="{backgroundColor: getColor(index,1)}" v-for="(item, index) in daysArr" :key="index"
+				 @tap="dateClick(index)">
+				 <!-- 选过的标记一下 -->
+				 	<view class="selected" v-if="isSelected(year,month,index+1)">已预约</view>
+					<view class="u-calendar__content__item__inner" :style="{color: getColor(index,2)}">
+						<view>{{ index + 1 }}</view>
+					</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && startDate==`${year}-${month}-${index+1}` && startDate!=endDate">{{startText}}</view>
+					<view class="u-calendar__content__item__tips" :style="{color:activeColor}" v-if="mode== 'range' && endDate==`${year}-${month}-${index+1}`">{{endText}}</view>
+				</view>
+				<view class="u-calendar__content__bg-month">{{month}}</view>
+			</view>
+			<view class="u-calendar__bottom">
+				<view class="u-calendar__bottom__choose">
+					<text>{{mode == 'date' ? activeDate : startDate}}</text>
+					<text v-if="endDate">至{{endDate}}</text>
+				</view>
+				<view class="u-calendar__bottom__btn">
+					<u-button :type="btnType" shape="circle" size="default" @click="btnFix(false)">确定</u-button>
+				</view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+<script>
+	/**
+	 * calendar 日历
+	 * @description 此组件用于单个选择日期，范围选择日期等，日历被包裹在底部弹起的容器中。
+	 * @tutorial http://uviewui.com/components/calendar.html
+	 * @property {String} mode 选择日期的模式，date-为单个日期，range-为选择日期范围
+	 * @property {Boolean} v-model 布尔值变量，用于控制日历的弹出与收起
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+	 * @property {Boolean} change-year 是否显示顶部的切换年份方向的按钮(默认true)
+	 * @property {Boolean} change-month 是否显示顶部的切换月份方向的按钮(默认true)
+	 * @property {String Number} max-year 可切换的最大年份(默认2050)
+	 * @property {String Number} min-year 可切换的最小年份(默认1950)
+	 * @property {String Number} min-date 最小可选日期(默认1950-01-01)
+	 * @property {String Number} max-date 最大可选日期(默认当前日期)
+	 * @property {String Number} 弹窗顶部左右两边的圆角值，单位rpx(默认20)
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭日历(默认true)
+	 * @property {String} month-arrow-color 月份切换按钮箭头颜色(默认#606266)
+	 * @property {String} year-arrow-color 年份切换按钮箭头颜色(默认#909399)
+	 * @property {String} color 日期字体的默认颜色(默认#303133)
+	 * @property {String} active-bg-color 起始/结束日期按钮的背景色(默认#2979ff)
+	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
+	 * @property {String} active-color 起始/结束日期按钮的字体颜色(默认#ffffff)
+	 * @property {String} range-bg-color 起始/结束日期之间的区域的背景颜色(默认rgba(41,121,255,0.13))
+	 * @property {String} range-color 选择范围内字体颜色(默认#2979ff)
+	 * @property {String} start-text 起始日期底部的提示文字(默认 '开始')
+	 * @property {String} end-text 结束日期底部的提示文字(默认 '结束')
+	 * @property {String} btn-type 底部确定按钮的主题(默认 'primary')
+	 * @property {String} toolTip 顶部提示文字，如设置名为tooltip的slot，此参数将失效(默认 '选择日期')
+	 * @property {Boolean} closeable 是否显示右上角的关闭图标(默认true)
+	 * @example <u-calendar v-model="show" :mode="mode"></u-calendar>
+	 */
+	
+	export default {
+		name: 'u-calendarWeek',
+		props: {
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 是否允许通过点击遮罩关闭Picker
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 通过双向绑定控制组件的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			},
+			// 是否允许切换年份
+			changeYear: {
+				type: Boolean,
+				default: true
+			},
+			// 是否允许切换月份
+			changeMonth: {
+				type: Boolean,
+				default: true
+			},
+			// date-单个日期选择，range-开始日期+结束日期选择
+			mode: {
+				type: String,
+				default: 'date'
+			},
+			// 可切换的最大年份
+			maxYear: {
+				type: [Number, String],
+				default: 2050
+			},
+			// 可切换的最小年份
+			minYear: {
+				type: [Number, String],
+				default: 1950
+			},
+			// 最小可选日期(不在范围内日期禁用不可选)
+			minDate: {
+				type: [Number, String],
+				default: '1950-01-01'
+			},
+			/**
+			 * 最大可选日期
+			 * 默认最大值为今天，之后的日期不可选
+			 * 2030-12-31
+			 * */
+			maxDate: {
+				type: [Number, String],
+				default: ''
+			},
+			// 弹窗顶部左右两边的圆角值
+			borderRadius: {
+				type: [String, Number],
+				default: 20
+			},
+			// 月份切换按钮箭头颜色
+			monthArrowColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 年份切换按钮箭头颜色
+			yearArrowColor: {
+				type: String,
+				default: '#909399'
+			},
+			// 默认日期字体颜色
+			color: {
+				type: String,
+				default: '#303133'
+			},
+			// 选中|起始结束日期背景色
+			activeBgColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 选中|起始结束日期字体颜色
+			activeColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 范围内日期背景色
+			rangeBgColor: {
+				type: String,
+				default: 'rgba(41,121,255,0.13)'
+			}, 
+			// 范围内日期字体颜色
+			rangeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// mode=range时生效，起始日期自定义文案
+			startText: {
+				type: String,
+				default: '开始'
+			},
+			// mode=range时生效，结束日期自定义文案
+			endText: {
+				type: String,
+				default: '结束'
+			},
+			//按钮样式类型
+			btnType: {
+				type: String,
+				default: 'primary'
+			},
+			// 当前选中日期带选中效果
+			isActiveCurrent: {
+				type: Boolean,
+				default: true
+			},
+			// 切换年月是否触发事件 mode=date时生效
+			isChange: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示右上角的关闭图标
+			closeable: {
+				type: Boolean,
+				default: true
+			},
+			// 顶部的提示文字
+			toolTip: {
+				type: String,
+				default: '选择日期'
+			},
+      // 排除的星期几  [0,1,2,3,4,5,6]
+      filterWeek:{
+        type:Array,
+        default:[]
+      },
+	  // 已预约的日期
+	  filterDate:{
+		type:Array,
+		default:[]
+	  }
+		},
+		data() {
+			return {
+				// 星期几,值为1-7
+				weekday: 1, 
+				weekdayArr:[],
+				// 当前月有多少天
+				days: 0, 
+				daysArr:[],
+				showTitle: '',
+				year: 2020,
+				month: 0,
+				day: 0,
+				startYear: 0,
+				startMonth: 0,
+				startDay: 0,
+				endYear: 0,
+				endMonth: 0,
+				endDay: 0,
+				today: '',
+				activeDate: '',
+				startDate: '',
+				endDate: '',
+				isStart: true,
+				min: null,
+				max: null,
+				weekDayZh: ['日', '一', '二', '三', '四', '五', '六']
+			};
+		},
+		computed: {
+			dataChange() {
+				return `${this.mode}-${this.minDate}-${this.maxDate}`;
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		watch: {
+			dataChange(val) {
+				this.init()
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			getColor(index, type) {
+				let color = type == 1 ? '' : 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.isActiveCurrent && this.activeDate == date) || this.startDate == date || this.endDate == date) {
+					color = type == 1 ? this.activeBgColor : this.activeColor;
+				} else if (this.endDate && timestamp > new Date(start).getTime() && timestamp < new Date(end).getTime()) {
+					color = type == 1 ? this.rangeBgColor : this.rangeColor;
+				}
+				return color;
+			},
+			init() {
+				let now = new Date();
+				this.year = now.getFullYear();
+				this.month = now.getMonth() + 1;
+				this.day = now.getDate();
+				this.today = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
+				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.endYear = 0;
+				this.endMonth = 0;
+				this.endDay = 0;
+				this.endDate = "";
+				this.isStart = true;
+				this.changeData();
+			},
+			//日期处理
+			initDate(date) {
+				let fdate = date.split('-');
+				return {
+					year: Number(fdate[0] || 1920),
+					month: Number(fdate[1] || 1),
+					day: Number(fdate[2] || 1)
+				}
+			},
+      // 判断是否禁用
+			openDisAbled: function(year, month, day) {
+				let bool = true;
+        
+				let date = `${year}/${month}/${day}`;
+				// console.log(date,'date')
+				// let today = this.today.replace(/\-/g, '/');
+				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()) {
+					bool = false;
+				}
+				// 排除星期几 示例排除星期五
+				let currentWeek =  new Date(year, month - 1, day).getDay();
+				// console.log(typeof currentWeek,'currentWeek--')
+				// console.log(currentWeek,'currentWeek--')
+				// 0 星期日
+				// [0,1,2,3,4,5,6]
+				if(this.filterWeek.includes(currentWeek)){
+				bool = true;
+				}
+				// 在选中日期内也要禁掉
+				if(this.filterDate.includes(date)){
+					bool = true;
+				}
+				return bool;
+			},
+			// 判断是否选中
+			isSelected: function(year, month, day) {
+				let bool = false;
+				let date = `${year}-${month}-${day}`;
+				// console.log(date,'date');
+				if(this.filterDate.includes(date)){
+					bool = true;
+				}
+				return bool;
+			},
+			generateArray: function(start, end) {
+				return Array.from(new Array(end + 1).keys()).slice(start);
+			},
+			formatNum: function(num) {
+				return num < 10 ? '0' + num : num + '';
+			},
+			//一个月有多少天
+			getMonthDay(year, month) {
+				let days = new Date(year, month, 0).getDate();
+				return days;
+			},
+			getWeekday(year, month) {
+				let date = new Date(`${year}/${month}/01 00:00:00`);
+				return date.getDay();
+			},
+			checkRange(year) {
+				let overstep = false;
+				if (year < this.minYear || year > this.maxYear) {
+					uni.showToast({
+						title: "日期超出范围啦~",
+						icon: 'none'
+					})
+					overstep = true;
+				}
+				return overstep;
+			},
+			changeMonthHandler(isAdd) {
+				if (isAdd) {
+					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(isAdd) {
+				let year = isAdd ? this.year + 1 : this.year - 1;
+				if (!this.checkRange(year)) {
+					this.year = year;
+					this.changeData();
+				}
+			},
+			changeData() {
+				this.days = this.getMonthDay(this.year, this.month);
+				this.daysArr=this.generateArray(1,this.days)
+				this.weekday = this.getWeekday(this.year, this.month);
+				this.weekdayArr=this.generateArray(1,this.weekday)
+				this.showTitle = `${this.year}年${this.month}月`;
+				if (this.isChange && this.mode == 'date') {
+					this.btnFix(true);
+				}
+			},
+			dateClick: function(day) {
+        console.log(day,'day-')
+        // console.log(this.year,'this.year-')
+        // console.log(this.month,'this.month-')
+        // return
+				day += 1;
+        console.log(this.openDisAbled(this.year, this.month, day),'this.openDisAbled(this.year, this.month, day)')
+		console.log(this.isSelected(this.year, this.month, day),'查看日期')
+				if (!this.openDisAbled(this.year, this.month, day)) {
+					this.day = day;
+					let date = `${this.year}-${this.month}-${day}`;
+					if (this.mode == 'date') {
+						this.activeDate = date;
+					} else {
+						let compare = new Date(date.replace(/\-/g, '/')).getTime() < new Date(this.startDate.replace(/\-/g, '/')).getTime()
+						if (this.isStart || compare) {
+							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.isStart = false;
+						} else {
+							// 选择结束时间 
+							// if(){
+							// 	return
+							// }
+							this.endDate = date;
+							this.endYear = this.year;
+							this.endMonth = this.month;
+							this.endDay = this.day;
+							this.isStart = true;
+						}
+					}
+				}else{
+          console.log('点击了禁用时间')
+        }
+			},
+			close() {
+				// 修改通过v-model绑定的父组件变量的值为false，从而隐藏日历弹窗
+				this.$emit('input', false);
+			},
+			getWeekText(date) {
+				date = new Date(`${date.replace(/\-/g, '/')} 00:00:00`);
+				let week = date.getDay();
+				return '星期' + ['日', '一', '二', '三', '四', '五', '六'][week];
+			},
+			btnFix(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.formatNum(month)}-${this.formatNum(day)}`;
+					let weekText = this.getWeekText(result);
+					let isToday = false;
+					if (`${year}-${month}-${day}` == this.today) {
+						//今天
+						isToday = true;
+					}
+					this.$emit('change', {
+						year: year,
+						month: month,
+						day: day,
+						days: days,
+						result: result,
+						week: weekText,
+						isToday: isToday,
+						// switch: show //是否是切换年月操作
+					});
+				} else {
+					if (!this.startDate || !this.endDate) return;
+					let startMonth = this.formatNum(this.startMonth);
+					let startDay = this.formatNum(this.startDay);
+					let startDate = `${this.startYear}-${startMonth}-${startDay}`;
+					let startWeek = this.getWeekText(startDate)
+
+					let endMonth = this.formatNum(this.endMonth);
+					let endDay = this.formatNum(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: startDate,
+						startWeek: startWeek,
+						endYear: this.endYear,
+						endMonth: this.endMonth,
+						endDay: this.endDay,
+						endDate: endDate,
+						endWeek: endWeek
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	.disabled{
+    // color:red;
+    background-color: #dbd8d8 !important;
+  }
+//  已选中的样式
+  .selected{
+	position: absolute;
+	text-align: center;
+	width: 100%;
+	bottom: 5rpx;
+	font-size: 20rpx;
+	// font-weight: 700;
+	color:red;
+  }
+	.u-calendar {
+		color: $u-content-color;
+		
+		&__header {
+			width: 100%;
+			box-sizing: border-box;
+			font-size: 30rpx;
+			background-color: #fff;
+			color: $u-main-color;
+			
+			&__text {
+				margin-top: 30rpx;
+				padding: 0 60rpx;
+				@include vue-flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		
+		&__action {
+			padding: 40rpx 0 40rpx 0;
+			
+			&__icon {
+				margin: 0 16rpx;
+			}
+			
+			&__text {
+				padding: 0 16rpx;
+				color: $u-main-color;
+				font-size: 32rpx;
+				line-height: 32rpx;
+				font-weight: bold;
+			}
+		}
+	
+		&__week-day {
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			padding: 6px 0;
+			overflow: hidden;
+			
+			&__text {
+				flex: 1;
+				text-align: center;
+			}
+		}
+	
+		&__content {
+			width: 100%;
+			@include vue-flex;
+			flex-wrap: wrap;
+			padding: 6px 0;
+			box-sizing: border-box;
+			background-color: #fff;
+			position: relative;
+			
+			&--end-date {
+				border-top-right-radius: 8rpx;
+				border-bottom-right-radius: 8rpx;
+			}
+			
+			&--start-date {
+				border-top-left-radius: 8rpx;
+				border-bottom-left-radius: 8rpx;
+			}
+			
+			&__item {
+				width: 14.2857%;
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				padding: 6px 0;
+				overflow: hidden;
+				position: relative;
+				z-index: 2;
+				
+				&__inner {
+					height: 84rpx;
+					@include vue-flex;
+					align-items: center;
+					justify-content: center;
+					flex-direction: column;
+					font-size: 32rpx;
+					position: relative;
+					border-radius: 50%;
+					
+					&__desc {
+						width: 100%;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						transform: scale(0.75);
+						transform-origin: center center;
+						position: absolute;
+						left: 0;
+						text-align: center;
+						bottom: 2rpx;
+					}
+				}
+				
+				&__tips {
+					width: 100%;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					position: absolute;
+					left: 0;
+					transform: scale(0.8);
+					transform-origin: center center;
+					text-align: center;
+					bottom: 8rpx;
+					z-index: 2;
+				}
+			}
+			
+			&__bg-month {
+				position: absolute;
+				font-size: 130px;
+				line-height: 130px;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				color: #e4e7ed;
+				z-index: 1;
+			}
+		}
+	
+		&__bottom {
+			width: 100%;
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #fff;
+			padding: 0 40rpx 30rpx;
+			box-sizing: border-box;
+			font-size: 24rpx;
+			color: $u-tips-color;
+			
+			&__choose {
+				height: 50rpx;
+			}
+			
+			&__btn {
+				width: 100%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uview-ui/components/u-car-keyboard/u-car-keyboard.vue b/uview-ui/components/u-car-keyboard/u-car-keyboard.vue
new file mode 100644
index 0000000..84b1467
--- /dev/null
+++ b/uview-ui/components/u-car-keyboard/u-car-keyboard.vue
@@ -0,0 +1,257 @@
+<template>
+	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
+		<view class="u-keyboard-grids">
+			<block>
+				<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
+					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn"
+					 v-for="(item, j) in group" :key="j">
+						{{ item }}
+					</view>
+				</view>
+				<view @touchstart="backspaceClick" @touchend="clearTimer" :hover-stay-time="100" class="u-keyboard-back"
+				 hover-class="u-hover-class">
+					<u-icon :size="38" name="backspace" :bold="true"></u-icon>
+				</view>
+				<view :hover-stay-time="100" class="u-keyboard-change" hover-class="u-carinput-hover" @tap="changeCarInputMode">
+					<text class="zh" :class="[!abc ? 'active' : 'inactive']">中</text>
+					/
+					<text class="en" :class="[abc ? 'active' : 'inactive']">英</text>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "u-keyboard",
+		props: {
+			// 是否打乱键盘按键的顺序
+			random: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称
+				abc: false
+			};
+		},
+		computed: {
+			areaList() {
+				let data = [
+					'京',
+					'沪',
+					'粤',
+					'津',
+					'冀',
+					'豫',
+					'云',
+					'辽',
+					'黑',
+					'湘',
+					'皖',
+					'鲁',
+					'苏',
+					'浙',
+					'赣',
+					'鄂',
+					'桂',
+					'甘',
+					'晋',
+					'陕',
+					'蒙',
+					'吉',
+					'闽',
+					'贵',
+					'渝',
+					'川',
+					'青',
+					'琼',
+					'宁',
+					'挂',
+					'藏',
+					'港',
+					'澳',
+					'新',
+					'使',
+					'学'
+				];
+				let tmp = [];
+				// 打乱顺序
+				if (this.random) data = this.$u.randomArray(data);
+				// 切割成二维数组
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			},
+			EngKeyBoardList() {
+				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'
+				];
+				let tmp = [];
+				if (this.random) data = this.$u.randomArray(data);
+				tmp[0] = data.slice(0, 10);
+				tmp[1] = data.slice(10, 20);
+				tmp[2] = data.slice(20, 30);
+				tmp[3] = data.slice(30, 36);
+				return tmp;
+			}
+		},
+		methods: {
+			// 点击键盘按钮
+			carInputClick(i, j) {
+				let value = '';
+				// 不同模式，获取不同数组的值
+				if (this.abc) value = this.EngKeyBoardList[i][j];
+				else value = this.areaList[i][j];
+				this.$emit('change', value);
+			},
+			// 修改汽车牌键盘的输入模式，中文|英文
+			changeCarInputMode() {
+				this.abc = !this.abc;
+			},
+			// 点击退格键
+			backspaceClick() {
+				this.$emit('backspace');
+				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
+				this.timer = null;
+				this.timer = setInterval(() => {
+					this.$emit('backspace');
+				}, 250);
+			},
+			clearTimer() {
+				clearInterval(this.timer);
+				this.timer = null;
+			},
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-keyboard-grids {
+		background: rgb(215, 215, 217);
+		padding: 24rpx 0;
+		position: relative;
+	}
+
+	.u-keyboard-grids-item {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-keyboard-grids-btn {
+		text-decoration: none;
+		width: 62rpx;
+		flex: 0 0 64rpx;
+		height: 80rpx;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;		
+		/* #endif */
+		font-size: 36rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #fff;
+		margin: 8rpx 5rpx;
+		border-radius: 8rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		font-weight: 500;
+		justify-content: center;
+	}
+
+	.u-carinput-hover {
+		background-color: rgb(185, 188, 195) !important;
+	}
+
+	.u-keyboard-back {
+		position: absolute;
+		width: 96rpx;
+		right: 22rpx;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: rgb(185, 188, 195);
+		@include vue-flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+		box-shadow: 0 2rpx 0rpx #888992;
+	}
+
+	.u-keyboard-change {
+		font-size: 24rpx;
+		box-shadow: 0 2rpx 0rpx #888992;
+		position: absolute;
+		width: 96rpx;
+		left: 22rpx;
+		line-height: 1;
+		bottom: 32rpx;
+		height: 80rpx;
+		background-color: #ffffff;
+		@include vue-flex;
+		align-items: center;
+		border-radius: 8rpx;
+		justify-content: center;
+	}
+
+	.u-keyboard-change .inactive.zh {
+		transform: scale(0.85) translateY(-10rpx);
+	}
+
+	.u-keyboard-change .inactive.en {
+		transform: scale(0.85) translateY(10rpx);
+	}
+
+	.u-keyboard-change .active {
+		color: rgb(237, 112, 64);
+		font-size: 30rpx;
+	}
+
+	.u-keyboard-change .zh {
+		transform: translateY(-10rpx);
+	}
+
+	.u-keyboard-change .en {
+		transform: translateY(10rpx);
+	}
+</style>
diff --git a/uview-ui/components/u-card/u-card.vue b/uview-ui/components/u-card/u-card.vue
new file mode 100644
index 0000000..a3cb2aa
--- /dev/null
+++ b/uview-ui/components/u-card/u-card.vue
@@ -0,0 +1,299 @@
+<template>
+	<view
+		class="u-card"
+		@tap.stop="click"
+		:class="{ 'u-border': border, 'u-card-full': full, 'u-card--border': borderRadius > 0 }"
+		:style="{
+			borderRadius: borderRadius + 'rpx',
+			margin: margin,
+			boxShadow: boxShadow
+		}"
+	>
+		<view
+			v-if="showHead"
+			class="u-card__head"
+			:style="[{padding: padding + 'rpx'}, headStyle]"
+			:class="{
+				'u-border-bottom': headBorderBottom
+			}"
+			@tap="headClick"
+		>
+			<view v-if="!$slots.head" class="u-flex u-row-between">
+				<view class="u-card__head--left u-flex u-line-1" v-if="title">
+					<image
+						:src="thumb"
+						class="u-card__head--left__thumb"
+						mode="aspectfull"
+						v-if="thumb"
+						:style="{ 
+							height: thumbWidth + 'rpx', 
+							width: thumbWidth + 'rpx', 
+							borderRadius: thumbCircle ? '100rpx' : '6rpx' 
+						}"
+					></image>
+					<text
+						class="u-card__head--left__title u-line-1"
+						:style="{
+							fontSize: titleSize + 'rpx',
+							color: titleColor
+						}"
+					>
+						{{ title }}
+					</text>
+				</view>
+				<view class="u-card__head--right u-line-1" v-if="subTitle">
+					<text
+						class="u-card__head__title__text"
+						:style="{
+							fontSize: subTitleSize + 'rpx',
+							color: subTitleColor
+						}"
+					>
+						{{ subTitle }}
+					</text>
+				</view>
+			</view>
+			<slot name="head" v-else />
+		</view>
+		<view @tap="bodyClick" class="u-card__body" :style="[{padding: padding + 'rpx'}, bodyStyle]"><slot name="body" /></view>
+		<view
+			v-if="showFoot"
+			class="u-card__foot"
+			 @tap="footClick"
+			:style="[{padding: $slots.foot ? padding + 'rpx' : 0}, footStyle]"
+			:class="{
+				'u-border-top': footBorderTop
+			}"
+		>
+			<slot name="foot" />
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * card 卡片
+ * @description 卡片组件一般用于多个列表条目，且风格统一的场景
+ * @tutorial https://www.uviewui.com/components/card.html
+ * @property {Boolean} full 卡片与屏幕两侧是否留空隙（默认false）
+ * @property {String} title 头部左边的标题
+ * @property {String} title-color 标题颜色（默认#303133）
+ * @property {String | Number} title-size 标题字体大小，单位rpx（默认30）
+ * @property {String} sub-title 头部右边的副标题
+ * @property {String} sub-title-color 副标题颜色（默认#909399）
+ * @property {String | Number} sub-title-size 副标题字体大小（默认26）
+ * @property {Boolean} border 是否显示边框（默认true）
+ * @property {String | Number} index 用于标识点击了第几个卡片
+ * @property {String} box-shadow 卡片外围阴影，字符串形式（默认none）
+ * @property {String} margin 卡片与屏幕两边和上下元素的间距，需带单位，如"30rpx 20rpx"（默认30rpx）
+ * @property {String | Number} border-radius 卡片整体的圆角值，单位rpx（默认16）
+ * @property {Object} head-style 头部自定义样式，对象形式
+ * @property {Object} body-style 中部自定义样式，对象形式
+ * @property {Object} foot-style 底部自定义样式，对象形式
+ * @property {Boolean} head-border-bottom 是否显示头部的下边框（默认true）
+ * @property {Boolean} foot-border-top 是否显示底部的上边框（默认true）
+ * @property {Boolean} show-head 是否显示头部（默认true）
+ * @property {Boolean} show-head 是否显示尾部（默认true）
+ * @property {String} thumb 缩略图路径，如设置将显示在标题的左边，不建议使用相对路径
+ * @property {String | Number} thumb-width 缩略图的宽度，高等于宽，单位rpx（默认60）
+ * @property {Boolean} thumb-circle 缩略图是否为圆形（默认false）
+ * @event {Function} click 整个卡片任意位置被点击时触发
+ * @event {Function} head-click 卡片头部被点击时触发
+ * @event {Function} body-click 卡片主体部分被点击时触发
+ * @event {Function} foot-click 卡片底部部分被点击时触发
+ * @example <u-card padding="30" title="card"></u-card>
+ */
+export default {
+	name: 'u-card',
+	props: {
+		// 与屏幕两侧是否留空隙
+		full: {
+			type: Boolean,
+			default: false
+		},
+		// 标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 标题颜色
+		titleColor: {
+			type: String,
+			default: '#303133'
+		},
+		// 标题字体大小，单位rpx
+		titleSize: {
+			type: [Number, String],
+			default: '30'
+		},
+		// 副标题
+		subTitle: {
+			type: String,
+			default: ''
+		},
+		// 副标题颜色
+		subTitleColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 副标题字体大小，单位rpx
+		subTitleSize: {
+			type: [Number, String],
+			default: '26'
+		},
+		// 是否显示外部边框，只对full=false时有效(卡片与边框有空隙时)
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// 用于标识点击了第几个
+		index: {
+			type: [Number, String, Object],
+			default: ''
+		},
+		// 用于隔开上下左右的边距，带单位的写法，如："30rpx 30rpx"，"20rpx 20rpx 30rpx 30rpx"
+		margin: {
+			type: String,
+			default: '30rpx'
+		},
+		// card卡片的圆角
+		borderRadius: {
+			type: [Number, String],
+			default: '16'
+		},
+		// 头部自定义样式，对象形式
+		headStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 主体自定义样式，对象形式
+		bodyStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 底部自定义样式，对象形式
+		footStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 头部是否下边框
+		headBorderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// 底部是否有上边框
+		footBorderTop: {
+			type: Boolean,
+			default: true
+		},
+		// 标题左边的缩略图
+		thumb: {
+			type: String,
+			default: ''
+		},
+		// 缩略图宽高，单位rpx
+		thumbWidth: {
+			type: [String, Number],
+			default: '60'
+		},
+		// 缩略图是否为圆形
+		thumbCircle: {
+			type: Boolean,
+			default: false
+		},
+		// 给head，body，foot的内边距
+		padding: {
+			type: [String, Number],
+			default: '30'
+		},
+		// 是否显示头部
+		showHead: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示尾部
+		showFoot: {
+			type: Boolean,
+			default: true
+		},
+		// 卡片外围阴影，字符串形式
+		boxShadow: {
+			type: String,
+			default: 'none'
+		}
+	},
+	data() {
+		return {};
+	},
+	methods: {
+		click() {
+			this.$emit('click', this.index);
+		},
+		headClick() {
+			this.$emit('head-click', this.index);
+		},
+		bodyClick() {
+			this.$emit('body-click', this.index);
+		},
+		footClick() {
+			this.$emit('foot-click', this.index);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+	
+.u-card {
+	position: relative;
+	overflow: hidden;
+	font-size: 28rpx;
+	background-color: #ffffff;
+	box-sizing: border-box;
+	
+	&-full {
+		// 如果是与屏幕之间不留空隙，应该设置左右边距为0
+		margin-left: 0 !important;
+		margin-right: 0 !important;
+		width: 100%;
+	}
+	
+	&--border:after {
+		border-radius: 16rpx;
+	}
+
+	&__head {
+		&--left {
+			color: $u-main-color;
+			
+			&__thumb {
+				margin-right: 16rpx;
+			}
+			
+			&__title {
+				max-width: 400rpx;
+			}
+		}
+
+		&--right {
+			color: $u-tips-color;
+			margin-left: 6rpx;
+		}
+	}
+
+	&__body {
+		color: $u-content-color;
+	}
+
+	&__foot {
+		color: $u-tips-color;
+	}
+}
+</style>
diff --git a/uview-ui/components/u-cell-group/u-cell-group.vue b/uview-ui/components/u-cell-group/u-cell-group.vue
new file mode 100644
index 0000000..3fbca72
--- /dev/null
+++ b/uview-ui/components/u-cell-group/u-cell-group.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="u-cell-box">
+		<view class="u-cell-title" v-if="title" :style="[titleStyle]">
+			{{title}}
+		</view>
+		<view class="u-cell-item-box" :class="{'u-border-bottom u-border-top': border}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * cellGroup 单元格父组件Group
+	 * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。搭配u-cell-item
+	 * @tutorial https://www.uviewui.com/components/cell.html
+	 * @property {String} title 分组标题
+	 * @property {Boolean} border 是否显示外边框（默认true）
+	 * @property {Object} title-style 分组标题的的样式，对象形式，如{'font-size': '24rpx'} 或 {'fontSize': '24rpx'}
+	 * @example <u-cell-group title="设置喜好">
+	 */
+	export default {
+		name: "u-cell-group",
+		props: {
+			// 分组标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 是否显示分组list上下边框
+			border: {
+				type: Boolean,
+				default: true
+			},
+			// 分组标题的样式，对象形式，注意驼峰属性写法
+			// 类似 {'font-size': '24rpx'} 和 {'fontSize': '24rpx'}
+			titleStyle: {
+				type: Object,
+				default () {
+					return {};
+				}
+			}
+		},
+		data() {
+			return {
+				index: 0,
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-cell-box {
+		width: 100%;
+	}
+
+	.u-cell-title {
+		padding: 30rpx 32rpx 10rpx 32rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: $u-tips-color;
+	}
+
+	.u-cell-item-box {
+		background-color: #FFFFFF;
+		flex-direction: row;
+	}
+</style>
diff --git a/uview-ui/components/u-cell-item/u-cell-item.vue b/uview-ui/components/u-cell-item/u-cell-item.vue
new file mode 100644
index 0000000..055af3a
--- /dev/null
+++ b/uview-ui/components/u-cell-item/u-cell-item.vue
@@ -0,0 +1,316 @@
+<template>
+	<view
+		@tap="click"
+		class="u-cell"
+		:class="{ 'u-border-bottom': borderBottom, 'u-border-top': borderTop, 'u-col-center': center, 'u-cell--required': required }"
+		hover-stay-time="150"
+		:hover-class="hoverClass"
+		:style="{
+			backgroundColor: bgColor
+		}"
+	>
+		<u-icon :size="iconSize" :name="icon" v-if="icon" :custom-style="iconStyle" class="u-cell__left-icon-wrap"></u-icon>
+		<view class="u-flex" v-else>
+			<slot name="icon"></slot>
+		</view>
+		<view
+			class="u-cell_title"
+			:style="[
+				{
+					width: titleWidth ? titleWidth + 'rpx' : 'auto'
+				},
+				titleStyle
+			]"
+		>
+			<block v-if="title !== ''">{{ title }}</block>
+			<slot name="title" v-else></slot>
+
+			<view class="u-cell__label" v-if="label || $slots.label" :style="[labelStyle]">
+				<block v-if="label !== ''">{{ label }}</block>
+				<slot name="label" v-else></slot>
+			</view>
+		</view>
+
+		<view class="u-cell__value" :style="[valueStyle]">
+			<block class="u-cell__value" v-if="value !== ''">{{ value }}</block>
+			<slot v-else></slot>
+		</view>
+		<view class="u-flex u-cell_right" v-if="$slots['right-icon']">
+			<slot name="right-icon"></slot>
+		</view>
+		<u-icon v-if="arrow" name="arrow-right" :style="[arrowStyle]" class="u-icon-wrap u-cell__right-icon-wrap"></u-icon>
+	</view>
+</template>
+
+<script>
+/**
+ * cellItem 单元格Item
+ * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。搭配u-cell-group使用
+ * @tutorial https://www.uviewui.com/components/cell.html
+ * @property {String} title 左侧标题
+ * @property {String} icon 左侧图标名，只支持uView内置图标，见Icon 图标
+ * @property {Object} icon-style 左边图标的样式，对象形式
+ * @property {String} value 右侧内容
+ * @property {String} label 标题下方的描述信息
+ * @property {Boolean} border-bottom 是否显示cell的下边框（默认true）
+ * @property {Boolean} border-top 是否显示cell的上边框（默认false）
+ * @property {Boolean} center 是否使内容垂直居中（默认false）
+ * @property {String} hover-class 是否开启点击反馈，none为无效果（默认true）
+ * // @property {Boolean} border-gap border-bottom为true时，Cell列表中间的条目的下边框是否与左边有一个间隔（默认true）
+ * @property {Boolean} arrow 是否显示右侧箭头（默认true）
+ * @property {Boolean} required 箭头方向，可选值（默认right）
+ * @property {Boolean} arrow-direction 是否显示左边表示必填的星号（默认false）
+ * @property {Object} title-style 标题样式，对象形式
+ * @property {Object} value-style 右侧内容样式，对象形式
+ * @property {Object} label-style 标题下方描述信息的样式，对象形式
+ * @property {String} bg-color 背景颜色（默认transparent）
+ * @property {String Number} index 用于在click事件回调中返回，标识当前是第几个Item
+ * @property {String Number} title-width 标题的宽度，单位rpx
+ * @example <u-cell-item icon="integral-fill" title="会员等级" value="新版本"></u-cell-item>
+ */
+export default {
+	name: 'u-cell-item',
+	props: {
+		// 左侧图标名称(只能uView内置图标)，或者图标src
+		icon: {
+			type: String,
+			default: ''
+		},
+		// 左侧标题
+		title: {
+			type: [String, Number],
+			default: ''
+		},
+		// 右侧内容
+		value: {
+			type: [String, Number],
+			default: ''
+		},
+		// 标题下方的描述信息
+		label: {
+			type: [String, Number],
+			default: ''
+		},
+		// 是否显示下边框
+		borderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示上边框
+		borderTop: {
+			type: Boolean,
+			default: false
+		},
+		// 多个cell中，中间的cell显示下划线时，下划线是否给一个到左边的距离
+		// 1.4.0版本废除此参数，默认边框由border-top和border-bottom提供，此参数会造成干扰
+		// borderGap: {
+		// 	type: Boolean,
+		// 	default: true
+		// },
+		// 是否开启点击反馈，即点击时cell背景为灰色，none为无效果
+		hoverClass: {
+			type: String,
+			default: 'u-cell-hover'
+		},
+		// 是否显示右侧箭头
+		arrow: {
+			type: Boolean,
+			default: true
+		},
+		// 内容是否垂直居中
+		center: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示左边表示必填的星号
+		required: {
+			type: Boolean,
+			default: false
+		},
+		// 标题的宽度，单位rpx
+		titleWidth: {
+			type: [Number, String],
+			default: ''
+		},
+		// 右侧箭头方向，可选值：right|up|down，默认为right
+		arrowDirection: {
+			type: String,
+			default: 'right'
+		},
+		// 控制标题的样式
+		titleStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 右侧显示内容的样式
+		valueStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 描述信息的样式
+		labelStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: 'transparent'
+		},
+		// 用于识别被点击的是第几个cell
+		index: {
+			type: [String, Number],
+			default: ''
+		},
+		// 是否使用lable插槽
+		useLabelSlot: {
+			type: Boolean,
+			default: false
+		},
+		// 左边图标的大小，单位rpx，只对传入icon字段时有效
+		iconSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 左边图标的样式，对象形式
+		iconStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+	},
+	data() {
+		return {
+
+		};
+	},
+	computed: {
+		arrowStyle() {
+			let style = {};
+			if (this.arrowDirection == 'up') style.transform = 'rotate(-90deg)';
+			else if (this.arrowDirection == 'down') style.transform = 'rotate(90deg)';
+			else style.transform = 'rotate(0deg)';
+			return style;
+		}
+	},
+	methods: {
+		click() {
+			this.$emit('click', this.index);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+.u-cell {
+	@include vue-flex;
+	align-items: center;
+	position: relative;
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	/* #endif */
+	width: 100%;
+	padding: 26rpx 32rpx;
+	font-size: 28rpx;
+	line-height: 54rpx;
+	color: $u-content-color;
+	background-color: #fff;
+	text-align: left;
+}
+
+.u-cell_title {
+	font-size: 28rpx;
+}
+
+.u-cell__left-icon-wrap {
+	margin-right: 10rpx;
+	font-size: 32rpx;
+}
+
+.u-cell__right-icon-wrap {
+	margin-left: 10rpx;
+	color: #969799;
+	font-size: 28rpx;
+}
+
+.u-cell__left-icon-wrap,
+.u-cell__right-icon-wrap {
+	@include vue-flex;
+	align-items: center;
+	height: 48rpx;
+}
+
+.u-cell-border:after {
+	position: absolute; 
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	content: ' ';
+	pointer-events: none;
+	border-bottom: 1px solid $u-border-color;
+	/* #endif */
+	right: 0;
+	left: 0;
+	top: 0;
+	transform: scaleY(0.5);
+}
+
+.u-cell-border {
+	position: relative;
+}
+
+.u-cell__label {
+	margin-top: 6rpx;
+	font-size: 26rpx;
+	line-height: 36rpx;
+	color: $u-tips-color;
+	/* #ifndef APP-NVUE */
+	word-wrap: break-word;
+	/* #endif */
+}
+
+.u-cell__value {
+	overflow: hidden;
+	text-align: right;
+	/* #ifndef APP-NVUE */
+	vertical-align: middle;
+	/* #endif */
+	color: $u-tips-color;
+	font-size: 26rpx;
+}
+
+.u-cell__title,
+.u-cell__value {
+	flex: 1;
+}
+
+.u-cell--required {
+	/* #ifndef APP-NVUE */
+	overflow: visible;
+	/* #endif */
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-cell--required:before {
+	position: absolute;
+	/* #ifndef APP-NVUE */
+	content: '*';
+	/* #endif */
+	left: 8px;
+	margin-top: 4rpx;
+	font-size: 14px;
+	color: $u-type-error;
+}
+
+.u-cell_right {
+	line-height: 1;
+}
+</style>
diff --git a/uview-ui/components/u-checkbox-group/u-checkbox-group.vue b/uview-ui/components/u-checkbox-group/u-checkbox-group.vue
new file mode 100644
index 0000000..6a149b3
--- /dev/null
+++ b/uview-ui/components/u-checkbox-group/u-checkbox-group.vue
@@ -0,0 +1,123 @@
+<template>
+	<view class="u-checkbox-group u-clearfix">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	import Emitter from '../../libs/util/emitter.js';
+	/**
+	 * checkboxGroup 开关选择器父组件Group
+	 * @description 复选框组件一般用于需要多个选择的场景，该组件功能完整，使用方便
+	 * @tutorial https://www.uviewui.com/components/checkbox.html
+	 * @property {String Number} max 最多能选中多少个checkbox（默认999）
+	 * @property {String Number} size 组件整体的大小，单位rpx（默认40）
+	 * @property {Boolean} disabled 是否禁用所有checkbox（默认false）
+	 * @property {String Number} icon-size 图标大小，单位rpx（默认20）
+	 * @property {Boolean} label-disabled 是否禁止点击文本操作checkbox(默认false)
+	 * @property {String} width 宽度，需带单位
+	 * @property {String} width 宽度，需带单位
+	 * @property {String} shape 外观形状，shape-方形，circle-圆形(默认circle)
+	 * @property {Boolean} wrap 是否每个checkbox都换行（默认false）
+	 * @property {String} active-color 选中时的颜色，应用到所有子Checkbox组件（默认#2979ff）
+	 * @event {Function} change 任一个checkbox状态发生变化时触发，回调为一个对象
+	 * @example <u-checkbox-group></u-checkbox-group>
+	 */
+	export default {
+		name: 'u-checkbox-group',
+		mixins: [Emitter],
+		props: {
+			// 最多能选中多少个checkbox
+			max: {
+				type: [Number, String],
+				default: 999
+			},
+			// 所有选中项的 name
+			// value: {
+			// 	default: Array,
+			// 	default() {
+			// 		return []
+			// 	}
+			// },
+			// 是否禁用所有复选框
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 在表单内提交时的标识符
+			name: {
+				type: [Boolean, String],
+				default: ''
+			},
+			// 是否禁止点击提示语选中复选框
+			labelDisabled: {
+				type: Boolean,
+				default: false
+			},
+			// 形状，square为方形，circle为原型
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			// 选中状态下的颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 组件的整体大小
+			size: {
+				type: [String, Number],
+				default: 34
+			},
+			// 每个checkbox占u-checkbox-group的宽度
+			width: {
+				type: String,
+				default: 'auto'
+			},
+			// 是否每个checkbox都换行
+			wrap: { 
+				type: Boolean,
+				default: false
+			},
+			// 图标的大小，单位rpx
+			iconSize: {
+				type: [String, Number],
+				default: 20
+			},
+		},
+		data() {
+			return {
+			}
+		},
+		created() {
+			// 如果将children定义在data中，在微信小程序会造成循环引用而报错
+			this.children = [];
+		},
+		methods: {
+			emitEvent() {
+				let values = [];
+				this.children.map(val => {
+					if(val.value) values.push(val.name);
+				})
+				this.$emit('change', values);
+				// 发出事件，用于在表单组件中嵌入checkbox的情况，进行验证
+				// 由于头条小程序执行迟钝，故需要用几十毫秒的延时
+				setTimeout(() => {
+					// 将当前的值发送到 u-form-item 进行校验
+					this.dispatch('u-form-item', 'on-form-change', values);
+				}, 60)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-checkbox-group {
+		/* #ifndef MP || APP-NVUE */
+		display: inline-flex;
+		flex-wrap: wrap;
+		/* #endif */
+	}
+</style>
diff --git a/uview-ui/components/u-checkbox/u-checkbox.vue b/uview-ui/components/u-checkbox/u-checkbox.vue
new file mode 100644
index 0000000..9414461
--- /dev/null
+++ b/uview-ui/components/u-checkbox/u-checkbox.vue
@@ -0,0 +1,284 @@
+<template>
+	<view class="u-checkbox" :style="[checkboxStyle]">
+		<view class="u-checkbox__icon-wrap" @tap="toggle" :class="[iconClass]" :style="[iconStyle]">
+			<u-icon class="u-checkbox__icon-wrap__icon" name="checkbox-mark" :size="checkboxIconSize" :color="iconColor"/>
+		</view>
+		<view class="u-checkbox__label" @tap="onClickLabel" :style="{
+			fontSize: $u.addUnit(labelSize)
+		}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * checkbox 复选框
+	 * @description 该组件需要搭配checkboxGroup组件使用，以便用户进行操作时，获得当前复选框组的选中情况。
+	 * @tutorial https://www.uviewui.com/components/checkbox.html
+	 * @property {String Number} icon-size 图标大小，单位rpx（默认20）
+	 * @property {String Number} label-size label字体大小，单位rpx（默认28）
+	 * @property {String Number} name checkbox组件的标示符
+	 * @property {String} shape 形状，见官网说明（默认circle）
+	 * @property {Boolean} disabled 是否禁用
+	 * @property {Boolean} label-disabled 是否禁止点击文本操作checkbox
+	 * @property {String} active-color 选中时的颜色，如设置CheckboxGroup的active-color将失效
+	 * @event {Function} change 某个checkbox状态发生变化时触发，回调为一个对象
+	 * @example <u-checkbox v-model="checked" :disabled="false">天涯</u-checkbox>
+	 */
+	export default {
+		name: "u-checkbox",
+		props: {
+			// checkbox的名称
+			name: {
+				type: [String, Number],
+				default: ''
+			},
+			// 形状，square为方形，circle为原型
+			shape: {
+				type: String,
+				default: ''
+			},
+			// 是否为选中状态
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 是否禁用
+			disabled: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// 是否禁止点击提示语选中复选框
+			labelDisabled: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// 选中状态下的颜色，如设置此值，将会覆盖checkboxGroup的activeColor值
+			activeColor: {
+				type: String,
+				default: ''
+			},
+			// 图标的大小，单位rpx
+			iconSize: {
+				type: [String, Number],
+				default: ''
+			},
+			// label的字体大小，rpx单位
+			labelSize: {
+				type: [String, Number],
+				default: ''
+			},
+			// 组件的整体大小
+			size: {
+				type: [String, Number],
+				default: ''
+			},
+		},
+		data() {
+			return {
+				parentDisabled: false,
+				newParams: {},
+			};
+		},
+		created() {
+			// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用
+			this.parent = this.$u.$parent.call(this, 'u-checkbox-group');
+			// 如果存在u-checkbox-group，将本组件的this塞进父组件的children中
+			this.parent && this.parent.children.push(this);
+		},
+		computed: {
+			// 是否禁用，如果父组件u-checkbox-group禁用的话，将会忽略子组件的配置
+			isDisabled() {
+				return this.disabled !== '' ? this.disabled : this.parent ? this.parent.disabled : false;
+			},
+			// 是否禁用label点击
+			isLabelDisabled() {
+				return this.labelDisabled !== '' ? this.labelDisabled : this.parent ? this.parent.labelDisabled : false;
+			},
+			// 组件尺寸，对应size的值，默认值为34rpx
+			checkboxSize() {
+				return this.size ? this.size : (this.parent ? this.parent.size : 34);
+			},
+			// 组件的勾选图标的尺寸，默认20
+			checkboxIconSize() {
+				return this.iconSize ? this.iconSize : (this.parent ? this.parent.iconSize : 20);
+			},
+			// 组件选中激活时的颜色
+			elActiveColor() {
+				return this.activeColor ? this.activeColor : (this.parent ? this.parent.activeColor : 'primary');
+			},
+			// 组件的形状
+			elShape() {
+				return this.shape ? this.shape : (this.parent ? this.parent.shape : 'square');
+			},
+			iconStyle() {
+				let style = {};
+				// 既要判断是否手动禁用，还要判断用户v-model绑定的值，如果绑定为false，那么也无法选中
+				if (this.elActiveColor && this.value && !this.isDisabled) {
+					style.borderColor = this.elActiveColor; 
+					style.backgroundColor = this.elActiveColor;
+				}
+				style.width = this.$u.addUnit(this.checkboxSize);
+				style.height = this.$u.addUnit(this.checkboxSize);
+				return style;
+			},
+			// checkbox内部的勾选图标，如果选中状态，为白色，否则为透明色即可
+			iconColor() {
+				return this.value ? '#ffffff' : 'transparent';
+			},
+			iconClass() {
+				let classes = [];
+				classes.push('u-checkbox__icon-wrap--' + this.elShape);
+				if (this.value == true) classes.push('u-checkbox__icon-wrap--checked');
+				if (this.isDisabled) classes.push('u-checkbox__icon-wrap--disabled');
+				if (this.value && this.isDisabled) classes.push('u-checkbox__icon-wrap--disabled--checked');
+				// 支付宝小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+				return classes.join(' ');
+			},
+			checkboxStyle() {
+				let style = {};
+				if(this.parent && this.parent.width) {
+					style.width = this.parent.width;
+					// #ifdef MP
+					// 各家小程序因为它们特殊的编译结构，使用float布局
+					style.float = 'left';
+					// #endif
+					// #ifndef MP
+					// H5和APP使用flex布局
+					style.flex = `0 0 ${this.parent.width}`;
+					// #endif
+				}
+				if(this.parent && this.parent.wrap) {
+					style.width = '100%';
+					// #ifndef MP
+					// H5和APP使用flex布局，将宽度设置100%，即可自动换行
+					style.flex = '0 0 100%';
+					// #endif
+				}
+				return style;
+			}
+		},
+		methods: {
+			onClickLabel() {
+				if (!this.isLabelDisabled && !this.isDisabled) {
+					this.setValue();
+				}
+			},
+			toggle() {
+				if (!this.isDisabled) {
+					this.setValue();
+				}
+			},
+			emitEvent() {
+				this.$emit('change', {
+					value: !this.value,
+					name: this.name
+				})
+				// 执行父组件u-checkbox-group的事件方法
+				// 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
+				setTimeout(() => {
+					if(this.parent && this.parent.emitEvent) this.parent.emitEvent();
+				}, 80);
+			},
+			// 设置input的值，这里通过input事件，设置通过v-model绑定的组件的值
+			setValue() {
+				// 判断是否超过了可选的最大数量
+				let checkedNum = 0;
+				if(this.parent && this.parent.children) {
+					// 只要父组件的某一个子元素的value为true，就加1(已有的选中数量)
+					this.parent.children.map(val => {
+						if (val.value) checkedNum++;
+					})
+				}
+				// 如果原来为选中状态，那么可以取消
+				if (this.value == true) {
+					this.emitEvent();
+					this.$emit('input', !this.value);
+				} else {
+					// 如果超出最多可选项，提示
+					if(this.parent && checkedNum >= this.parent.max) {
+						return this.$u.toast(`最多可选${this.parent.max}项`);
+					}
+					// 如果原来为未选中状态，需要选中的数量少于父组件中设置的max值，才可以选中
+					this.emitEvent();
+					this.$emit('input', !this.value);
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-checkbox {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+		overflow: hidden;
+		user-select: none;
+		line-height: 1.8;
+		
+		&__icon-wrap {
+			color: $u-content-color;
+			flex: none;
+			display: -webkit-flex;
+			@include vue-flex;
+			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: 20px;
+			border: 1px solid #c8c9cc;
+			transition-duration: 0.2s;
+			
+			/* #ifdef MP-TOUTIAO */
+			// 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
+			&__icon {
+				line-height: 0;
+			}
+			/* #endif */
+			
+			&--circle {
+				border-radius: 100%;
+			}
+			
+			&--square {
+				border-radius: 6rpx;
+			}
+			
+			&--checked {
+				color: #fff;
+				background-color: $u-type-primary;
+				border-color: $u-type-primary;
+			}
+			
+			&--disabled {
+				background-color: #ebedf0;
+				border-color: #c8c9cc;
+			}
+			
+			&--disabled--checked {
+				color: #c8c9cc !important;
+			}
+		}
+	
+		&__label {
+			word-wrap: break-word;
+			margin-left: 10rpx;
+			margin-right: 24rpx;
+			color: $u-content-color;
+			font-size: 30rpx;
+			
+			&--disabled {
+				color: #c8c9cc;
+			}
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-circle-progress/u-circle-progress.vue b/uview-ui/components/u-circle-progress/u-circle-progress.vue
new file mode 100644
index 0000000..46e7c18
--- /dev/null
+++ b/uview-ui/components/u-circle-progress/u-circle-progress.vue
@@ -0,0 +1,220 @@
+<template>
+	<view
+		class="u-circle-progress"
+		:style="{
+			width: widthPx + 'px',
+			height: widthPx + 'px',
+			backgroundColor: bgColor
+		}"
+	>
+		<!-- 支付宝小程序不支持canvas-id属性，必须用id属性 -->
+		<canvas
+			class="u-canvas-bg"
+			:canvas-id="elBgId"
+			:id="elBgId"
+			:style="{
+				width: widthPx + 'px',
+				height: widthPx + 'px'
+			}"
+		></canvas>
+		<canvas
+			class="u-canvas"
+			:canvas-id="elId"
+			:id="elId"
+			:style="{
+				width: widthPx + 'px',
+				height: widthPx + 'px'
+			}"
+		></canvas>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+/**
+ * circleProgress 环形进度条
+ * @description 展示操作或任务的当前进度，比如上传文件，是一个圆形的进度条。注意：此组件的percent值只能动态增加，不能动态减少。
+ * @tutorial https://www.uviewui.com/components/circleProgress.html
+ * @property {String Number} percent 圆环进度百分比值，为数值类型，0-100
+ * @property {String} inactive-color 圆环的底色，默认为灰色(该值无法动态变更)（默认#ececec）
+ * @property {String} active-color 圆环激活部分的颜色(该值无法动态变更)（默认#19be6b）
+ * @property {String Number} width 整个圆环组件的宽度，高度默认等于宽度值，单位rpx（默认200）
+ * @property {String Number} border-width 圆环的边框宽度，单位rpx（默认14）
+ * @property {String Number} duration 整个圆环执行一圈的时间，单位ms（默认呢1500）
+ * @property {String} type 如设置，active-color值将会失效
+ * @property {String} bg-color 整个组件背景颜色，默认为白色
+ * @example <u-circle-progress active-color="#2979ff" :percent="80"></u-circle-progress>
+ */
+export default {
+	name: 'u-circle-progress',
+	props: {
+		// 圆环进度百分比值
+		percent: {
+			type: Number,
+			default: 0,
+			// 限制值在0到100之间
+			validator: val => {
+				return val >= 0 && val <= 100;
+			}
+		},
+		// 底部圆环的颜色（灰色的圆环）
+		inactiveColor: {
+			type: String,
+			default: '#ececec'
+		},
+		// 圆环激活部分的颜色
+		activeColor: {
+			type: String,
+			default: '#19be6b'
+		},
+		// 圆环线条的宽度，单位rpx
+		borderWidth: {
+			type: [Number, String],
+			default: 14
+		},
+		// 整个圆形的宽度，单位rpx
+		width: {
+			type: [Number, String],
+			default: 200
+		},
+		// 整个圆环执行一圈的时间，单位ms
+		duration: {
+			type: [Number, String],
+			default: 1500
+		},
+		// 主题类型
+		type: {
+			type: String,
+			default: ''
+		},
+		// 整个圆环进度区域的背景色
+		bgColor: {
+			type: String,
+			default: '#ffffff'
+		}
+	},
+	data() {
+		return {
+			// #ifdef MP-WEIXIN
+			elBgId: 'uCircleProgressBgId', // 微信小程序中不能使用this.$u.guid()形式动态生成id值，否则会报错
+			elId: 'uCircleProgressElId',
+			// #endif
+			// #ifndef MP-WEIXIN
+			elBgId: this.$u.guid(), // 非微信端的时候，需用动态的id，否则一个页面多个圆形进度条组件数据会混乱
+			elId: this.$u.guid(),
+			// #endif
+			widthPx: uni.upx2px(this.width), // 转成px后的整个组件的背景宽度
+			borderWidthPx: uni.upx2px(this.borderWidth), // 转成px后的圆环的宽度
+			startAngle: -Math.PI / 2, // canvas画圆的起始角度，默认为3点钟方向，定位到12点钟方向
+			progressContext: null, // 活动圆的canvas上下文
+			newPercent: 0, // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
+			oldPercent: 0 // 当动态修改进度值的时候，保存进度值的变化前后值，用于比较用
+		};
+	},
+	watch: {
+		percent(nVal, oVal = 0) {
+			if (nVal > 100) nVal = 100;
+			if (nVal < 0) oVal = 0;
+			// 此值其实等于this.percent，命名一个新
+			this.newPercent = nVal;
+			this.oldPercent = oVal;
+			setTimeout(() => {
+				// 无论是百分比值增加还是减少，需要操作还是原来的旧的百分比值
+				// 将此值减少或者新增到新的百分比值
+				this.drawCircleByProgress(oVal);
+			}, 50);
+		}
+	},
+	created() {
+		// 赋值，用于加载后第一个画圆使用
+		this.newPercent = this.percent;
+		this.oldPercent = 0;
+	},
+	computed: {
+		// 有type主题时，优先起作用
+		circleColor() {
+			if (['success', 'error', 'info', 'primary', 'warning'].indexOf(this.type) >= 0) return this.$u.color[this.type];
+			else return this.activeColor;
+		}
+	},
+	mounted() {
+		// 在h5端，必须要做一点延时才起作用，this.$nextTick()无效(HX2.4.7)
+		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(); // 开始描绘路径
+			// 设置一个原点(110,110)，半径为100的圆的路径到当前路径
+			let radius = this.widthPx / 2;
+			ctx.arc(radius, radius, radius - this.borderWidthPx, 0, 2 * Math.PI, false);
+			ctx.stroke(); // 对路径进行描绘
+			ctx.draw();
+		},
+		drawCircleByProgress(progress) {
+			// 第一次操作进度环时将上下文保存到了this.data中，直接使用即可
+			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.circleColor);
+			// 将总过渡时间除以100，得出每修改百分之一进度所需的时间
+			let time = Math.floor(this.duration / 100);
+			// 结束角的计算依据为：将2π分为100份，乘以当前的进度值，得出终止点的弧度值，加起始角，为整个圆从默认的
+			// 3点钟方向开始画图，转为更好理解的12点钟方向开始作图，这需要起始角和终止角同时加上this.startAngle值
+			let endAngle = ((2 * Math.PI) / 100) * progress + this.startAngle;
+			ctx.beginPath();
+			// 半径为整个canvas宽度的一半
+			let radius = this.widthPx / 2;
+			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);
+			}, time);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+.u-circle-progress {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.u-canvas-bg {
+	position: absolute;
+}
+
+.u-canvas {
+	position: absolute;
+}
+</style>
diff --git a/uview-ui/components/u-circle-progress/u-line-progress/u-line-progress.vue b/uview-ui/components/u-circle-progress/u-line-progress/u-line-progress.vue
new file mode 100644
index 0000000..77e2da2
--- /dev/null
+++ b/uview-ui/components/u-circle-progress/u-line-progress/u-line-progress.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="u-progress" :style="{
+		borderRadius: round ? '100rpx' : 0,
+		height: height + 'rpx',
+		backgroundColor: inactiveColor
+	}">
+		<view :class="[
+			type ? `u-type-${type}-bg` : '',
+			striped ? 'u-striped' : '',
+			striped && stripedActive ? 'u-striped-active' : ''
+		]" class="u-active" :style="[progressStyle]">
+			<slot v-if="$slots.default || $slots.$default" />
+			<block v-else-if="showPercent">
+				{{percent + '%'}}
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * lineProgress 线型进度条
+	 * @description 展示操作或任务的当前进度，比如上传文件，是一个线形的进度条。
+	 * @tutorial https://www.uviewui.com/components/lineProgress.html
+	 * @property {String Number} percent 进度条百分比值，为数值类型，0-100
+	 * @property {Boolean} round 进度条两端是否为半圆（默认true）
+	 * @property {String} type 如设置，active-color值将会失效
+	 * @property {String} active-color 进度条激活部分的颜色（默认#19be6b）
+	 * @property {String} inactive-color 进度条的底色（默认#ececec）
+	 * @property {Boolean} show-percent 是否在进度条内部显示当前的百分比值数值（默认true）
+	 * @property {String Number} height 进度条的高度，单位rpx（默认28）
+	 * @property {Boolean} striped 是否显示进度条激活部分的条纹（默认false）
+	 * @property {Boolean} striped-active 条纹是否具有动态效果（默认false）
+	 * @example <u-line-progress :percent="70" :show-percent="true"></u-line-progress>
+	 */
+	export default {
+		name: "u-line-progress",
+		props: {
+			// 两端是否显示半圆形
+			round: {
+				type: Boolean,
+				default: true
+			},
+			// 主题颜色
+			type: {
+				type: String,
+				default: ''
+			},
+			// 激活部分的颜色
+			activeColor: {
+				type: String,
+				default: '#19be6b'
+			},
+			inactiveColor: {
+				type: String,
+				default: '#ececec'
+			},
+			// 进度百分比，数值
+			percent: {
+				type: Number,
+				default: 0
+			},
+			// 是否在进度条内部显示百分比的值
+			showPercent: {
+				type: Boolean,
+				default: true
+			},
+			// 进度条的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 28
+			},
+			// 是否显示条纹
+			striped: {
+				type: Boolean,
+				default: false
+			},
+			// 条纹是否显示活动状态
+			stripedActive: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			progressStyle() {
+				let style = {};
+				style.width = this.percent + '%';
+				if(this.activeColor) style.backgroundColor = this.activeColor;
+				return style;
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-progress {
+		overflow: hidden;
+		height: 15px;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+		width: 100%;
+		border-radius: 100rpx;
+	}
+
+	.u-active {
+		width: 0;
+		height: 100%;
+		align-items: center;
+		@include vue-flex;
+		justify-items: flex-end;
+		justify-content: space-around;
+		font-size: 20rpx;
+		color: #ffffff;
+		transition: all 0.4s ease;
+	}
+
+	.u-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: 39px 39px;
+	}
+
+	.u-striped-active {
+		animation: progress-stripes 2s linear infinite;
+	}
+
+	@keyframes progress-stripes {
+		0% {
+			background-position: 0 0;
+		}
+
+		100% {
+			background-position: 39px 0;
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-col/u-col.vue b/uview-ui/components/u-col/u-col.vue
new file mode 100644
index 0000000..3b6cc64
--- /dev/null
+++ b/uview-ui/components/u-col/u-col.vue
@@ -0,0 +1,156 @@
+<template>
+	<view class="u-col" :class="[
+		'u-col-' + span
+	]" :style="{
+		padding: `0 ${Number(gutter)/2 + 'rpx'}`,
+		marginLeft: 100 / 12 * offset + '%',
+		flex: `0 0 ${100 / 12 * span}%`,
+		alignItems: uAlignItem,
+		justifyContent: uJustify,
+		textAlign: textAlign
+	}"
+	 @tap="click">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * col 布局单元格
+	 * @description 通过基础的 12 分栏，迅速简便地创建布局（搭配<u-row>使用）
+	 * @tutorial https://www.uviewui.com/components/layout.html
+	 * @property {String Number} span 栅格占据的列数，总12等分（默认0）
+	 * @property {String} text-align 文字水平对齐方式（默认left）
+	 * @property {String Number} offset 分栏左边偏移，计算方式与span相同（默认0）
+	 * @example <u-col span="3"><view class="demo-layout bg-purple"></view></u-col>
+	 */
+	export default {
+		name: "u-col",
+		props: {
+			// 占父容器宽度的多少等分，总分为12份
+			span: {
+				type: [Number, String],
+				default: 12
+			},
+			// 指定栅格左侧的间隔数(总12栏)
+			offset: {
+				type: [Number, String],
+				default: 0
+			},
+			// 水平排列方式，可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			// 垂直对齐方式，可选值为top、center、bottom
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// 文字对齐方式
+			textAlign: {
+				type: String,
+				default: 'left'
+			},
+			// 是否阻止事件传播
+			stop: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				gutter: 20, // 给col添加间距，左右边距各占一半，从父组件u-row获取
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			// 获取父组件实例，并赋值给对应的参数
+			this.parent = this.$u.$parent.call(this, 'u-row');
+			if (this.parent) {
+				this.gutter = this.parent.gutter;
+			}
+		},
+		computed: {
+			uJustify() {
+				if (this.justify == 'end' || this.justify == 'start') return 'flex-' + this.justify;
+				else if (this.justify == 'around' || this.justify == 'between') return 'space-' + this.justify;
+				else return this.justify;
+			},
+			uAlignItem() {
+				if (this.align == 'top') return 'flex-start';
+				if (this.align == 'bottom') return 'flex-end';
+				else return this.align;
+			}
+		},
+		methods: {
+			click(e) {
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-col {
+		/* #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
+		float: left;
+		/* #endif */
+	}
+
+	.u-col-0 {
+		width: 0;
+	}
+
+	.u-col-1 {
+		width: calc(100%/12);
+	}
+
+	.u-col-2 {
+		width: calc(100%/12 * 2);
+	}
+
+	.u-col-3 {
+		width: calc(100%/12 * 3);
+	}
+
+	.u-col-4 {
+		width: calc(100%/12 * 4);
+	}
+
+	.u-col-5 {
+		width: calc(100%/12 * 5);
+	}
+
+	.u-col-6 {
+		width: calc(100%/12 * 6);
+	}
+
+	.u-col-7 {
+		width: calc(100%/12 * 7);
+	}
+
+	.u-col-8 {
+		width: calc(100%/12 * 8);
+	}
+
+	.u-col-9 {
+		width: calc(100%/12 * 9);
+	}
+
+	.u-col-10 {
+		width: calc(100%/12 * 10);
+	}
+
+	.u-col-11 {
+		width: calc(100%/12 * 11);
+	}
+
+	.u-col-12 {
+		width: calc(100%/12 * 12);
+	}
+</style>
diff --git a/uview-ui/components/u-collapse-item/u-collapse-item.vue b/uview-ui/components/u-collapse-item/u-collapse-item.vue
new file mode 100644
index 0000000..6656657
--- /dev/null
+++ b/uview-ui/components/u-collapse-item/u-collapse-item.vue
@@ -0,0 +1,205 @@
+<template>
+	<view class="u-collapse-item" :style="[itemStyle]">
+		<view :hover-stay-time="200" class="u-collapse-head" @tap.stop="headClick" :hover-class="hoverClass" :style="[headStyle]">
+			<block v-if="!$slots['title-all']">
+				<view v-if="!$slots['title']" class="u-collapse-title u-line-1" :style="[{ textAlign: align ? align : 'left' },
+					isShow && activeStyle && !arrow ? activeStyle : '']">
+					{{ title }}
+				</view>
+				<slot v-else name="title" />
+				<view class="u-icon-wrap">
+					<u-icon v-if="arrow" :color="arrowColor" :class="{ 'u-arrow-down-icon-active': isShow }"
+					 class="u-arrow-down-icon" name="arrow-down"></u-icon>
+				</view>
+			</block>
+			<slot v-else name="title-all" />
+		</view>
+		<view class="u-collapse-body" :style="[{
+				height: isShow ? height + 'px' : '0'
+			}]">
+			<view class="u-collapse-content" :id="elId" :style="[bodyStyle]">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * collapseItem 手风琴Item
+	 * @description 通过折叠面板收纳内容区域（搭配u-collapse使用）
+	 * @tutorial https://www.uviewui.com/components/collapse.html
+	 * @property {String} title 面板标题
+	 * @property {String Number} index 主要用于事件的回调，标识那个Item被点击
+	 * @property {Boolean} disabled 面板是否可以打开或收起（默认false）
+	 * @property {Boolean} open 设置某个面板的初始状态是否打开（默认false）
+	 * @property {String Number} name 唯一标识符，如不设置，默认用当前collapse-item的索引值
+	 * @property {String} align 标题的对齐方式（默认left）
+	 * @property {Object} active-style 不显示箭头时，可以添加当前选择的collapse-item活动样式，对象形式
+	 * @event {Function} change 某个item被打开或者收起时触发
+	 * @example <u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">{{item.body}}</u-collapse-item>
+	 */
+	export default {
+		name: "u-collapse-item",
+		props: {
+			// 标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 标题的对齐方式
+			align: {
+				type: String,
+				default: 'left'
+			},
+			// 是否可以点击收起
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// collapse显示与否
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 唯一标识符
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			//活动样式
+			activeStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 标识当前为第几个
+			index: {
+				type: [String, Number],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				elId: this.$u.guid(),
+				height: 0, // body内容的高度
+				headStyle: {}, // 头部样式，对象形式
+				bodyStyle: {}, // 主体部分样式
+				itemStyle: {}, // 每个item的整体样式
+				arrowColor: '', // 箭头的颜色
+				hoverClass: '', // 头部按下时的效果样式类
+				arrow: true, // 是否显示右侧箭头
+				
+			};
+		},
+		watch: {
+			open(val) {
+				this.isShow = val;
+			}
+		},
+		created() {
+			this.parent = false;
+			// 获取u-collapse的信息，放在u-collapse是为了方便，不用每个u-collapse-item写一遍
+			this.isShow = this.open;
+		},
+		methods: {
+			// 异步获取内容，或者动态修改了内容时，需要重新初始化
+			init() {
+				this.parent = this.$u.$parent.call(this, 'u-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.arrowColor = this.parent.arrowColor;
+					this.hoverClass = this.parent.hoverClass;
+					this.arrow = this.parent.arrow;
+					this.itemStyle = this.parent.itemStyle;
+				}
+				this.$nextTick(() => {
+					this.queryRect();
+				});
+			},
+			// 点击collapsehead头部
+			headClick() {
+				if (this.disabled) return;
+				if (this.parent && this.parent.accordion == true) {
+					this.parent.childrens.map(val => {
+						// 自身不设置为false，因为后面有this.isShow = !this.isShow;处理了
+						if (this != val) {
+							val.isShow = false;
+						}
+					});
+				}
+
+				this.isShow = !this.isShow;
+				// 触发本组件的事件
+				this.$emit('change', {
+					index: this.index,
+					show: this.isShow
+				})
+				// 只有在打开时才发出事件
+				if (this.isShow) this.parent && this.parent.onChange();
+				this.$forceUpdate();
+			},
+			// 查询内容高度
+			queryRect() {
+				// $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://www.uviewui.com/js/getRect.html
+				// 组件内部一般用this.$uGetRect，对外的为this.$u.getRect，二者功能一致，名称不同
+				this.$uGetRect('#' + this.elId).then(res => {
+					this.height = res.height;
+				})
+			}
+		},
+		mounted() {
+			this.init();
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-collapse-head {
+		position: relative;
+		@include vue-flex;
+		justify-content: space-between;
+		align-items: center;
+		color: $u-main-color;
+		font-size: 30rpx;
+		line-height: 1;
+		padding: 24rpx 0;
+		text-align: left;
+	}
+
+	.u-collapse-title {
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.u-arrow-down-icon {
+		transition: all 0.3s;
+		margin-right: 20rpx;
+		margin-left: 14rpx;
+	}
+
+	.u-arrow-down-icon-active {
+		transform: rotate(180deg);
+		transform-origin: center center;
+	}
+
+	.u-collapse-body {
+		overflow: hidden;
+		transition: all 0.3s;
+	}
+
+	.u-collapse-content {
+		overflow: hidden;
+		font-size: 28rpx;
+		color: $u-tips-color;
+		text-align: left;
+	}
+</style>
diff --git a/uview-ui/components/u-collapse/u-collapse.vue b/uview-ui/components/u-collapse/u-collapse.vue
new file mode 100644
index 0000000..8572957
--- /dev/null
+++ b/uview-ui/components/u-collapse/u-collapse.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="u-collapse">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * collapse 手风琴
+	 * @description 通过折叠面板收纳内容区域
+	 * @tutorial https://www.uviewui.com/components/collapse.html
+	 * @property {Boolean} accordion 是否手风琴模式（默认true）
+	 * @property {Boolean} arrow 是否显示标题右侧的箭头（默认true）
+	 * @property {String} arrow-color 标题右侧箭头的颜色（默认#909399）
+	 * @property {Object} head-style 标题自定义样式，对象形式
+	 * @property {Object} body-style 主体自定义样式，对象形式
+	 * @property {String} hover-class 样式类名，按下时有效（默认u-hover-class）
+	 * @event {Function} change 当前激活面板展开时触发(如果是手风琴模式，参数activeNames类型为String，否则为Array)
+	 * @example <u-collapse></u-collapse>
+	 */
+	export default {
+		name:"u-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: '#909399'
+			},
+			// 标题部分按压时的样式类，"none"为无效果
+			hoverClass: {
+				type: String,
+				default: 'u-hover-class'
+			}
+		},
+		created() {
+			this.childrens = []
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			// 重新初始化一次内部的所有子元素的高度计算，用于异步获取数据渲染的情况
+			init() {
+				this.childrens.forEach((vm, index) => {
+					vm.init();
+				})
+			},
+			// collapse item被点击，由collapse item调用父组件方法
+			onChange() {
+				let activeItem = [];
+				this.childrens.forEach((vm, index) => {
+					if (vm.isShow) {
+						activeItem.push(vm.nameSync);
+					}
+				})
+				// 如果是手风琴模式，只有一个匹配结果，也即activeItem长度为1，将其转为字符串
+				if (this.accordion) activeItem = activeItem.join('');
+				this.$emit('change', activeItem);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uview-ui/components/u-column-notice/u-column-notice.vue b/uview-ui/components/u-column-notice/u-column-notice.vue
new file mode 100644
index 0000000..dd8bd31
--- /dev/null
+++ b/uview-ui/components/u-column-notice/u-column-notice.vue
@@ -0,0 +1,237 @@
+<template>
+	<view
+		class="u-notice-bar"
+		:style="{
+			background: computeBgColor,
+			padding: padding
+		}"
+		:class="[
+			type ? `u-type-${type}-light-bg` : ''
+		]"
+	>
+		<view class="u-icon-wrap">
+			<u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor"></u-icon>
+		</view>
+		<swiper :disable-touch="disableTouch" @change="change" :autoplay="autoplay && playState == 'play'" :vertical="vertical" circular :interval="duration" class="u-swiper">
+			<swiper-item v-for="(item, index) in list" :key="index" class="u-swiper-item">
+				<view
+					class="u-news-item u-line-1"
+					:style="[textStyle]"
+					@tap="click(index)"
+					:class="['u-type-' + type]"
+				>
+					{{ item }}
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="u-icon-wrap">
+			<u-icon @click="getMore" class="u-right-icon" v-if="moreIcon" name="arrow-right" :size="26" :color="computeColor"></u-icon>
+			<u-icon @click="close" class="u-right-icon" v-if="closeIcon" name="close" :size="24" :color="computeColor"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		// 显示的内容，数组
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 显示的主题，success|error|primary|info|warning
+		type: {
+			type: String,
+			default: 'warning'
+		},
+		// 是否显示左侧的音量图标
+		volumeIcon: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示右侧的右箭头图标
+		moreIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示右侧的关闭图标
+		closeIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动播放
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 文字颜色，各图标也会使用文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: ''
+		},
+		// 滚动方向，row-水平滚动，column-垂直滚动
+		direction: {
+			type: String,
+			default: 'row'
+		},
+		// 是否显示
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 26
+		},
+		// 滚动一个周期的时间长，单位ms
+		duration: {
+			type: [Number, String],
+			default: 2000
+		},
+		// 音量喇叭的大小
+		volumeSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+		speed: {
+			type: Number,
+			default: 160
+		},
+		// 水平滚动时，是否采用衔接形式滚动
+		isCircular: {
+			type: Boolean,
+			default: true
+		},
+		// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
+		mode: {
+			type: String,
+			default: 'horizontal'
+		},
+		// 播放状态，play-播放，paused-暂停
+		playState: {
+			type: String,
+			default: 'play'
+		},
+		// 是否禁止用手滑动切换
+		// 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
+		disableTouch: {
+			type: Boolean,
+			default: true
+		},
+		// 通知的边距
+		padding: {
+			type: [Number, String],
+			default: '18rpx 24rpx'
+		}
+	},
+	computed: {
+		// 计算字体颜色，如果没有自定义的，就用uview主题颜色
+		computeColor() {
+			if (this.color) return this.color;
+			// 如果是无主题，就默认使用content-color
+			else if(this.type == 'none') return '#606266';
+			else return this.type;
+		},
+		// 文字内容的样式
+		textStyle() {
+			let style = {};
+			if (this.color) style.color = this.color;
+			else if(this.type == 'none') style.color = '#606266';
+			style.fontSize = this.fontSize + 'rpx';
+			return style;
+		},
+		// 垂直或者水平滚动
+		vertical() {
+			if(this.mode == 'horizontal') return false;
+			else return true;
+		},
+		// 计算背景颜色
+		computeBgColor() {
+			if (this.bgColor) return this.bgColor;
+			else if(this.type == 'none') return 'transparent';
+		}
+	},
+	data() {
+		return {
+			// animation: false
+		};
+	},
+	methods: {
+		// 点击通告栏
+		click(index) {
+			this.$emit('click', index);
+		},
+		// 点击关闭按钮
+		close() {
+			this.$emit('close');
+		},
+		// 点击更多箭头按钮
+		getMore() {
+			this.$emit('getMore');
+		},
+		change(e) {
+			let index = e.detail.current;
+			if(index == this.list.length - 1) {
+				this.$emit('end');
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-notice-bar {
+	width: 100%;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	flex-wrap: nowrap;
+	padding: 18rpx 24rpx;
+	overflow: hidden;
+}
+
+.u-swiper {
+	font-size: 26rpx;
+	height: 32rpx;
+	@include vue-flex;
+	align-items: center;
+	flex: 1;
+	margin-left: 12rpx;
+}
+
+.u-swiper-item {
+	@include vue-flex;
+	align-items: center;
+	overflow: hidden;
+}
+
+.u-news-item {
+	overflow: hidden;
+}
+
+.u-right-icon {
+	margin-left: 12rpx;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	align-items: center;
+}
+
+.u-left-icon {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	align-items: center;
+}
+</style>
diff --git a/uview-ui/components/u-count-down/u-count-down.vue b/uview-ui/components/u-count-down/u-count-down.vue
new file mode 100644
index 0000000..7285d67
--- /dev/null
+++ b/uview-ui/components/u-count-down/u-count-down.vue
@@ -0,0 +1,318 @@
+<template>
+	<view class="u-countdown">
+		<view class="u-countdown-item" :style="[itemStyle]" v-if="showDays && (hideZeroDay || (!hideZeroDay && d != '00'))">
+			<view class="u-countdown-time" :style="[letterStyle]">
+				{{ d }}
+			</view>
+		</view>
+		<view
+			class="u-countdown-colon"
+			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
+			v-if="showDays && (hideZeroDay || (!hideZeroDay && d != '00'))"
+		>
+			{{ separator == 'colon' ? ':' : '天' }}
+		</view>
+		<view class="u-countdown-item" :style="[itemStyle]" v-if="showHours">
+			<view class="u-countdown-time" :style="{ fontSize: fontSize + 'rpx', color: color}">
+				{{ h }}
+			</view>
+		</view>
+		<view
+			class="u-countdown-colon"
+			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
+			v-if="showHours"
+		>
+			{{ separator == 'colon' ? ':' : '时' }}
+		</view>
+		<view class="u-countdown-item" :style="[itemStyle]" v-if="showMinutes">
+			<view class="u-countdown-time" :style="{ fontSize: fontSize + 'rpx', color: color}">
+				{{ i }}
+			</view>
+		</view>
+		<view
+			class="u-countdown-colon"
+			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
+			v-if="showMinutes"
+		>
+			{{ separator == 'colon' ? ':' : '分' }}
+		</view>
+		<view class="u-countdown-item" :style="[itemStyle]" v-if="showSeconds">
+			<view class="u-countdown-time" :style="{ fontSize: fontSize + 'rpx', color: color}">
+				{{ s }}
+			</view>
+		</view>
+		<view
+			class="u-countdown-colon"
+			:style="{fontSize: separatorSize + 'rpx', color: separatorColor, paddingBottom: separator == 'colon' ? '4rpx' : 0}"
+			v-if="showSeconds && separator == 'zh'"
+		>
+			秒
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * countDown 倒计时
+ * @description 该组件一般使用于某个活动的截止时间上，通过数字的变化，给用户明确的时间感受，提示用户进行某一个行为操作。
+ * @tutorial https://www.uviewui.com/components/countDown.html
+ * @property {String Number} timestamp 倒计时，单位为秒
+ * @property {Boolean} autoplay 是否自动开始倒计时，如果为false，需手动调用开始方法。见官网说明（默认true）
+ * @property {String} separator 分隔符，colon为英文冒号，zh为中文（默认colon）
+ * @property {String Number} separator-size 分隔符的字体大小，单位rpx（默认30）
+ * @property {String} separator-color 分隔符的颜色（默认#303133）
+ * @property {String Number} font-size 倒计时字体大小，单位rpx（默认30）
+ * @property {Boolean} show-border 是否显示倒计时数字的边框（默认false）
+ * @property {Boolean} hide-zero-day 当"天"的部分为0时，隐藏该字段 （默认true）
+ * @property {String} border-color 数字边框的颜色（默认#303133）
+ * @property {String} bg-color 倒计时数字的背景颜色（默认#ffffff）
+ * @property {String} color 倒计时数字的颜色（默认#303133）
+ * @property {String} height 数字高度值(宽度等同此值)，设置边框时看情况是否需要设置此值，单位rpx（默认auto）
+ * @property {Boolean} show-days 是否显示倒计时的"天"部分（默认true）
+ * @property {Boolean} show-hours 是否显示倒计时的"时"部分（默认true）
+ * @property {Boolean} show-minutes 是否显示倒计时的"分"部分（默认true）
+ * @property {Boolean} show-seconds 是否显示倒计时的"秒"部分（默认true）
+ * @event {Function} end 倒计时结束
+ * @event {Function} change 每秒触发一次，回调为当前剩余的倒计秒数
+ * @example <u-count-down ref="uCountDown" :timestamp="86400" :autoplay="false"></u-count-down>
+ */
+export default {
+	name: 'u-count-down',
+	props: {
+		// 倒计时的时间，秒为单位
+		timestamp: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否自动开始倒计时
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 用英文冒号(colon)或者中文(zh)当做分隔符，false的时候为中文，如："11:22"或"11时22秒"
+		separator: {
+			type: String,
+			default: 'colon'
+		},
+		// 分隔符的大小，单位rpx
+		separatorSize: {
+			type: [Number, String],
+			default: 30
+		},
+		// 分隔符颜色
+		separatorColor: {
+			type: String,
+			default: "#303133"
+		},
+		// 字体颜色
+		color: {
+			type: String,
+			default: '#303133'
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 30
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: '#fff'
+		},
+		// 数字框高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: 'auto'
+		},
+		// 是否显示数字框
+		showBorder: {
+			type: Boolean,
+			default: false
+		},
+		// 边框颜色
+		borderColor: {
+			type: String,
+			default: '#303133'
+		},
+		// 是否显示秒
+		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
+		}
+	},
+	watch: {
+		// 监听时间戳的变化
+		timestamp(newVal, oldVal) {
+			// 如果倒计时间发生变化，清除定时器，重新开始倒计时
+			this.clearTimer();
+			this.start();
+		}
+	},
+	data() {
+		return {
+			d: '00', // 天的默认值
+			h: '00', // 小时的默认值
+			i: '00', // 分钟的默认值
+			s: '00', // 秒的默认值
+			timer: null ,// 定时器
+			seconds: 0, // 记录不停倒计过程中变化的秒数
+		};
+	},
+	computed: {
+		// 倒计时item的样式，item为分别的时分秒部分的数字
+		itemStyle() {
+			let style = {};
+			if(this.height) {
+				style.height = this.height + 'rpx';
+				style.width = this.height + 'rpx';
+			}
+			if(this.showBorder) {
+				style.borderStyle = 'solid';
+				style.borderColor = this.borderColor;
+				style.borderWidth = '1px';
+			}
+			if(this.bgColor) {
+				style.backgroundColor = this.bgColor;
+			}
+			return style;
+		},
+		// 倒计时数字的样式
+		letterStyle() {
+			let style = {};
+			if(this.fontSize) style.fontSize = this.fontSize +  'rpx';
+			if(this.color) style.color = this.color;
+			return style;
+		}
+	},
+	mounted() {
+		// 如果自动倒计时
+		this.autoplay && this.timestamp && this.start();
+	},
+	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;
+			// showHour为需要显示的小时
+			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) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
+			// 如果小于10，在前面补上一个"0"
+			showHour = showHour < 10 ? '0' + showHour : showHour;
+			minute = minute < 10 ? '0' + minute : minute;
+			second = second < 10 ? '0' + second : second;
+			day = day < 10 ? '0' + day : day;
+			this.d = day;
+			this.h = showHour;
+			this.i = minute;
+			this.s = second;
+		},
+		// 停止倒计时
+		end() {
+			this.clearTimer();
+			this.$emit('end', {});
+		},
+		// 清除定时器
+		clearTimer() {
+			if(this.timer) {
+				// 清除定时器
+				clearInterval(this.timer);
+				this.timer = null;
+			}
+		}
+	},
+	beforeDestroy() {
+		clearInterval(this.timer);
+		this.timer = null;
+	}
+};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-countdown {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;		
+		/* #endif */
+		align-items: center;
+	}
+
+	.u-countdown-item {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		padding: 2rpx;
+		border-radius: 6rpx;
+		white-space: nowrap;
+		transform: translateZ(0);
+	}
+
+	.u-countdown-time {
+		margin: 0;
+		padding: 0;
+		line-height: 1;
+	}
+
+	.u-countdown-colon {
+		@include vue-flex;
+		justify-content: center;
+		padding: 0 5rpx;
+		line-height: 1;
+		align-items: center;
+		padding-bottom: 4rpx;
+	}
+
+	.u-countdown-scale {
+		transform: scale(0.9);
+		transform-origin: center center;
+	}
+</style>
diff --git a/uview-ui/components/u-count-to/u-count-to.vue b/uview-ui/components/u-count-to/u-count-to.vue
new file mode 100644
index 0000000..053dc5f
--- /dev/null
+++ b/uview-ui/components/u-count-to/u-count-to.vue
@@ -0,0 +1,241 @@
+<template>
+	<view
+		class="u-count-num"
+		:style="{
+			fontSize: fontSize + 'rpx',
+			fontWeight: bold ? 'bold' : 'normal',
+			color: color
+		}"
+	>
+		{{ displayValue }}
+	</view>
+</template>
+
+<script>
+/**
+ * countTo 数字滚动
+ * @description 该组件一般用于需要滚动数字到某一个值的场景，目标要求是一个递增的值。
+ * @tutorial https://www.uviewui.com/components/countTo.html
+ * @property {String Number} start-val 开始值
+ * @property {String Number} end-val 结束值
+ * @property {String Number} duration 滚动过程所需的时间，单位ms（默认2000）
+ * @property {Boolean} autoplay 是否自动开始滚动（默认true）
+ * @property {String Number} decimals 要显示的小数位数，见官网说明（默认0）
+ * @property {Boolean} use-easing 滚动结束时，是否缓动结尾，见官网说明（默认true）
+ * @property {String} separator 千位分隔符，见官网说明
+ * @property {String} color 字体颜色（默认#303133）
+ * @property {String Number} font-size 字体大小，单位rpx（默认50）
+ * @property {Boolean} bold 字体是否加粗（默认false）
+ * @event {Function} end 数值滚动到目标值时触发
+ * @example <u-count-to ref="uCountTo" :end-val="endVal" :autoplay="autoplay"></u-count-to>
+ */
+export default {
+	name: 'u-count-to',
+	props: {
+		// 开始的数值，默认从0增长到某一个数
+		startVal: {
+			type: [Number, String],
+			default: 0
+		},
+		// 要滚动的目标数值，必须
+		endVal: {
+			type: [Number, String],
+			default: 0,
+			required: true
+		},
+		// 滚动到目标数值的动画持续时间，单位为毫秒（ms）
+		duration: {
+			type: [Number, String],
+			default: 2000
+		},
+		// 设置数值后是否自动开始滚动
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 要显示的小数位数
+		decimals: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否在即将到达目标数值的时候，使用缓慢滚动的效果
+		useEasing: {
+			type: Boolean,
+			default: true
+		},
+		// 十进制分割
+		decimal: {
+			type: [Number, String],
+			default: '.'
+		},
+		// 字体颜色
+		color: {
+			type: String,
+			default: '#303133'
+		},
+		// 字体大小
+		fontSize: {
+			type: [Number, String],
+			default: 50
+		},
+		// 是否加粗字体
+		bold: {
+			type: Boolean,
+			default: false
+		},
+		// 千位分隔符，类似金额的分割(￥23,321.05中的",")
+		separator: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			localStartVal: this.startVal,
+			displayValue: this.formatNumber(this.startVal),
+			printVal: null,
+			paused: false, // 是否暂停
+			localDuration: Number(this.duration),
+			startTime: null, // 开始的时间
+			timestamp: null, // 时间戳
+			remaining: null, // 停留的时间
+			rAF: null,
+			lastTime: 0 // 上一次的时间
+		};
+	},
+	computed: {
+		countDown() {
+			return this.startVal > this.endVal;
+		}
+	},
+	watch: {
+		startVal() {
+			this.autoplay && this.start();
+		},
+		endVal() {
+			this.autoplay && this.start();
+		}
+	},
+	mounted() {
+		this.autoplay && this.start();
+	},
+	methods: {
+		easingFn(t, b, c, d) {
+			return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b;
+		},
+		requestAnimationFrame(callback) {
+			const currTime = new Date().getTime();
+			// 为了使setTimteout的尽可能的接近每秒60帧的效果
+			const timeToCall = Math.max(0, 16 - (currTime - this.lastTime));
+			const id = setTimeout(() => {
+				callback(currTime + timeToCall);
+			}, timeToCall);
+			this.lastTime = currTime + timeToCall;
+			return id;
+		},
+
+		cancelAnimationFrame(id) {
+			clearTimeout(id);
+		},
+		// 开始滚动数字
+		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.remaining;
+			this.localStartVal = this.printVal;
+			this.requestAnimationFrame(this.count);
+		},
+		// 重置
+		reset() {
+			this.startTime = null;
+			this.cancelAnimationFrame(this.rAF);
+			this.displayValue = this.formatNumber(this.startVal);
+		},
+		count(timestamp) {
+			if (!this.startTime) this.startTime = timestamp;
+			this.timestamp = timestamp;
+			const progress = timestamp - this.startTime;
+			this.remaining = this.localDuration - progress;
+			if (this.useEasing) {
+				if (this.countDown) {
+					this.printVal = this.localStartVal - this.easingFn(progress, 0, this.localStartVal - this.endVal, this.localDuration);
+				} else {
+					this.printVal = this.easingFn(progress, this.localStartVal, this.endVal - this.localStartVal, this.localDuration);
+				}
+			} else {
+				if (this.countDown) {
+					this.printVal = this.localStartVal - (this.localStartVal - this.endVal) * (progress / this.localDuration);
+				} else {
+					this.printVal = this.localStartVal + (this.endVal - this.localStartVal) * (progress / this.localDuration);
+				}
+			}
+			if (this.countDown) {
+				this.printVal = this.printVal < this.endVal ? this.endVal : this.printVal;
+			} else {
+				this.printVal = this.printVal > this.endVal ? this.endVal : this.printVal;
+			}
+			this.displayValue = this.formatNumber(this.printVal);
+			if (progress < this.localDuration) {
+				this.rAF = this.requestAnimationFrame(this.count);
+			} else {
+				this.$emit('end');
+			}
+		},
+		// 判断是否数字
+		isNumber(val) {
+			return !isNaN(parseFloat(val));
+		},
+		formatNumber(num) {
+			// 将num转为Number类型，因为其值可能为字符串数值，调用toFixed会报错
+			num = Number(num);
+			num = num.toFixed(Number(this.decimals));
+			num += '';
+			const x = num.split('.');
+			let x1 = x[0];
+			const x2 = x.length > 1 ? this.decimal + x[1] : '';
+			const rgx = /(\d+)(\d{3})/;
+			if (this.separator && !this.isNumber(this.separator)) {
+				while (rgx.test(x1)) {
+					x1 = x1.replace(rgx, '$1' + this.separator + '$2');
+				}
+			}
+			return x1 + x2;
+		},
+		destroyed() {
+			this.cancelAnimationFrame(this.rAF);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-count-num {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+	text-align: center;
+}
+</style>
diff --git a/uview-ui/components/u-divider/u-divider.vue b/uview-ui/components/u-divider/u-divider.vue
new file mode 100644
index 0000000..6f8d7e6
--- /dev/null
+++ b/uview-ui/components/u-divider/u-divider.vue
@@ -0,0 +1,153 @@
+<template>
+	<view class="u-divider" :style="{
+		height: height == 'auto' ? 'auto' : height + 'rpx',
+		backgroundColor: bgColor,
+		marginBottom: marginBottom + 'rpx',
+		marginTop: marginTop + 'rpx'
+	}" @tap="click">
+		<view class="u-divider-line" :class="[type ? 'u-divider-line--bordercolor--' + type : '']" :style="[lineStyle]"></view>
+		<view v-if="useSlot" class="u-divider-text" :style="{
+			color: color,
+			fontSize: fontSize + 'rpx'
+		}"><slot /></view>
+		<view class="u-divider-line" :class="[type ? 'u-divider-line--bordercolor--' + type : '']" :style="[lineStyle]"></view>
+	</view>
+</template>
+
+<script>
+/**
+ * divider 分割线
+ * @description 区隔内容的分割线，一般用于页面底部"没有更多"的提示。
+ * @tutorial https://www.uviewui.com/components/divider.html
+ * @property {String Number} half-width 文字左或右边线条宽度，数值或百分比，数值时单位为rpx
+ * @property {String} border-color 线条颜色，优先级高于type（默认#dcdfe6）
+ * @property {String} color 文字颜色（默认#909399）
+ * @property {String Number} fontSize 字体大小，单位rpx（默认26）
+ * @property {String} bg-color 整个divider的背景颜色（默认呢#ffffff）
+ * @property {String Number} height 整个divider的高度，单位rpx（默认40）
+ * @property {String} type 将线条设置主题色（默认primary）
+ * @property {Boolean} useSlot 是否使用slot传入内容，如果不传入，中间不会有空隙（默认true）
+ * @property {String Number} margin-top 与前一个组件的距离，单位rpx（默认0）
+ * @property {String Number} margin-bottom 与后一个组件的距离，单位rpx（0）
+ * @event {Function} click divider组件被点击时触发
+ * @example <u-divider color="#fa3534">长河落日圆</u-divider>
+ */
+export default {
+	name: 'u-divider',
+	props: {
+		// 单一边divider横线的宽度(数值)，单位rpx。或者百分比
+		halfWidth: {
+			type: [Number, String],
+			default: 150
+		},
+		// divider横线的颜色，如设置，
+		borderColor: {
+			type: String,
+			default: '#dcdfe6'
+		},
+		// 主题色，可以是primary|info|success|warning|error之一值
+		type: {
+			type: String,
+			default: 'primary'
+		},
+		// 文字颜色
+		color: {
+			type: String,
+			default: '#909399'
+		},
+		// 文字大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 26
+		},
+		// 整个divider的背景颜色
+		bgColor: {
+			type: String,
+			default: '#ffffff'
+		},
+		// 整个divider的高度单位rpx
+		height: {
+			type: [Number, String],
+			default: 'auto'
+		},
+		// 上边距
+		marginTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 下边距
+		marginBottom: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否使用slot传入内容，如果不用slot传入内容，先的中间就不会有空隙
+		useSlot: {
+			type: Boolean,
+			default: true
+		}
+	},
+	computed: {
+		lineStyle() {
+			let style = {};
+			if(String(this.halfWidth).indexOf('%') != -1) style.width = this.halfWidth;
+			else style.width = this.halfWidth + 'rpx';
+			// borderColor优先级高于type值
+			if(this.borderColor) style.borderColor = this.borderColor;
+			return style;
+		}
+	},
+	methods: {
+		click() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+.u-divider {
+	width: 100%;
+	position: relative;
+	text-align: center;
+	@include vue-flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	flex-direction: row;
+}
+
+.u-divider-line {
+	border-bottom: 1px solid $u-border-color;
+	transform: scale(1, 0.5);
+	transform-origin: center;
+	
+	&--bordercolor--primary {
+		border-color: $u-type-primary;
+	}
+	
+	&--bordercolor--success {
+		border-color: $u-type-success;
+	}
+	
+	&--bordercolor--error {
+		border-color: $u-type-primary;
+	}
+	
+	&--bordercolor--info {
+		border-color: $u-type-info;
+	}
+	
+	&--bordercolor--warning {
+		border-color: $u-type-warning;
+	}
+}
+
+.u-divider-text {
+	white-space: nowrap;
+	padding: 0 16rpx;
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+}
+</style>
diff --git a/uview-ui/components/u-dropdown-item/u-dropdown-item.vue b/uview-ui/components/u-dropdown-item/u-dropdown-item.vue
new file mode 100644
index 0000000..ba60d8f
--- /dev/null
+++ b/uview-ui/components/u-dropdown-item/u-dropdown-item.vue
@@ -0,0 +1,132 @@
+<template>
+	<view class="u-dropdown-item" v-if="active" @touchmove.stop.prevent="() => {}" @tap.stop.prevent="() => {}">
+		<block v-if="!$slots.default && !$slots.$default">
+			<scroll-view scroll-y="true" :style="{
+				height: $u.addUnit(height)
+			}">
+				<view class="u-dropdown-item__options">
+					<u-cell-group>
+						<u-cell-item @click="cellClick(item.value)" :arrow="false" :title="item.label" v-for="(item, index) in options"
+						 :key="index" :title-style="{
+							color: value == item.value ? activeColor : inactiveColor
+						}">
+							<u-icon v-if="value == item.value" name="checkbox-mark" :color="activeColor" size="32"></u-icon>
+						</u-cell-item>
+					</u-cell-group>
+				</view>
+			</scroll-view>
+		</block>
+		<slot v-else />
+	</view>
+</template>
+
+<script>
+	/**
+	 * dropdown-item 下拉菜单
+	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
+	 * @tutorial http://uviewui.com/components/dropdown.html
+	 * @property {String | Number} v-model 双向绑定选项卡选择值
+	 * @property {String} title 菜单项标题
+	 * @property {Array[Object]} options 选项数据，如果传入了默认slot，此参数无效
+	 * @property {Boolean} disabled 是否禁用此选项卡（默认false）
+	 * @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
+	 * @property {String | Number} height 弹窗下拉内容的高度(内容超出将会滚动)（默认auto）
+	 * @example <u-dropdown-item title="标题"></u-dropdown-item>
+	 */
+	export default {
+		name: 'u-dropdown-item',
+		props: {
+			// 当前选中项的value值
+			value: {
+				type: [Number, String, Array],
+				default: ''
+			},
+			// 菜单项标题
+			title: {
+				type: [String, Number],
+				default: ''
+			},
+			// 选项数据，如果传入了默认slot，此参数无效
+			options: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 是否禁用此菜单项
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 下拉弹窗的高度
+			height: {
+				type: [Number, String],
+				default: 'auto'
+			},
+		},
+		data() {
+			return {
+				active: false, // 当前项是否处于展开状态
+				activeColor: '#2979ff', // 激活时左边文字和右边对勾图标的颜色
+				inactiveColor: '#606266', // 未激活时左边文字和右边对勾图标的颜色
+			}
+		},
+		computed: {
+			// 监听props是否发生了变化，有些值需要传递给父组件u-dropdown，无法双向绑定
+			propsChange() {
+				return `${this.title}-${this.disabled}`;
+			}
+		},
+		watch: {
+			propsChange(n) {
+				// 当值变化时，通知父组件重新初始化，让父组件执行每个子组件的init()方法
+				// 将所有子组件数据重新整理一遍
+				if (this.parent) this.parent.init();
+			}
+		},
+		created() {
+			// 父组件的实例
+			this.parent = false;
+		},
+		methods: {
+			init() {
+				// 获取父组件u-dropdown
+				let parent = this.$u.$parent.call(this, 'u-dropdown');
+				if (parent) {
+					this.parent = parent;
+					// 将子组件的激活颜色配置为父组件设置的激活和未激活时的颜色
+					this.activeColor = parent.activeColor;
+					this.inactiveColor = parent.inactiveColor;
+					// 将本组件的this，放入到父组件的children数组中，让父组件可以操作本(子)组件的方法和属性
+					// push进去前，显判断是否已经存在了本实例，因为在子组件内部数据变化时，会通过父组件重新初始化子组件
+					let exist = parent.children.find(val => {
+						return this === val;
+					})
+					if (!exist) parent.children.push(this);
+					if (parent.children.length == 1) this.active = true;
+					// 父组件无法监听children的变化，故将子组件的title，传入父组件的menuList数组中
+					parent.menuList.push({
+						title: this.title,
+						disabled: this.disabled
+					});
+				}
+			},
+			// cell被点击
+			cellClick(value) {
+				// 修改通过v-model绑定的值
+				this.$emit('input', value);
+				// 通知父组件(u-dropdown)收起菜单
+				this.parent.close();
+				// 发出事件，抛出当前勾选项的value
+				this.$emit('change', value);
+			}
+		},
+		mounted() {
+			this.init();
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uview-ui/components/u-dropdown/u-dropdown.vue b/uview-ui/components/u-dropdown/u-dropdown.vue
new file mode 100644
index 0000000..a62e469
--- /dev/null
+++ b/uview-ui/components/u-dropdown/u-dropdown.vue
@@ -0,0 +1,298 @@
+<template>
+	<view class="u-dropdown">
+		<view class="u-dropdown__menu" :style="{
+			height: $u.addUnit(height)
+		}" :class="{
+			'u-border-bottom': borderBottom
+		}">
+			<view class="u-dropdown__menu__item" v-for="(item, index) in menuList" :key="index" @tap.stop="menuClick(index)">
+				<view class="u-flex">
+					<text class="u-dropdown__menu__item__text" :style="{
+						color: item.disabled ? '#c0c4cc' : (index === current || highlightIndex == index) ? activeColor : inactiveColor,
+						fontSize: $u.addUnit(titleSize)
+					}">{{item.title}}</text>
+					<view class="u-dropdown__menu__item__arrow" :class="{
+						'u-dropdown__menu__item__arrow--rotate': index === current
+					}">
+						<u-icon :custom-style="{display: 'flex'}" :name="menuIcon" :size="$u.addUnit(menuIconSize)" :color="index === current || highlightIndex == index ? activeColor : '#c0c4cc'"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="u-dropdown__content" :style="[contentStyle, {
+			transition: `opacity ${duration / 1000}s linear`,
+			top: $u.addUnit(height),
+			height: contentHeight + 'px'
+		}]"
+		 @tap="maskClick" @touchmove.stop.prevent>
+			<view @tap.stop.prevent class="u-dropdown__content__popup" :style="[popupStyle]">
+				<slot></slot>
+			</view>
+			<view class="u-dropdown__content__mask"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * dropdown 下拉菜单
+	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
+	 * @tutorial http://uviewui.com/components/dropdown.html
+	 * @property {String} active-color 标题和选项卡选中的颜色（默认#2979ff）
+	 * @property {String} inactive-color 标题和选项卡未选中的颜色（默认#606266）
+	 * @property {Boolean} close-on-click-mask 点击遮罩是否关闭菜单（默认true）
+	 * @property {Boolean} close-on-click-self 点击当前激活项标题是否关闭菜单（默认true）
+	 * @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
+	 * @property {String | Number} height 标题菜单的高度，单位任意（默认80）
+	 * @property {String | Number} border-radius 菜单展开内容下方的圆角值，单位任意（默认0）
+	 * @property {Boolean} border-bottom 标题菜单是否显示下边框（默认false）
+	 * @property {String | Number} title-size 标题的字体大小，单位任意，数值默认为rpx单位（默认28）
+	 * @event {Function} open 下拉菜单被打开时触发
+	 * @event {Function} close 下拉菜单被关闭时触发
+	 * @example <u-dropdown></u-dropdown>
+	 */
+	export default {
+		name: 'u-dropdown',
+		props: {
+			// 菜单标题和选项的激活态颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 菜单标题和选项的未激活态颜色
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 点击遮罩是否关闭菜单
+			closeOnClickMask: {
+				type: Boolean,
+				default: true
+			},
+			// 点击当前激活项标题是否关闭菜单
+			closeOnClickSelf: {
+				type: Boolean,
+				default: true
+			},
+			// 过渡时间
+			duration: {
+				type: [Number, String],
+				default: 300
+			},
+			// 标题菜单的高度，单位任意，数值默认为rpx单位
+			height: {
+				type: [Number, String],
+				default: 80
+			},
+			// 是否显示下边框
+			borderBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 标题的字体大小
+			titleSize: {
+				type: [Number, String],
+				default: 28
+			},
+			// 下拉出来的内容部分的圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 0
+			},
+			// 菜单右侧的icon图标
+			menuIcon: {
+				type: String,
+				default: 'arrow-down'
+			},
+			// 菜单右侧图标的大小
+			menuIconSize: {
+				type: [Number, String],
+				default: 26
+			}
+		},
+		data() {
+			return {
+				showDropdown: true, // 是否打开下来菜单,
+				menuList: [], // 显示的菜单
+				active: false, // 下拉菜单的状态
+				// 当前是第几个菜单处于激活状态，小程序中此处不能写成false或者""，否则后续将current赋值为0，
+				// 无能的TX没有使用===而是使用==判断，导致程序认为前后二者没有变化，从而不会触发视图更新
+				current: 99999,
+				// 外层内容的样式，初始时处于底层，且透明
+				contentStyle: {
+					zIndex: -1,
+					opacity: 0
+				},
+				// 让某个菜单保持高亮的状态
+				highlightIndex: 99999,
+				contentHeight: 0
+			}
+		},
+		computed: {
+			// 下拉出来部分的样式
+			popupStyle() {
+				let style = {};
+				// 进行Y轴位移，展开状态时，恢复原位。收齐状态时，往上位移100%，进行隐藏
+				style.transform = `translateY(${this.active ? 0 : '-100%'})`
+				style['transition-duration'] = this.duration / 1000 + 's';
+				style.borderRadius = `0 0 ${this.$u.addUnit(this.borderRadius)} ${this.$u.addUnit(this.borderRadius)}`;
+				return style;
+			}
+		},
+		created() {
+			// 引用所有子组件(u-dropdown-item)的this，不能在data中声明变量，否则在微信小程序会造成循环引用而报错
+			this.children = [];
+		},
+		mounted() {
+			this.getContentHeight();
+		},
+		methods: {
+			init() {
+				// 当某个子组件内容变化时，触发父组件的init，父组件再让每一个子组件重新初始化一遍
+				// 以保证数据的正确性
+				this.menuList = [];
+				this.children.map(child => {
+					child.init();
+				})
+			},
+			// 点击菜单
+			menuClick(index) {
+				// 判断是否被禁用
+				if (this.menuList[index].disabled) return;
+				// 如果点击时的索引和当前激活项索引相同，意味着点击了激活项，需要收起下拉菜单
+				if (index === this.current && this.closeOnClickSelf) {
+					this.close();
+					// 等动画结束后，再移除下拉菜单中的内容，否则直接移除，也就没有下拉菜单收起的效果了
+					setTimeout(() => {
+						this.children[index].active = false;
+					}, this.duration)
+					return;
+				}
+				this.open(index);
+			},
+			// 打开下拉菜单
+			open(index) {
+				// 重置高亮索引，否则会造成多个菜单同时高亮
+				// this.highlightIndex = 9999;
+				// 展开时，设置下拉内容的样式
+				this.contentStyle = {
+					zIndex: 11,
+				}
+				// 标记展开状态以及当前展开项的索引
+				this.active = true;
+				this.current = index;
+				// 历遍所有的子元素，将索引匹配的项标记为激活状态，因为子元素是通过v-if控制切换的
+				// 之所以不是因display: none，是因为nvue没有display这个属性
+				this.children.map((val, idx) => {
+					val.active = index == idx ? true : false;
+				})
+				this.$emit('open', this.current);
+			},
+			// 设置下拉菜单处于收起状态
+			close() {
+				this.$emit('close', this.current);
+				// 设置为收起状态，同时current归位，设置为空字符串
+				this.active = false;
+				this.current = 99999;
+				// 下拉内容的样式进行调整，不透明度设置为0
+				this.contentStyle = {
+					zIndex: -1,
+					opacity: 0
+				}
+			},
+			// 点击遮罩
+			maskClick() {
+				// 如果不允许点击遮罩，直接返回
+				if (!this.closeOnClickMask) return;
+				this.close();
+			},
+			// 外部手动设置某个菜单高亮
+			highlight(index = undefined) {
+				this.highlightIndex = index !== undefined ? index : 99999;
+			},
+			// 获取下拉菜单内容的高度
+			getContentHeight() {
+				// 这里的原理为，因为dropdown组件是相对定位的，它的下拉出来的内容，必须给定一个高度
+				// 才能让遮罩占满菜单一下，直到屏幕底部的高度
+				// this.$u.sys()为uView封装的获取设备信息的方法
+				let windowHeight = this.$u.sys().windowHeight;
+				this.$uGetRect('.u-dropdown__menu').then(res => {
+					// 这里获取的是dropdown的尺寸，在H5上，uniapp获取尺寸是有bug的(以前提出修复过，后来又出现了此bug，目前hx2.8.11版本)
+					// H5端bug表现为元素尺寸的top值为导航栏底部到到元素的上边沿的距离，但是元素的bottom值确是导航栏顶部到元素底部的距离
+					// 二者是互相矛盾的，本质原因是H5端导航栏非原生，uni的开发者大意造成
+					// 这里取菜单栏的botton值合理的，不能用res.top，否则页面会造成滚动
+					this.contentHeight = windowHeight - res.bottom;
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-dropdown {
+		flex: 1;
+		width: 100%;
+		position: relative;
+
+		&__menu {
+			@include vue-flex;
+			position: relative;
+			z-index: 11;
+			height: 80rpx;
+
+			&__item {
+				flex: 1;
+				@include vue-flex;
+				justify-content: center;
+				align-items: center;
+
+				&__text {
+					font-size: 28rpx;
+					color: $u-content-color;
+				}
+
+				&__arrow {
+					margin-left: 6rpx;
+					transition: transform .3s;
+					align-items: center;
+					@include vue-flex;
+
+					&--rotate {
+						transform: rotate(180deg);
+					}
+				}
+			}
+		}
+
+		&__content {
+			position: absolute;
+			z-index: 8;
+			width: 100%;
+			left: 0px;
+			bottom: 0;
+			overflow: hidden;
+			
+
+			&__mask {
+				position: absolute;
+				z-index: 9;
+				background: rgba(0, 0, 0, .3);
+				width: 100%;
+				left: 0;
+				top: 0;
+				bottom: 0;
+			}
+
+			&__popup {
+				position: relative;
+				z-index: 10;
+				transition: all 0.3s;
+				transform: translate3D(0, -100%, 0);
+				overflow: hidden;
+			}
+		}
+
+	}
+</style>
diff --git a/uview-ui/components/u-empty/u-empty.vue b/uview-ui/components/u-empty/u-empty.vue
new file mode 100644
index 0000000..2c77b24
--- /dev/null
+++ b/uview-ui/components/u-empty/u-empty.vue
@@ -0,0 +1,193 @@
+<template>
+	<view class="u-empty" v-if="show" :style="{
+		marginTop: marginTop + 'rpx'
+	}">
+		<u-icon
+			:name="src ? src : 'empty-' + mode"
+			:custom-style="iconStyle"
+			:label="text ? text : icons[mode]"
+			label-pos="bottom"
+			:label-color="color"
+			:label-size="fontSize"
+			:size="iconSize"
+			:color="iconColor"
+			margin-top="14"
+		></u-icon>
+		<view class="u-slot-wrap">
+			<slot name="bottom"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * empty 内容为空
+	 * @description 该组件用于需要加载内容，但是加载的第一页数据就为空，提示一个"没有内容"的场景， 我们精心挑选了十几个场景的图标，方便您使用。
+	 * @tutorial https://www.uviewui.com/components/empty.html
+	 * @property {String} color 文字颜色（默认#c0c4cc）
+	 * @property {String} text 文字提示（默认“无内容”）
+	 * @property {String} src 自定义图标路径，如定义，mode参数会失效
+	 * @property {String Number} font-size 提示文字的大小，单位rpx（默认28）
+	 * @property {String} mode 内置的图标，见官网说明（默认data）
+	 * @property {String Number} img-width 图标的宽度，单位rpx（默认240）
+	 * @property {String} img-height 图标的高度，单位rpx（默认auto）
+	 * @property {String Number} margin-top 组件距离上一个元素之间的距离（默认0）
+	 * @property {Boolean} show 是否显示组件（默认true）
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 * @example <u-empty text="所谓伊人，在水一方" mode="list"></u-empty>
+	 */
+	export default {
+		name: "u-empty",
+		props: {
+			// 图标路径
+			src: {
+				type: String,
+				default: ''
+			},
+			// 提示文字
+			text: {
+				type: String,
+				default: ''
+			},
+			// 文字颜色
+			color: {
+				type: String,
+				default: '#c0c4cc'
+			},
+			// 图标的颜色
+			iconColor: {
+				type: String,
+				default: '#c0c4cc'
+			},
+			// 图标的大小
+			iconSize: {
+				type: [String, Number],
+				default: 120
+			},
+			// 文字大小，单位rpx
+			fontSize: {
+				type: [String, Number],
+				default: 26
+			},
+			// 选择预置的图标类型
+			mode: {
+				type: String,
+				default: 'data'
+			},
+			//  图标宽度，单位rpx
+			imgWidth: {
+				type: [String, Number],
+				default: 120
+			},
+			// 图标高度，单位rpx
+			imgHeight: {
+				type: [String, Number],
+				default: 'auto'
+			},
+			// 是否显示组件
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 组件距离上一个元素之间的距离
+			marginTop: {
+				type: [String, Number],
+				default: 0
+			},
+			iconStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				icons: {
+					car: '购物车为空',
+					page: '页面不存在',
+					search: '没有搜索结果',
+					address: '没有收货地址',
+					wifi: '没有WiFi',
+					order: '订单为空',
+					coupon: '没有优惠券',
+					favor: '暂无收藏',
+					permission: '无权限',
+					history: '无历史记录',
+					news: '无新闻列表',
+					message: '消息列表为空',
+					list: '列表为空',
+					data: '数据为空'
+				},
+				// icons: [{
+				// 	icon: 'car',
+				// 	text: '购物车为空'
+				// },{
+				// 	icon: 'page',
+				// 	text: '页面不存在'
+				// },{
+				// 	icon: 'search',
+				// 	text: '没有搜索结果'
+				// },{
+				// 	icon: 'address',
+				// 	text: '没有收货地址'
+				// },{
+				// 	icon: 'wifi',
+				// 	text: '没有WiFi'
+				// },{
+				// 	icon: 'order',
+				// 	text: '订单为空'
+				// },{
+				// 	icon: 'coupon',
+				// 	text: '没有优惠券'
+				// },{
+				// 	icon: 'favor',
+				// 	text: '暂无收藏'
+				// },{
+				// 	icon: 'permission',
+				// 	text: '无权限'
+				// },{
+				// 	icon: 'history',
+				// 	text: '无历史记录'
+				// },{
+				// 	icon: 'news',
+				// 	text: '无新闻列表'
+				// },{
+				// 	icon: 'message',
+				// 	text: '消息列表为空'
+				// },{
+				// 	icon: 'list',
+				// 	text: '列表为空'
+				// },{
+				// 	icon: 'data',
+				// 	text: '数据为空'
+				// }],
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-empty {
+		@include vue-flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+	}
+
+	.u-image {
+		margin-bottom: 20rpx;
+	}
+
+	.u-slot-wrap {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 20rpx;
+	}
+</style>
diff --git a/uview-ui/components/u-field/u-field.vue b/uview-ui/components/u-field/u-field.vue
new file mode 100644
index 0000000..b562798
--- /dev/null
+++ b/uview-ui/components/u-field/u-field.vue
@@ -0,0 +1,384 @@
+<template>
+	<view class="u-field" :class="{'u-border-top': borderTop, 'u-border-bottom': borderBottom }">
+		<view class="u-field-inner" :class="[type == 'textarea' ? 'u-textarea-inner' : '', 'u-label-postion-' + labelPosition]">
+			<view class="u-label" :class="[required ? 'u-required' : '']" :style="{
+				justifyContent: justifyContent, 
+				flex: labelPosition == 'left' ? `0 0 ${labelWidth}rpx` : '1'
+			}">
+				<view class="u-icon-wrap" v-if="icon">
+					<u-icon size="32" :custom-style="iconStyle" :name="icon" :color="iconColor" class="u-icon"></u-icon>
+				</view>
+				<slot name="icon"></slot>
+				<text class="u-label-text" :class="[this.$slots.icon || icon ? 'u-label-left-gap' : '']">{{ label }}</text>
+			</view>
+			<view class="fild-body">
+				<view class="u-flex-1 u-flex" :style="[inputWrapStyle]">
+					<textarea v-if="type == 'textarea'" class="u-flex-1 u-textarea-class" :style="[fieldStyle]" :value="value"
+					 :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" :maxlength="inputMaxlength"
+					 :focus="focus" :autoHeight="autoHeight" :fixed="fixed" @input="onInput" @blur="onBlur" @focus="onFocus" @confirm="onConfirm"
+					 @tap="fieldClick" />
+					<input
+						v-else
+						:style="[fieldStyle]"
+						:type="type"
+						class="u-flex-1 u-field__input-wrap"
+						:value="value"
+						:password="password || this.type === 'password'"
+						:placeholder="placeholder"
+						:placeholderStyle="placeholderStyle"
+						:disabled="disabled"
+						:maxlength="inputMaxlength"
+						:focus="focus"
+						:confirmType="confirmType"
+						@focus="onFocus"
+						@blur="onBlur"
+						@input="onInput"
+						@confirm="onConfirm"
+						@tap="fieldClick"
+					/>
+				</view>
+				<u-icon :size="clearSize" v-if="clearable && value != '' && focused" name="close-circle-fill" color="#c0c4cc" class="u-clear-icon" @click="onClear"/>
+				<view class="u-button-wrap"><slot name="right" /></view>
+				<u-icon v-if="rightIcon" @click="rightIconClick" :name="rightIcon" color="#c0c4cc" :style="[rightIconStyle]" size="26" class="u-arror-right" />
+			</view>
+		</view>
+		<view v-if="errorMessage !== false && errorMessage != ''" class="u-error-message" :style="{
+			paddingLeft: labelWidth + 'rpx'
+		}">{{ errorMessage }}</view>
+	</view>
+</template>
+
+<script>
+/**
+ * field 输入框
+ * @description 借助此组件，可以实现表单的输入， 有"text"和"textarea"类型的，此外，借助uView的picker和actionSheet组件可以快速实现上拉菜单，时间，地区选择等， 为表单解决方案的利器。
+ * @tutorial https://www.uviewui.com/components/field.html
+ * @property {String} type 输入框的类型（默认text）
+ * @property {String} icon label左边的图标，限uView的图标名称
+ * @property {Object} icon-style 左边图标的样式，对象形式
+ * @property {Boolean} right-icon 输入框右边的图标名称，限uView的图标名称（默认false）
+ * @property {Boolean} required 是否必填，左边您显示红色"*"号（默认false）
+ * @property {String} label 输入框左边的文字提示
+ * @property {Boolean} password 是否密码输入方式(用点替换文字)，type为text时有效（默认false）
+ * @property {Boolean} clearable 是否显示右侧清空内容的图标控件(输入框有内容，且获得焦点时才显示)，点击可清空输入框内容（默认true）
+ * @property {Number String} label-width label的宽度，单位rpx（默认130）
+ * @property {String} label-align label的文字对齐方式（默认left）
+ * @property {Object} field-style 自定义输入框的样式，对象形式
+ * @property {Number | String} clear-size 清除图标的大小，单位rpx（默认30）
+ * @property {String} input-align 输入框内容对齐方式（默认left）
+ * @property {Boolean} border-bottom 是否显示field的下边框（默认true）
+ * @property {Boolean} border-top 是否显示field的上边框（默认false）
+ * @property {String} icon-color 左边通过icon配置的图标的颜色（默认#606266）
+ * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效（默认true）
+ * @property {String Boolean} error-message 显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
+ * @property {String} placeholder 输入框的提示文字
+ * @property {String} placeholder-style placeholder的样式(内联样式，字符串)，如"color: #ddd"
+ * @property {Boolean} focus 是否自动获得焦点（默认false）
+ * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true（默认false）
+ * @property {Boolean} disabled 是否不可输入（默认false）
+ * @property {Number String} maxlength 最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+ * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+ * @event {Function} input 输入框内容发生变化时触发
+ * @event {Function} focus 输入框获得焦点时触发
+ * @event {Function} blur 输入框失去焦点时触发
+ * @event {Function} confirm 点击完成按钮时触发
+ * @event {Function} right-icon-click 通过right-icon生成的图标被点击时触发
+ * @event {Function} click 输入框被点击或者通过right-icon生成的图标被点击时触发，这样设计是考虑到传递右边的图标，一般都为需要弹出"picker"等操作时的场景，点击倒三角图标，理应发出此事件，见上方说明
+ * @example <u-field v-model="mobile" label="手机号" required :error-message="errorMessage"></u-field>
+ */
+export default {
+	name:"u-field",
+	props: {
+		icon: String,
+		rightIcon: String,
+		// arrowDirection: {
+		// 	type: String,
+		// 	default: 'right'
+		// },
+		required: Boolean,
+		label: String,
+		password: Boolean,
+		clearable: {
+			type: Boolean,
+			default: true
+		},
+		// 左边标题的宽度单位rpx
+		labelWidth: {
+			type: [Number, String],
+			default: 130
+		},
+		// 对齐方式，left|center|right
+		labelAlign: {
+			type: String,
+			default: 'left'
+		},
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		iconColor: {
+			type: String,
+			default: '#606266'
+		},
+		autoHeight: {
+			type: Boolean,
+			default: true
+		},
+		errorMessage: {
+			type: [String, Boolean],
+			default: ''
+		},
+		placeholder: String,
+		placeholderStyle: String,
+		focus: Boolean,
+		fixed: Boolean,
+		value: [Number, String],
+		type: {
+			type: String,
+			default: 'text'
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		confirmType: {
+			type: String,
+			default: 'done'
+		},
+		// lable的位置，可选为 left-左边，top-上边
+		labelPosition: {
+			type: String,
+			default: 'left'
+		},
+		// 输入框的自定义样式
+		fieldStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 清除按钮的大小
+		clearSize: {
+			type: [Number, String],
+			default: 30
+		},
+		// lable左边的图标样式，对象形式
+		iconStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 是否显示上边框
+		borderTop: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示下边框
+		borderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否自动去除两端的空格
+		trim: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			focused: false,
+			itemIndex: 0,
+		};
+	},
+	computed: {
+		inputWrapStyle() {
+			let style = {};
+			style.textAlign = this.inputAlign;
+			// 判断lable的位置，如果是left的话，让input左边两边有间隙
+			if(this.labelPosition == 'left') {
+				style.margin = `0 8rpx`;
+			} else {
+				// 如果lable是top的，input的左边就没必要有间隙了
+				style.marginRight = `8rpx`;
+			}
+			return style;
+		},
+		rightIconStyle() {
+			let style = {};
+			if (this.arrowDirection == 'top') style.transform = 'roate(-90deg)';
+			if (this.arrowDirection == 'bottom') style.transform = 'roate(90deg)';
+			else style.transform = 'roate(0deg)';
+			return style;
+		},
+		labelStyle() {
+			let style = {};
+			if(this.labelAlign == 'left') style.justifyContent = 'flext-start';
+			if(this.labelAlign == 'center') style.justifyContent = 'center';
+			if(this.labelAlign == 'right') style.justifyContent = 'flext-end';
+			return style;
+		},
+		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
+		justifyContent() {
+			if(this.labelAlign == 'left') return 'flex-start';
+			if(this.labelAlign == 'center') return 'center';
+			if(this.labelAlign == 'right') return 'flex-end';
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength)
+		},
+		// label的位置
+		fieldInnerStyle() {
+			let style = {};
+			if(this.labelPosition == 'left') {
+				style.flexDirection = 'row';
+			} else {
+				style.flexDirection = 'column';
+			}
+			
+			return style;
+		}
+	},
+	methods: {
+		onInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if(this.trim) value = this.$u.trim(value);
+			this.$emit('input', value);
+		},
+		onFocus(event) {
+			this.focused = true;
+			this.$emit('focus', event);
+		},
+		onBlur(event) {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100)
+			this.$emit('blur', event);
+		},
+		onConfirm(e) {
+			this.$emit('confirm', e.detail.value);
+		},
+		onClear(event) {
+			this.$emit('input', '');
+		},
+		rightIconClick() {
+			this.$emit('right-icon-click');
+			this.$emit('click');
+		},
+		fieldClick() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+	
+.u-field {
+	font-size: 28rpx;
+	padding: 20rpx 28rpx;
+	text-align: left;
+	position: relative;
+	color: $u-main-color;
+}
+
+.u-field-inner {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-textarea-inner {
+	align-items: flex-start;
+}
+
+.u-textarea-class {
+	min-height: 96rpx;
+	width: auto;
+	font-size: 28rpx;
+}
+
+.fild-body {
+	@include vue-flex;
+	flex: 1;
+	align-items: center;
+}
+
+.u-arror-right {
+	margin-left: 8rpx;
+}
+
+.u-label-text {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;		
+	/* #endif */
+}
+
+.u-label-left-gap {
+	margin-left: 6rpx;
+}
+
+.u-label-postion-top {
+	flex-direction: column;
+	align-items: flex-start;
+}
+
+.u-label {
+	width: 130rpx;
+	flex: 1 1 130rpx;
+	text-align: left;
+	position: relative;
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-required::before {
+	content: '*';
+	position: absolute;
+	left: -16rpx;
+	font-size: 14px;
+	color: $u-type-error;
+	height: 9px;
+	line-height: 1;
+}
+
+.u-field__input-wrap {
+	position: relative;
+	overflow: hidden;
+	font-size: 28rpx;
+	height: 48rpx;
+	flex: 1;
+	width: auto;
+}
+
+.u-clear-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-error-message {
+	color: $u-type-error;
+	font-size: 26rpx;
+	text-align: left;
+}
+
+.placeholder-style {
+	color: rgb(150, 151, 153);
+}
+
+.u-input-class {
+	font-size: 28rpx;
+}
+
+.u-button-wrap {
+	margin-left: 8rpx;
+}
+</style>
diff --git a/uview-ui/components/u-form-item/u-form-item.vue b/uview-ui/components/u-form-item/u-form-item.vue
new file mode 100644
index 0000000..d6b8c8b
--- /dev/null
+++ b/uview-ui/components/u-form-item/u-form-item.vue
@@ -0,0 +1,431 @@
+<template>
+	<view class="u-form-item" :class="{'u-border-bottom': elBorderBottom, 'u-form-item__border-bottom--error': validateState === 'error' && showError('border-bottom')}">
+		<view class="u-form-item__body" :style="{
+			flexDirection: elLabelPosition == 'left' ? 'row' : 'column'
+		}">
+			<!-- 微信小程序中，将一个参数设置空字符串，结果会变成字符串"true" -->
+			<view class="u-form-item--left" :style="{
+				width: uLabelWidth,
+				flex: `0 0 ${uLabelWidth}`,
+				marginBottom: elLabelPosition == 'left' ? 0 : '10rpx',
+			}">
+				<!-- 为了块对齐 -->
+				<view class="u-form-item--left__content" v-if="required || leftIcon || label">
+					<!-- nvue不支持伪元素before -->
+					<text v-if="required" class="u-form-item--left__content--required">*</text>
+					<view class="u-form-item--left__content__icon" v-if="leftIcon">
+						<u-icon :name="leftIcon" :custom-style="leftIconStyle"></u-icon>
+					</view>
+					<view class="u-form-item--left__content__label" :style="[elLabelStyle, {
+						'justify-content': elLabelAlign == 'left' ? 'flex-start' : elLabelAlign == 'center' ? 'center' : 'flex-end'
+					}]">
+						{{label}}
+					</view>
+				</view>
+			</view>
+			<view class="u-form-item--right u-flex">
+				<view class="u-form-item--right__content">
+					<view class="u-form-item--right__content__slot ">
+						<slot />
+					</view>
+					<view class="u-form-item--right__content__icon u-flex" v-if="$slots.right || rightIcon">
+						<u-icon :custom-style="rightIconStyle" v-if="rightIcon" :name="rightIcon"></u-icon>
+						<slot name="right" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="u-form-item__message" v-if="validateState === 'error' && showError('message')" :style="{
+			paddingLeft: elLabelPosition == 'left' ? $u.addUnit(elLabelWidth) : '0',
+		}">{{validateMessage}}</view>
+	</view>
+</template>
+
+<script>
+	import Emitter from '../../libs/util/emitter.js';
+	import schema from '../../libs/util/async-validator';
+	// 去除警告信息
+	schema.warning = function() {};
+
+	/**
+	 * form-item 表单item
+	 * @description 此组件一般用于表单场景，可以配置Input输入框，Select弹出框，进行表单验证等。
+	 * @tutorial http://uviewui.com/components/form.html
+	 * @property {String} label 左侧提示文字
+	 * @property {Object} prop 表单域model对象的属性名，在使用 validate、resetFields 方法的情况下，该属性是必填的
+	 * @property {Boolean} border-bottom 是否显示表单域的下划线边框
+	 * @property {String} label-position 表单域提示文字的位置，left-左侧，top-上方
+	 * @property {String Number} label-width 提示文字的宽度，单位rpx（默认90）
+	 * @property {Object} label-style lable的样式，对象形式
+	 * @property {String} label-align lable的对齐方式
+	 * @property {String} right-icon 右侧自定义字体图标(限uView内置图标)或图片地址
+	 * @property {String} left-icon 左侧自定义字体图标(限uView内置图标)或图片地址
+	 * @property {Object} left-icon-style 左侧图标的样式，对象形式
+	 * @property {Object} right-icon-style 右侧图标的样式，对象形式
+	 * @property {Boolean} required 是否显示左边的"*"号，这里仅起展示作用，如需校验必填，请通过rules配置必填规则(默认false)
+	 * @example <u-form-item label="姓名"><u-input v-model="form.name" /></u-form-item>
+	 */
+
+	export default {
+		name: 'u-form-item',
+		mixins: [Emitter],
+		inject: {
+			uForm: {
+				default () {
+					return null
+				}
+			}
+		},
+		props: {
+			// input的label提示语
+			label: {
+				type: String,
+				default: ''
+			},
+			// 绑定的值
+			prop: {
+				type: String,
+				default: ''
+			},
+			// 是否显示表单域的下划线边框
+			borderBottom: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// label的位置，left-左边，top-上边
+			labelPosition: {
+				type: String,
+				default: ''
+			},
+			// label的宽度，单位rpx
+			labelWidth: {
+				type: [String, Number],
+				default: ''
+			},
+			// lable的样式，对象形式
+			labelStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// lable字体的对齐方式
+			labelAlign: {
+				type: String,
+				default: ''
+			},
+			// 右侧图标
+			rightIcon: {
+				type: String,
+				default: ''
+			},
+			// 左侧图标
+			leftIcon: {
+				type: String,
+				default: ''
+			},
+			// 左侧图标的样式
+			leftIconStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 左侧图标的样式
+			rightIconStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 是否显示左边的必填星号，只作显示用，具体校验必填的逻辑，请在rules中配置
+			required: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				initialValue: '', // 存储的默认值
+				// isRequired: false, // 是否必填，由于人性化考虑，必填"*"号通过props的required配置，不再通过rules的规则自动生成
+				validateState: '', // 是否校验成功
+				validateMessage: '', // 校验失败的提示语
+				// 有错误时的提示方式，message-提示信息，border-如果input设置了边框，变成呈红色，
+				errorType: ['message'],
+				fieldValue: '', // 获取当前子组件input的输入的值
+				// 父组件的参数，在computed计算中，无法得知this.parent发生变化，故将父组件的参数值，放到data中
+				parentData: {
+					borderBottom: true,
+					labelWidth: 90,
+					labelPosition: 'left',
+					labelStyle: {},
+					labelAlign: 'left',
+				}
+			};
+		},
+		watch: {
+			validateState(val) {
+				this.broadcastInputError();
+			},
+			// 监听u-form组件的errorType的变化
+			"uForm.errorType"(val) {
+				this.errorType = val;
+				this.broadcastInputError();
+			},
+		},
+		computed: {
+			// 计算后的label宽度，由于需要多个判断，故放到computed中
+			uLabelWidth() {
+				// 如果用户设置label为空字符串(微信小程序空字符串最终会变成字符串的'true')，意味着要将label的位置宽度设置为auto
+				return this.elLabelPosition == 'left' ? (this.label === 'true' || this.label === '' ? 'auto' : this.$u.addUnit(this
+					.elLabelWidth)) : '100%';
+			},
+			showError() {
+				return type => {
+					// 如果errorType数组中含有none，或者toast提示类型
+					if (this.errorType.indexOf('none') >= 0) return false;
+					else if (this.errorType.indexOf(type) >= 0) return true;
+					else return false;
+				}
+			},
+			// label的宽度
+			elLabelWidth() {
+				// label默认宽度为90，优先使用本组件的值，如果没有(如果设置为0，也算是配置了值，依然起效)，则用u-form的值
+				return (this.labelWidth != 0 || this.labelWidth != '') ? this.labelWidth : (this.parentData.labelWidth ? this.parentData
+					.labelWidth :
+					90);
+			},
+			// label的样式
+			elLabelStyle() {
+				return Object.keys(this.labelStyle).length ? this.labelStyle : (this.parentData.labelStyle ? 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() {
+				// 子组件的borderBottom默认为空字符串，如果不等于空字符串，意味着子组件设置了值，优先使用子组件的值
+				return this.borderBottom !== '' ? this.borderBottom : this.parentData.borderBottom ? this.parentData.borderBottom :
+					true;
+			}
+		},
+		methods: {
+			broadcastInputError() {
+				// 子组件发出事件，第三个参数为true或者false，true代表有错误
+				this.broadcast('u-input', 'on-form-item-error', this.validateState === 'error' && this.showError('border'));
+			},
+			// 判断是否需要required校验
+			setRules() {
+				let that = this;
+				// 由于人性化考虑，必填"*"号通过props的required配置，不再通过rules的规则自动生成
+				// 从父组件u-form拿到当前u-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);
+			},
+
+			// 从u-form的rules属性中，取出当前u-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规则
+			getFilteredRule(triggerType = '') {
+				let rules = this.getRules();
+				// 整体验证表单时，triggerType为空字符串，此时返回所有规则进行验证
+				if (!triggerType) return rules;
+				// 历遍判断规则是否有对应的事件，比如blur，change触发等的事件
+				// 使用indexOf判断，是因为某些时候设置的验证规则的trigger属性可能为多个，比如['blur','change']
+				// 某些场景可能的判断规则，可能不存在trigger属性，故先判断是否存在此属性
+				return rules.filter(res => res.trigger && res.trigger.indexOf(triggerType) !== -1);
+			},
+
+			// 校验数据
+			validation(trigger, callback = () => {}) {
+				// 检验之间，先获取需要校验的值
+				this.fieldValue = this.parent.model[this.prop];
+				// blur和change是否有当前方式的校验规则
+				let rules = this.getFilteredRule(trigger);
+				// 判断是否有验证规则，如果没有规则，也调用回调方法，否则父组件u-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);
+				});
+			},
+
+			// 清空当前的u-form-item
+			resetField() {
+				this.parent.model[this.prop] = this.initialValue;
+				// 设置为`success`状态，只是为了清空错误标记
+				this.validateState = 'success';
+			}
+		},
+
+		// 组件创建完成时，将当前实例保存到u-form中
+		mounted() {
+			// 支付宝、头条小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用
+			this.parent = this.$u.$parent.call(this, 'u-form');
+			if (this.parent) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map(key => {
+					this.parentData[key] = this.parent[key];
+				});
+				// 如果没有传入prop，或者uForm为空(如果u-form-input单独使用，就不会有uForm注入)，就不进行校验
+				if (this.prop) {
+					// 将本实例添加到父组件中
+					this.parent.fields.push(this);
+					this.errorType = this.parent.errorType;
+					// 设置初始值
+					this.initialValue = this.fieldValue;
+					// 添加表单校验，这里必须要写在$nextTick中，因为u-form的rules是通过ref手动传入的
+					// 不在$nextTick中的话，可能会造成执行此处代码时，父组件还没通过ref把规则给u-form，导致规则为空
+					this.$nextTick(() => {
+						this.setRules();
+					})
+				}
+			}
+		},
+
+		// 组件销毁前，将实例从u-form的缓存中移除
+		beforeDestroy() {
+			// 如果当前没有prop的话表示当前不要进行删除（因为没有注入）
+			if (this.parent && this.prop) {
+				this.parent.fields.map((item, index) => {
+					if (item === this) this.parent.fields.splice(index, 1);
+				})
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-form-item {
+		@include vue-flex;
+		// align-items: flex-start;
+		padding: 20rpx 0;
+		font-size: 28rpx;
+		color: $u-main-color;
+		box-sizing: border-box;
+		line-height: $u-form-item-height;
+		flex-direction: column;
+
+		&__border-bottom--error:after {
+			border-color: $u-type-error;
+		}
+
+		&__body {
+			@include vue-flex;
+		}
+
+		&--left {
+			@include vue-flex;
+			align-items: center;
+
+			&__content {
+				position: relative;
+				@include vue-flex;
+				align-items: center;
+				padding-right: 10rpx;
+				flex: 1;
+
+				&__icon {
+					margin-right: 8rpx;
+				}
+
+				&--required {
+					position: absolute;
+					left: -16rpx;
+					vertical-align: middle;
+					color: $u-type-error;
+					padding-top: 6rpx;
+				}
+
+				&__label {
+					@include vue-flex;
+					align-items: center;
+					flex: 1;
+				}
+			}
+		}
+
+		&--right {
+			flex: 1;
+
+			&__content {
+				@include vue-flex;
+				align-items: center;
+				flex: 1;
+
+				&__slot {
+					flex: 1;
+					/* #ifndef MP */
+					@include vue-flex;
+					align-items: center;
+					/* #endif */
+				}
+
+				&__icon {
+					margin-left: 10rpx;
+					color: $u-light-color;
+					font-size: 30rpx;
+				}
+			}
+		}
+
+		&__message {
+			font-size: 24rpx;
+			line-height: 24rpx;
+			color: $u-type-error;
+			margin-top: 12rpx;
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-form/u-form.vue b/uview-ui/components/u-form/u-form.vue
new file mode 100644
index 0000000..bdbafaf
--- /dev/null
+++ b/uview-ui/components/u-form/u-form.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="u-form"><slot /></view>
+</template>
+
+<script>
+	/**
+	 * form 表单
+	 * @description 此组件一般用于表单场景，可以配置Input输入框，Select弹出框，进行表单验证等。
+	 * @tutorial http://uviewui.com/components/form.html
+	 * @property {Object} model 表单数据对象
+	 * @property {Boolean} border-bottom 是否显示表单域的下划线边框
+	 * @property {String} label-position 表单域提示文字的位置，left-左侧，top-上方
+	 * @property {String Number} label-width 提示文字的宽度，单位rpx（默认90）
+	 * @property {Object} label-style lable的样式，对象形式
+	 * @property {String} label-align lable的对齐方式
+	 * @property {Object} rules 通过ref设置，见官网说明
+	 * @property {Array} error-type 错误的提示方式，数组形式，见上方说明(默认['message'])
+	 * @example <u-form :model="form" ref="uForm"></u-form>
+	 */
+
+export default {
+	name: 'u-form',
+	props: {
+		// 当前form的需要验证字段的集合
+		model: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 验证规则
+		// rules: {
+		// 	type: [Object, Function, Array],
+		// 	default() {
+		// 		return {};
+		// 	}
+		// },
+		// 有错误时的提示方式，message-提示信息，border-如果input设置了边框，变成呈红色，
+		// border-bottom-下边框呈现红色，none-无提示
+		errorType: {
+			type: Array,
+			default() {
+				return ['message', 'toast']
+			}
+		},
+		// 是否显示表单域的下划线边框
+		borderBottom: {
+			type: Boolean,
+			default: true
+		},
+		// label的位置，left-左边，top-上边
+		labelPosition: {
+			type: String,
+			default: 'left'
+		},
+		// label的宽度，单位rpx
+		labelWidth: {
+			type: [String, Number],
+			default: 90
+		},
+		// lable字体的对齐方式
+		labelAlign: {
+			type: String,
+			default: 'left'
+		},
+		// lable的样式，对象形式
+		labelStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+	},
+	provide() {
+		return {
+			uForm: this
+		};
+	},
+	data() {
+		return {
+			rules: {}
+		};
+	},
+	created() {
+		// 存储当前form下的所有u-form-item的实例
+		// 不能定义在data中，否则微信小程序会造成循环引用而报错
+		this.fields = [];
+	},
+	methods: {
+		setRules(rules) {
+			this.rules = rules;
+		},
+		// 清空所有u-form-item组件的内容，本质上是调用了u-form-item组件中的resetField()方法
+		resetFields() {
+			this.fields.map(field => {
+				field.resetField();
+			});
+		},
+		// 校验全部数据
+		validate(callback) {
+			return new Promise(resolve => {
+				// 对所有的u-form-item进行校验
+				let valid = true; // 默认通过
+				let count = 0; // 用于标记是否检查完毕
+				let errorArr = []; // 存放错误信息
+				this.fields.map(field => {
+					// 调用每一个u-form-item实例的validation的校验方法
+					field.validation('', error => {
+						// 如果任意一个u-form-item校验不通过，就意味着整个表单不通过
+						if (error) {
+							valid = false;
+							errorArr.push(error);
+						}
+						// 当历遍了所有的u-form-item时，调用promise的then方法
+						if (++count === this.fields.length) {
+							resolve(valid); // 进入promise的then方法
+							// 判断是否设置了toast的提示方式，只提示最前面的表单域的第一个错误信息
+							if(this.errorType.indexOf('none') === -1 && this.errorType.indexOf('toast') >= 0 && errorArr.length) {
+								this.$u.toast(errorArr[0]);
+							}
+							// 调用回调方法
+							if (typeof callback == 'function') callback(valid);
+						}
+					});
+				});
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uview-ui/components/u-full-screen/u-full-screen.vue b/uview-ui/components/u-full-screen/u-full-screen.vue
new file mode 100644
index 0000000..4f7e7d9
--- /dev/null
+++ b/uview-ui/components/u-full-screen/u-full-screen.vue
@@ -0,0 +1,52 @@
+<template>
+	<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
+		<view class="u-update-content">
+			<rich-text :nodes="content"></rich-text>
+		</view>
+	</u-modal>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				content: `
+					1. 修复badge组件的size参数无效问题<br>
+					2. 新增Modal模态框组件<br>
+					3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
+					4. 修复键盘组件在微信小程序上遮罩无效的问题
+				`,
+			}
+		},
+		onReady() {
+			this.show = true;
+		},
+		methods: {
+			cancel() {
+				this.closeModal();
+			},
+			confirm() {
+				this.closeModal();
+			},
+			closeModal() {
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-full-content {
+		background-color: #00C777;
+	}
+	
+	.u-update-content {
+		font-size: 26rpx;
+		color: $u-content-color;
+		line-height: 1.7;
+		padding: 30rpx;
+	}
+</style>
diff --git a/uview-ui/components/u-gap/u-gap.vue b/uview-ui/components/u-gap/u-gap.vue
new file mode 100644
index 0000000..6c01f94
--- /dev/null
+++ b/uview-ui/components/u-gap/u-gap.vue
@@ -0,0 +1,54 @@
+<template>
+	<view class="u-gap" :style="[gapStyle]"></view>
+</template>
+
+<script>
+/**
+ * gap 间隔槽
+ * @description 该组件一般用于内容块之间的用一个灰色块隔开的场景，方便用户风格统一，减少工作量
+ * @tutorial https://www.uviewui.com/components/gap.html
+ * @property {String} bg-color 背景颜色（默认#f3f4f6）
+ * @property {String Number} height 分割槽高度，单位rpx（默认30）
+ * @property {String Number} margin-top 与前一个组件的距离，单位rpx（默认0）
+ * @property {String Number} margin-bottom 与后一个组件的距离，单位rpx（0）
+ * @example <u-gap height="80" bg-color="#bbb"></u-gap>
+ */
+export default {
+	name: "u-gap",
+	props: {
+		bgColor: {
+			type: String,
+			default: 'transparent ' // 背景透明
+		},
+		// 高度
+		height: {
+			type: [String, Number],
+			default: 30
+		},
+		// 与上一个组件的距离
+		marginTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 与下一个组件的距离
+		marginBottom: {
+			type: [String, Number],
+			default: 0
+		},
+	},
+	computed: {
+		gapStyle() {
+			return {
+				backgroundColor: this.bgColor,
+				height: this.height + 'rpx',
+				marginTop: this.marginTop + 'rpx',
+				marginBottom: this.marginBottom + 'rpx'
+			};
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+</style>
diff --git a/uview-ui/components/u-grid-item/u-grid-item.vue b/uview-ui/components/u-grid-item/u-grid-item.vue
new file mode 100644
index 0000000..0773307
--- /dev/null
+++ b/uview-ui/components/u-grid-item/u-grid-item.vue
@@ -0,0 +1,126 @@
+<template>
+	<view class="u-grid-item" :hover-class="parentData.hoverClass"
+	 :hover-stay-time="200" @tap="click" :style="{
+			background: bgColor,
+			width: width,
+		}">
+		<view class="u-grid-item-box" :style="[customStyle]" :class="[parentData.border ? 'u-border-right u-border-bottom' : '']">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * gridItem 提示
+	 * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。搭配u-grid使用
+	 * @tutorial https://www.uviewui.com/components/grid.html
+	 * @property {String} bg-color 宫格的背景颜色（默认#ffffff）
+	 * @property {String Number} index 点击宫格时，返回的值
+	 * @property {Object} custom-style 自定义样式，对象形式
+	 * @event {Function} click 点击宫格触发
+	 * @example <u-grid-item></u-grid-item>
+	 */
+	export default {
+		name: "u-grid-item",
+		props: {
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 点击时返回的index
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 自定义样式，对象形式
+			customStyle: {
+				type: Object,
+				default() {
+					return {
+						padding: '30rpx 0'
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				parentData: {
+					hoverClass: '', // 按下去的时候，是否显示背景灰色
+					col: 3, // 父组件划分的宫格数
+					border: true, // 是否显示边框，根据父组件决定
+				}
+			};
+		},
+		created() {
+			// 父组件的实例
+			this.updateParentData();
+			// this.parent在updateParentData()中定义
+			this.parent.children.push(this);
+		},
+		computed: {
+			// 每个grid-item的宽度
+			width() {
+				return 100 / Number(this.parentData.col) + '%';
+			},
+		},
+		methods: {
+			// 获取父组件的参数
+			updateParentData() {
+				// 此方法写在mixin中
+				this.getParentData('u-grid');
+			},
+			click() {
+				this.$emit('click', this.index);
+				this.parent && this.parent.click(this.index);
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-grid-item {
+		box-sizing: border-box;
+		background: #fff;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		flex-direction: column;
+		
+		/* #ifdef MP */
+		position: relative;
+		float: left;
+		/* #endif */
+	}
+
+	.u-grid-item-hover {
+		background: #f7f7f7 !important;
+	}
+
+	.u-grid-marker-box {
+		position: absolute;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;		
+		/* #endif */
+		line-height: 0;
+	}
+
+	.u-grid-marker-wrap {
+		position: absolute;
+	}
+
+	.u-grid-item-box {
+		padding: 30rpx 0;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex: 1;
+		width: 100%;
+		height: 100%;
+	}
+</style>
diff --git a/uview-ui/components/u-grid/u-grid.vue b/uview-ui/components/u-grid/u-grid.vue
new file mode 100644
index 0000000..6588c06
--- /dev/null
+++ b/uview-ui/components/u-grid/u-grid.vue
@@ -0,0 +1,108 @@
+<template>
+	<view class="u-grid" :class="{'u-border-top u-border-left': border}" :style="[gridStyle]"><slot /></view>
+</template>
+
+<script>
+/**
+ * grid 宫格布局
+ * @description 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式。
+ * @tutorial https://www.uviewui.com/components/grid.html
+ * @property {String Number} col 宫格的列数（默认3）
+ * @property {Boolean} border 是否显示宫格的边框（默认true）
+ * @property {Boolean} hover-class 点击宫格的时候，是否显示按下的灰色背景（默认false）
+ * @event {Function} click 点击宫格触发
+ * @example <u-grid :col="3" @click="click"></u-grid>
+ */
+export default {
+	name: 'u-grid',
+	props: {
+		// 分成几列
+		col: {
+			type: [Number, String],
+			default: 3
+		},
+		// 是否显示边框
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右
+		align: {
+			type: String,
+			default: 'left'
+		},
+		// 宫格按压时的样式类，"none"为无效果
+		hoverClass: {
+			type: String,
+			default: 'u-hover-class'
+		}
+	},
+	data() {
+		return {
+			index: 0,
+		}
+	},
+	watch: {
+		// 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
+		parentData() {
+			if(this.children.length) {
+				this.children.map(child => {
+					// 判断子组件(u-radio)如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
+					typeof(child.updateParentData) == 'function' && child.updateParentData();
+				})
+			}
+		},
+	},
+	created() {
+		// 如果将children定义在data中，在微信小程序会造成循环引用而报错
+		this.children = [];
+	},
+	computed: {
+		// 计算父组件的值是否发生变化
+		parentData() {
+			return [this.hoverClass, this.col, this.size, this.border];
+		},
+		// 宫格对齐方式
+		gridStyle() {
+			let style = {};
+			switch(this.align) {
+				case 'left':
+					style.justifyContent = 'flex-start';
+					break;
+				case 'center':
+					style.justifyContent = 'center';
+					break;
+				case 'right':
+					style.justifyContent = 'flex-end';
+					break;
+				default: style.justifyContent = 'flex-start';
+			};
+			return style;
+		}
+	},
+	methods: {
+		click(index) {
+			this.$emit('click', index);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-grid {
+	width: 100%;
+	/* #ifdef MP */
+	position: relative;
+	box-sizing: border-box;
+	overflow: hidden;
+	/* #endif */
+	
+	/* #ifndef MP */
+	@include vue-flex;
+	flex-wrap: wrap;
+	align-items: center;
+	/* #endif */
+}
+</style>
diff --git a/uview-ui/components/u-icon/u-icon.vue b/uview-ui/components/u-icon/u-icon.vue
new file mode 100644
index 0000000..db1b019
--- /dev/null
+++ b/uview-ui/components/u-icon/u-icon.vue
@@ -0,0 +1,336 @@
+<template>
+	<view :style="[customStyle]" class="u-icon" @tap="click" :class="['u-icon--' + labelPos]">
+		<image class="u-icon__img" v-if="isImg" :src="name" :mode="imgMode" :style="[imgStyle]"></image>
+		<text v-else class="u-icon__icon" :class="customClass" :style="[iconStyle]" :hover-class="hoverClass"
+			  @touchstart="touchstart">
+			<text v-if="showDecimalIcon" :style="[decimalIconStyle]" :class="decimalIconClass" :hover-class="hoverClass"
+				  class="u-icon__decimal">
+			</text>
+		</text>
+		<!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示 -->
+		<text v-if="label !== ''" class="u-icon__label" :style="{
+			color: labelColor,
+			fontSize: $u.addUnit(labelSize),
+			marginLeft: labelPos == 'right' ? $u.addUnit(marginLeft) : 0,
+			marginTop: labelPos == 'bottom' ? $u.addUnit(marginTop) : 0,
+			marginRight: labelPos == 'left' ? $u.addUnit(marginRight) : 0,
+			marginBottom: labelPos == 'top' ? $u.addUnit(marginBottom) : 0,
+		}">{{ label }}
+		</text>
+	</view>
+</template>
+
+<script>
+/**
+ * icon 图标
+ * @description 基于字体的图标集，包含了大多数常见场景的图标。
+ * @tutorial https://www.uviewui.com/components/icon.html
+ * @property {String} name 图标名称，见示例图标集
+ * @property {String} color 图标颜色（默认inherit）
+ * @property {String | Number} size 图标字体大小，单位rpx（默认32）
+ * @property {String | Number} label-size label字体大小，单位rpx（默认28）
+ * @property {String} label 图标右侧的label文字（默认28）
+ * @property {String} label-pos label文字相对于图标的位置，只能right或bottom（默认right）
+ * @property {String} label-color label字体颜色（默认#606266）
+ * @property {Object} custom-style icon的样式，对象形式
+ * @property {String} custom-prefix 自定义字体图标库时，需要写上此值
+ * @property {String | Number} margin-left label在右侧时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-top label在下方时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-bottom label在上方时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-right label在左侧时与图标的距离，单位rpx（默认6）
+ * @property {String} label-pos label相对于图标的位置，只能right或bottom（默认right）
+ * @property {String} index 一个用于区分多个图标的值，点击图标时通过click事件传出
+ * @property {String} hover-class 图标按下去的样式类，用法同uni的view组件的hover-class参数，详情见官网
+ * @property {String} width 显示图片小图标时的宽度
+ * @property {String} height 显示图片小图标时的高度
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {Boolean} show-decimal-icon 是否为DecimalIcon
+ * @property {String} inactive-color 背景颜色，可接受主题色，仅Decimal时有效
+ * @property {String | Number} percent 显示的百分比，仅Decimal时有效
+ * @event {Function} click 点击图标时触发
+ * @example <u-icon name="photo" color="#2979ff" size="28"></u-icon>
+ */
+export default {
+	name: 'u-icon',
+	props: {
+		// 图标类名
+		name: {
+			type: String,
+			default: ''
+		},
+		// 图标颜色，可接受主题色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 字体大小，单位rpx
+		size: {
+			type: [Number, String],
+			default: 'inherit'
+		},
+		// 是否显示粗体
+		bold: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图标的时候传递事件出去的index（用于区分点击了哪一个）
+		index: {
+			type: [Number, String],
+			default: ''
+		},
+		// 触摸图标时的类名
+		hoverClass: {
+			type: String,
+			default: ''
+		},
+		// 自定义扩展前缀，方便用户扩展自己的图标库
+		customPrefix: {
+			type: String,
+			default: 'uicon'
+		},
+		// 图标右边或者下面的文字
+		label: {
+			type: [String, Number],
+			default: ''
+		},
+		// label的位置，只能右边或者下边
+		labelPos: {
+			type: String,
+			default: 'right'
+		},
+		// label的大小
+		labelSize: {
+			type: [String, Number],
+			default: '28'
+		},
+		// label的颜色
+		labelColor: {
+			type: String,
+			default: '#606266'
+		},
+		// label与图标的距离(横向排列)
+		marginLeft: {
+			type: [String, Number],
+			default: '6'
+		},
+		// label与图标的距离(竖向排列)
+		marginTop: {
+			type: [String, Number],
+			default: '6'
+		},
+		// label与图标的距离(竖向排列)
+		marginRight: {
+			type: [String, Number],
+			default: '6'
+		},
+		// label与图标的距离(竖向排列)
+		marginBottom: {
+			type: [String, Number],
+			default: '6'
+		},
+		// 图片的mode
+		imgMode: {
+			type: String,
+			default: 'widthFix'
+		},
+		// 自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 用于显示图片小图标时，图片的宽度
+		width: {
+			type: [String, Number],
+			default: ''
+		},
+		// 用于显示图片小图标时，图片的高度
+		height: {
+			type: [String, Number],
+			default: ''
+		},
+		// 用于解决某些情况下，让图标垂直居中的用途
+		top: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否为DecimalIcon
+		showDecimalIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 背景颜色，可接受主题色，仅Decimal时有效
+		inactiveColor: {
+			type: String,
+			default: '#ececec'
+		},
+		// 显示的百分比，仅Decimal时有效
+		percent: {
+			type: [Number, String],
+			default: '50'
+		}
+	},
+	computed: {
+		customClass() {
+			let classes = []
+			classes.push(this.customPrefix + '-' + this.name)
+			// uView的自定义图标类名为u-iconfont
+			if (this.customPrefix == 'uicon') {
+				classes.push('u-iconfont')
+			} else {
+				classes.push(this.customPrefix)
+			}
+			// 主题色，通过类配置
+			if (this.showDecimalIcon && this.inactiveColor && this.$u.config.type.includes(this.inactiveColor)) {
+				classes.push('u-icon__icon--' + this.inactiveColor)
+			} else if (this.color && this.$u.config.type.includes(this.color)) classes.push('u-icon__icon--' + this.color)
+			// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
+			// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
+			//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
+			classes = classes.join(' ')
+			//#endif
+			return classes
+		},
+		iconStyle() {
+			let style = {}
+			style = {
+				fontSize: this.size == 'inherit' ? 'inherit' : this.$u.addUnit(this.size),
+				fontWeight: this.bold ? 'bold' : 'normal',
+				// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+				top: this.$u.addUnit(this.top)
+			}
+			// 非主题色值时，才当作颜色值
+			if (this.showDecimalIcon && this.inactiveColor && !this.$u.config.type.includes(this.inactiveColor)) {
+				style.color = this.inactiveColor
+			} else if (this.color && !this.$u.config.type.includes(this.color)) style.color = this.color
+
+			return style
+		},
+		// 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
+		isImg() {
+			return this.name.indexOf('/') !== -1
+		},
+		imgStyle() {
+			let style = {}
+			// 如果设置width和height属性，则优先使用，否则使用size属性
+			style.width = this.width ? this.$u.addUnit(this.width) : this.$u.addUnit(this.size)
+			style.height = this.height ? this.$u.addUnit(this.height) : this.$u.addUnit(this.size)
+			return style
+		},
+		decimalIconStyle() {
+			let style = {}
+			style = {
+				fontSize: this.size == 'inherit' ? 'inherit' : this.$u.addUnit(this.size),
+				fontWeight: this.bold ? 'bold' : 'normal',
+				// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+				top: this.$u.addUnit(this.top),
+				width: this.percent + '%'
+			}
+			// 非主题色值时，才当作颜色值
+			if (this.color && !this.$u.config.type.includes(this.color)) style.color = this.color
+			return style
+		},
+		decimalIconClass() {
+			let classes = []
+			classes.push(this.customPrefix + '-' + this.name)
+			// uView的自定义图标类名为u-iconfont
+			if (this.customPrefix == 'uicon') {
+				classes.push('u-iconfont')
+			} else {
+				classes.push(this.customPrefix)
+			}
+			// 主题色，通过类配置
+			if (this.color && this.$u.config.type.includes(this.color)) classes.push('u-icon__icon--' + this.color)
+			else classes.push('u-icon__icon--primary')
+			// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
+			// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
+			//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
+			classes = classes.join(' ')
+			//#endif
+			return classes
+		}
+	},
+	methods: {
+		click() {
+			this.$emit('click', this.index)
+		},
+		touchstart() {
+			this.$emit('touchstart', this.index)
+		}
+	}
+}
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+@import '../../iconfont.css';
+
+.u-icon {
+	display: inline-flex;
+	align-items: center;
+
+	&--left {
+		flex-direction: row-reverse;
+		align-items: center;
+	}
+
+	&--right {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	&--top {
+		flex-direction: column-reverse;
+		justify-content: center;
+	}
+
+	&--bottom {
+		flex-direction: column;
+		justify-content: center;
+	}
+
+	&__icon {
+		position: relative;
+
+		&--primary {
+			color: $u-type-primary;
+		}
+
+		&--success {
+			color: $u-type-success;
+		}
+
+		&--error {
+			color: $u-type-error;
+		}
+
+		&--warning {
+			color: $u-type-warning;
+		}
+
+		&--info {
+			color: $u-type-info;
+		}
+	}
+
+	&__decimal {
+		position: absolute;
+		top: 0;
+		left: 0;
+		display: inline-block;
+		overflow: hidden;
+	}
+
+	&__img {
+		height: auto;
+		will-change: transform;
+	}
+
+	&__label {
+		line-height: 1;
+	}
+}
+</style>
diff --git a/uview-ui/components/u-image/u-image.vue b/uview-ui/components/u-image/u-image.vue
new file mode 100644
index 0000000..c729c3c
--- /dev/null
+++ b/uview-ui/components/u-image/u-image.vue
@@ -0,0 +1,267 @@
+<template>
+	<view class="u-image" @tap="onClick" :style="[wrapStyle, backgroundStyle]">
+		<image
+			v-if="!isError"
+			:src="src"
+			:mode="mode"
+			@error="onErrorHandler"
+			@load="onLoadHandler"
+			:lazy-load="lazyLoad"
+			class="u-image__image"
+			:show-menu-by-longpress="showMenuByLongpress"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
+			}"
+		></image>
+		<view
+			v-if="showLoading && loading"
+			class="u-image__loading"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius),
+				backgroundColor: this.bgColor
+			}"
+		>
+			<slot v-if="$slots.loading" name="loading" />
+			<u-icon v-else :name="loadingIcon" :width="width" :height="height"></u-icon>
+		</view>
+		<view
+			v-if="showError && isError && !loading"
+			class="u-image__error"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
+			}"
+		>
+			<slot v-if="$slots.error" name="error" />
+			<u-icon v-else :name="errorIcon" :width="width" :height="height"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * Image 图片
+ * @description 此组件为uni-app的image组件的加强版，在继承了原有功能外，还支持淡入动画、加载中、加载失败提示、圆角值和形状等。
+ * @tutorial https://uviewui.com/components/image.html
+ * @property {String} src 图片地址
+ * @property {String} mode 裁剪模式，见官网说明
+ * @property {String | Number} width 宽度，单位任意，如果为数值，则为rpx单位（默认100%）
+ * @property {String | Number} height 高度，单位任意，如果为数值，则为rpx单位（默认 auto）
+ * @property {String} shape 图片形状，circle-圆形，square-方形（默认square）
+ * @property {String | Number} border-radius 圆角值，单位任意，如果为数值，则为rpx单位（默认 0）
+ * @property {Boolean} lazy-load 是否懒加载，仅微信小程序、App、百度小程序、字节跳动小程序有效（默认 true）
+ * @property {Boolean} show-menu-by-longpress 是否开启长按图片显示识别小程序码菜单，仅微信小程序有效（默认 false）
+ * @property {String} loading-icon 加载中的图标，或者小图片（默认 photo）
+ * @property {String} error-icon 加载失败的图标，或者小图片（默认 error-circle）
+ * @property {Boolean} show-loading 是否显示加载中的图标或者自定义的slot（默认 true）
+ * @property {Boolean} show-error 是否显示加载错误的图标或者自定义的slot（默认 true）
+ * @property {Boolean} fade 是否需要淡入效果（默认 true）
+ * @property {String Number} width 传入图片路径时图片的宽度
+ * @property {String Number} height 传入图片路径时图片的高度
+ * @property {Boolean} webp 只支持网络资源，只对微信小程序有效（默认 false）
+ * @property {String | Number} duration 搭配fade参数的过渡时间，单位ms（默认 500）
+ * @event {Function} click 点击图片时触发
+ * @event {Function} error 图片加载失败时触发
+ * @event {Function} load 图片加载成功时触发
+ * @example <u-image width="100%" height="300rpx" :src="src"></u-image>
+ */
+export default {
+	name: 'u-image',
+	props: {
+		// 图片地址
+		src: {
+			type: String,
+			default: ''
+		},
+		// 裁剪模式
+		mode: {
+			type: String,
+			default: 'aspectFill'
+		},
+		// 宽度，单位任意
+		width: {
+			type: [String, Number],
+			default: '100%'
+		},
+		// 高度，单位任意
+		height: {
+			type: [String, Number],
+			default: 'auto'
+		},
+		// 图片形状，circle-圆形，square-方形
+		shape: {
+			type: String,
+			default: 'square'
+		},
+		// 圆角，单位任意
+		borderRadius: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否懒加载，微信小程序、App、百度小程序、字节跳动小程序
+		lazyLoad: {
+			type: Boolean,
+			default: true
+		},
+		// 开启长按图片显示识别微信小程序码菜单
+		showMenuByLongpress: {
+			type: Boolean,
+			default: true
+		},
+		// 加载中的图标，或者小图片
+		loadingIcon: {
+			type: String,
+			default: 'photo'
+		},
+		// 加载失败的图标，或者小图片
+		errorIcon: {
+			type: String,
+			default: 'error-circle'
+		},
+		// 是否显示加载中的图标或者自定义的slot
+		showLoading: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示加载错误的图标或者自定义的slot
+		showError: {
+			type: Boolean,
+			default: true
+		},
+		// 是否需要淡入效果
+		fade: {
+			type: Boolean,
+			default: true
+		},
+		// 只支持网络资源，只对微信小程序有效
+		webp: {
+			type: Boolean,
+			default: false
+		},
+		// 过渡时间，单位ms
+		duration: {
+			type: [String, Number],
+			default: 500
+		},
+		// 背景颜色，用于深色页面加载图片时，为了和背景色融合
+		bgColor: {
+			type: String,
+			default: '#f3f4f6'
+		}
+	},
+	data() {
+		return {
+			// 图片是否加载错误，如果是，则显示错误占位图
+			isError: false,
+			// 初始化组件时，默认为加载中状态
+			loading: true,
+			// 不透明度，为了实现淡入淡出的效果
+			opacity: 1,
+			// 过渡时间，因为props的值无法修改，故需要一个中间值
+			durationTime: this.duration,
+			// 图片加载完成时，去掉背景颜色，因为如果是png图片，就会显示灰色的背景
+			backgroundStyle: {}
+		};
+	},
+	watch: {
+		src: {
+			immediate: true,
+			handler (n) {
+				if(!n) {
+					// 如果传入null或者''，或者false，或者undefined，标记为错误状态
+					this.isError = true;
+					this.loading = false;
+				} else {
+					this.isError = false;
+				}
+			}
+		}
+	},
+	computed: {
+		wrapStyle() {
+			let style = {};
+			// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
+			style.width = this.$u.addUnit(this.width);
+			style.height = this.$u.addUnit(this.height);
+			// 如果是配置了圆形，设置50%的圆角，否则按照默认的配置值
+			style.borderRadius = this.shape == 'circle' ? '50%' : this.$u.addUnit(this.borderRadius);
+			// 如果设置圆角，必须要有hidden，否则可能圆角无效
+			style.overflow = this.borderRadius > 0 ? 'hidden' : 'visible';
+			if (this.fade) {
+				style.opacity = this.opacity;
+				style.transition = `opacity ${Number(this.durationTime) / 1000}s ease-in-out`;
+			}
+			return style;
+		}
+	},
+	methods: {
+		// 点击图片
+		onClick() {
+			this.$emit('click');
+		},
+		// 图片加载失败
+		onErrorHandler(err) {
+			this.loading = false;
+			this.isError = true;
+			this.$emit('error', err);
+		},
+		// 图片加载完成，标记loading结束
+		onLoadHandler() {
+			this.loading = false;
+			this.isError = false;
+			this.$emit('load');
+			// 如果不需要动画效果，就不执行下方代码，同时移除加载时的背景颜色
+			// 否则无需fade效果时，png图片依然能看到下方的背景色
+			if (!this.fade) return this.removeBgColor();
+			// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的灰色)，再改成1，是为了获得过渡效果
+			this.opacity = 0;
+			// 这里设置为0，是为了图片展示到背景全透明这个过程时间为0，延时之后延时之后重新设置为duration，是为了获得背景透明(灰色)
+			// 到图片展示的过程中的淡入效果
+			this.durationTime = 0;
+			// 延时50ms，否则在浏览器H5，过渡效果无效
+			setTimeout(() => {
+				this.durationTime = this.duration;
+				this.opacity = 1;
+				setTimeout(() => {
+					this.removeBgColor();
+				}, this.durationTime);
+			}, 50);
+		},
+		// 移除图片的背景色
+		removeBgColor() {
+			// 淡入动画过渡完成后，将背景设置为透明色，否则png图片会看到灰色的背景
+			this.backgroundStyle = {
+				backgroundColor: 'transparent'
+			};
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../libs/css/style.components.scss';
+
+.u-image {
+	position: relative;
+	transition: opacity 0.5s ease-in-out;
+
+	&__image {
+		width: 100%;
+		height: 100%;
+	}
+
+	&__loading,
+	&__error {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		background-color: $u-bg-color;
+		color: $u-tips-color;
+		font-size: 46rpx;
+	}
+}
+</style>
diff --git a/uview-ui/components/u-index-anchor/u-index-anchor.vue b/uview-ui/components/u-index-anchor/u-index-anchor.vue
new file mode 100644
index 0000000..5038827
--- /dev/null
+++ b/uview-ui/components/u-index-anchor/u-index-anchor.vue
@@ -0,0 +1,89 @@
+<template>
+	<!-- 支付宝小程序使用$u.getRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
+	<view>
+		<view class="u-index-anchor-wrapper" :id="$u.guid()" :style="[wrapperStyle]">
+			<view class="u-index-anchor " :class="[active ? 'u-index-anchor--active' : '']" :style="[customAnchorStyle]">
+				<slot v-if="useSlot" />
+				<block v-else>
+					<text>{{ index }}</text>
+				</block>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * indexAnchor 索引列表锚点
+	 * @description 通过折叠面板收纳内容区域,搭配<u-index-anchor>使用
+	 * @tutorial https://www.uviewui.com/components/indexList.html#indexanchor-props
+	 * @property {Boolean} use-slot 是否使用自定义内容的插槽（默认false）
+	 * @property {String Number} index 索引字符，如果定义了use-slot，此参数自动失效
+	 * @property {Object} custStyle 自定义样式，对象形式，如"{color: 'red'}"
+	 * @event {Function} default 锚点位置显示内容，默认为索引字符
+	 * @example <u-index-anchor :index="item" />
+	 */
+	export default {
+		name: "u-index-anchor",
+		props: {
+			useSlot: {
+				type: Boolean,
+				default: false
+			},
+			index: {
+				type: String,
+				default: ''
+			},
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				active: false,
+				wrapperStyle: {},
+				anchorStyle: {}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-index-list');
+			if(this.parent) {
+				this.parent.children.push(this);
+				this.parent.updateData();
+			}
+		},
+		computed: {
+			customAnchorStyle() {
+				return Object.assign(this.anchorStyle, this.customStyle);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-index-anchor {
+		box-sizing: border-box;
+		padding: 14rpx 24rpx;
+		color: #606266;
+		width: 100%;
+		font-weight: 500;
+		font-size: 28rpx;
+		line-height: 1.2;
+		background-color: rgb(245, 245, 245);
+	}
+
+	.u-index-anchor--active {
+		right: 0;
+		left: 0;
+		color: #2979ff;
+		background-color: #fff;
+	}
+</style>
diff --git a/uview-ui/components/u-index-list/u-index-list.vue b/uview-ui/components/u-index-list/u-index-list.vue
new file mode 100644
index 0000000..30fcda0
--- /dev/null
+++ b/uview-ui/components/u-index-list/u-index-list.vue
@@ -0,0 +1,315 @@
+<template>
+	<!-- 支付宝小程序使用$u.getRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
+	<view>
+		<view class="u-index-bar">
+			<slot />
+			<view v-if="showSidebar" class="u-index-bar__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="u-index-bar__index" :style="{zIndex: zIndex + 1, color: activeAnchorIndex === index ? activeColor : ''}"
+				 :data-index="index">
+					{{ item }}
+				</view>
+			</view>
+			<view class="u-indexed-list-alert" v-if="touchmove && indexList[touchmoveIndex]" :style="{
+				zIndex: alertZIndex
+			}">
+				<text>{{indexList[touchmoveIndex]}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	var indexList = function() {
+		var indexList = [];
+		var charCodeOfA = 'A'.charCodeAt(0);
+		for (var i = 0; i < 26; i++) {
+			indexList.push(String.fromCharCode(charCodeOfA + i));
+		}
+		return indexList;
+	};
+
+	/**
+	 * indexList 索引列表
+	 * @description 通过折叠面板收纳内容区域,搭配<u-index-anchor>使用
+	 * @tutorial https://www.uviewui.com/components/indexList.html#indexanchor-props
+	 * @property {Number String} scroll-top 当前滚动高度，自定义组件无法获得滚动条事件，所以依赖接入方传入
+	 * @property {Array} index-list 索引字符列表，数组（默认A-Z）
+	 * @property {Number String} z-index 锚点吸顶时的层级（默认965）
+	 * @property {Boolean} sticky 是否开启锚点自动吸顶（默认true）
+	 * @property {Number String} offset-top 锚点自动吸顶时与顶部的距离（默认0）
+	 * @property {String} highlight-color 锚点和右边索引字符高亮颜色（默认#2979ff）
+	 * @event {Function} select 选中右边索引字符时触发
+	 * @example <u-index-list :scrollTop="scrollTop"></u-index-list>
+	 */
+	export default {
+		name: "u-index-list",
+		props: {
+			sticky: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			scrollTop: {
+				type: [Number, String],
+				default: 0,
+			},
+			offsetTop: {
+				type: [Number, String],
+				default: 0
+			},
+			indexList: {
+				type: Array,
+				default () {
+					return indexList()
+				}
+			},
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			}
+		},
+		created() {
+			// #ifdef H5
+			this.stickyOffsetTop = this.offsetTop ? uni.upx2px(this.offsetTop) : 44;
+			// #endif
+			// #ifndef H5
+			this.stickyOffsetTop = this.offsetTop ? uni.upx2px(this.offsetTop) : 0;
+			// #endif
+			// 只能在created生命周期定义children，如果在data定义，会因为循环引用而报错
+			this.children = [];
+		},
+		data() {
+			return {
+				activeAnchorIndex: 0,
+				showSidebar: true,
+				// children: [],
+				touchmove: false,
+				touchmoveIndex: 0,
+			}
+		},
+		watch: {
+			scrollTop() {
+				this.updateData()
+			}
+		},
+		computed: {
+			// 弹出toast的z-index值
+			alertZIndex() {
+				return this.$u.zIndex.toast;
+			}
+		},
+		methods: {
+			updateData() {
+				this.timer && clearTimeout(this.timer);
+				this.timer = setTimeout(() => {
+					this.showSidebar = !!this.children.length;
+					this.setRect().then(() => {
+						this.onScroll();
+					});
+				}, 0);
+			},
+			setRect() {
+				return Promise.all([
+					this.setAnchorsRect(),
+					this.setListRect(),
+					this.setSiderbarRect()
+				]);
+			},
+			setAnchorsRect() {
+				return Promise.all(this.children.map((anchor, index) => anchor
+					.$uGetRect('.u-index-anchor-wrapper')
+					.then((rect) => {
+						Object.assign(anchor, {
+							height: rect.height,
+							top: rect.top
+						});
+					})));
+			},
+			setListRect() {
+				return this.$uGetRect('.u-index-bar').then((rect) => {
+					Object.assign(this, {
+						height: rect.height,
+						top: rect.top + this.scrollTop
+					});
+				});
+			},
+			setSiderbarRect() {
+				return this.$uGetRect('.u-index-bar__sidebar').then(rect => {
+					this.sidebar = {
+						height: rect.height,
+						top: rect.top
+					};
+				});
+			},
+			getActiveAnchorIndex() {
+				const {
+					children
+				} = this;
+				const {
+					sticky
+				} = this;
+				for (let i = this.children.length - 1; i >= 0; i--) {
+					const preAnchorHeight = i > 0 ? children[i - 1].height : 0;
+					const reachTop = sticky ? preAnchorHeight : 0;
+					if (reachTop >= children[i].top) {
+						return i;
+					}
+				}
+				return -1;
+			},
+			onScroll() {
+				const {
+					children = []
+				} = this;
+				if (!children.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 =
+							children[active].top <= 0;
+					}
+					children.forEach((item, index) => {
+						if (index === active) {
+							let wrapperStyle = '';
+							let anchorStyle = {
+								color: `${activeColor}`
+							};
+							if (isActiveAnchorSticky) {
+								wrapperStyle = {
+									height: `${children[index].height}px`
+								};
+								anchorStyle = {
+									position: 'fixed',
+									top: `${stickyOffsetTop}px`,
+									zIndex: `${zIndex ? zIndex : this.$u.zIndex.indexListSticky}`,
+									color: `${activeColor}`
+								};
+							}
+							item.active = active;
+							item.wrapperStyle = wrapperStyle;
+							item.anchorStyle = anchorStyle;
+						} else if (index === active - 1) {
+							const currentAnchor = children[index];
+							const currentOffsetTop = currentAnchor.top;
+							const targetOffsetTop = index === children.length - 1 ?
+								this.top :
+								children[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.$u.zIndex.indexListSticky}`,
+								color: `${activeColor}`
+							};
+							item.active = active;
+							item.anchorStyle = anchorStyle;
+						} else {
+							item.active = false;
+							item.anchorStyle = '';
+							item.wrapperStyle = '';
+						}
+					});
+				}
+			},
+			onTouchMove(event) {
+				this.touchmove = true;
+				const sidebarLength = this.children.length;
+				const touch = event.touches[0];
+				const itemHeight = this.sidebar.height / sidebarLength;
+				let clientY = 0;
+				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;
+			},
+			scrollToAnchor(index) {
+				if (this.scrollToAnchorIndex === index) {
+					return;
+				}
+				this.scrollToAnchorIndex = index;
+				const anchor = this.children.find((item) => item.index === this.indexList[index]);
+				if (anchor) {
+					this.$emit('select', anchor.index);
+					uni.pageScrollTo({
+						duration: 0,
+						scrollTop: anchor.top + this.scrollTop
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-index-bar {
+		position: relative
+	}
+
+	.u-index-bar__sidebar {
+		position: fixed;
+		top: 50%;
+		right: 0;
+		@include vue-flex;
+		flex-direction: column;
+		text-align: center;
+		transform: translateY(-50%);
+		user-select: none;
+		z-index: 99;
+	}
+
+	.u-index-bar__index {
+		font-weight: 500;
+		padding: 8rpx 18rpx;
+		font-size: 22rpx;
+		line-height: 1
+	}
+
+	.u-indexed-list-alert {
+		position: fixed;
+		width: 120rpx;
+		height: 120rpx;
+		right: 90rpx;
+		top: 50%;
+		margin-top: -60rpx;
+		border-radius: 24rpx;
+		font-size: 50rpx;
+		color: #fff;
+		background-color: rgba(0, 0, 0, 0.65);
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0;
+		z-index: 9999999;
+	}
+
+	.u-indexed-list-alert text {
+		line-height: 50rpx;
+	}
+</style>
diff --git a/uview-ui/components/u-input/u-input.vue b/uview-ui/components/u-input/u-input.vue
new file mode 100644
index 0000000..60e6d7a
--- /dev/null
+++ b/uview-ui/components/u-input/u-input.vue
@@ -0,0 +1,394 @@
+<template>
+	<view
+		class="u-input"
+		:class="{
+			'u-input--border': border,
+			'u-input--error': validateState
+		}"
+		:style="{
+			padding: `0 ${border ? 20 : 0}rpx`,
+			borderColor: borderColor,
+			textAlign: inputAlign
+		}"
+		@tap.stop="inputClick"
+	>
+		<textarea
+			v-if="type == 'textarea'"
+			class="u-input__input u-input__textarea"
+			:style="[getStyle]"
+			:value="defaultValue"
+			:placeholder="placeholder"
+			:placeholderStyle="placeholderStyle"
+			:disabled="disabled"
+			:maxlength="inputMaxlength"
+			:fixed="fixed"
+			:focus="focus"
+			:autoHeight="autoHeight"
+			:selection-end="uSelectionEnd"
+			:selection-start="uSelectionStart"
+			:cursor-spacing="getCursorSpacing"
+			:show-confirm-bar="showConfirmbar"
+			:readonly="readonly"
+			@input="handleInput"
+			@blur="handleBlur"
+			@focus="onFocus"
+			@confirm="onConfirm"
+		/>
+		<input
+			v-else
+			class="u-input__input"
+			:type="type == 'password' ? 'text' : type"
+			:style="[getStyle]"
+			:value="defaultValue"
+			:password="type == 'password' && !showPassword"
+			:placeholder="placeholder"
+			:placeholderStyle="placeholderStyle"
+			:disabled="disabled || type === 'select'"
+			:maxlength="inputMaxlength"
+			:focus="focus"
+			:confirmType="confirmType"
+			:cursor-spacing="getCursorSpacing"
+			:selection-end="uSelectionEnd"
+			:selection-start="uSelectionStart"
+			:show-confirm-bar="showConfirmbar"
+      		:readonly="readonly"
+			@focus="onFocus"
+			@blur="handleBlur"
+			@input="handleInput"
+			@confirm="onConfirm"
+		/>
+		<view class="u-input__right-icon u-flex">
+			<view class="u-input__right-icon__clear u-input__right-icon__item" @tap="onClear" v-if="clearable && value != '' && focused">
+				<u-icon size="40" name="close-circle-fill" color="#c0c4cc"/>
+			</view>
+			<view class="u-input__right-icon__clear u-input__right-icon__item" v-if="passwordIcon && type == 'password'">
+				<u-icon size="40" :name="!showPassword ? 'eye' : 'eye-fill'" color="#c0c4cc" @click="showPassword = !showPassword"/>
+			</view>
+			<view class="u-input__right-icon--select u-input__right-icon__item" v-if="type == 'select'" :class="{
+				'u-input__right-icon--select--reverse': selectOpen
+			}">
+				<u-icon name="arrow-down-fill" size="40" color="#c0c4cc"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import Emitter from '../../libs/util/emitter.js';
+
+/**
+ * input 输入框
+ * @description 此组件为一个输入框，默认没有边框和样式，是专门为配合表单组件u-form而设计的，利用它可以快速实现表单验证，输入内容，下拉选择等功能。
+ * @tutorial http://uviewui.com/components/input.html
+ * @property {String} type 模式选择，见官网说明
+ * @property {Boolean} clearable 是否显示右侧的清除图标(默认true)
+ * @property {} v-model 用于双向绑定输入框的值
+ * @property {String} input-align 输入框文字的对齐方式(默认left)
+ * @property {String} placeholder placeholder显示值(默认 '请输入内容')
+ * @property {Boolean} disabled 是否禁用输入框(默认false)
+ * @property {String Number} maxlength 输入框的最大可输入长度(默认140)
+ * @property {String Number} selection-start 光标起始位置，自动聚焦时有效，需与selection-end搭配使用（默认-1）
+ * @property {String Number} maxlength 光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认-1）
+ * @property {String Number} cursor-spacing 指定光标与键盘的距离，单位px(默认0)
+ * @property {String} placeholderStyle placeholder的样式，字符串形式，如"color: red;"(默认 "color: #c0c4cc;")
+ * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type为text时生效(默认done)
+ * @property {Object} custom-style 自定义输入框的样式，对象形式
+ * @property {Boolean} focus 是否自动获得焦点(默认false)
+ * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true(默认false)
+ * @property {Boolean} password-icon type为password时，是否显示右侧的密码查看图标(默认true)
+ * @property {Boolean} border 是否显示边框(默认false)
+ * @property {String} border-color 输入框的边框颜色(默认#dcdfe6)
+ * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效(默认true)
+ * @property {String Number} height 高度，单位rpx(text类型时为70，textarea时为100)
+ * @example <u-input v-model="value" :type="type" :border="border" />
+ */
+export default {
+	name: 'u-input',
+	mixins: [Emitter],
+	props: {
+		value: {
+			type: [String, Number],
+			default: ''
+		},
+		// 输入框的类型，textarea，text，number
+		type: {
+			type: String,
+			default: 'text'
+		},
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		placeholder: {
+			type: String,
+			default: '请输入内容'
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		placeholderStyle: {
+			type: String,
+			default: 'color: #c0c4cc;'
+		},
+		confirmType: {
+			type: String,
+			default: 'done'
+		},
+		// 输入框的自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true
+		fixed: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动获得焦点
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		// 密码类型时，是否显示右侧的密码图标
+		passwordIcon: {
+			type: Boolean,
+			default: true
+		},
+		// input|textarea是否显示边框
+		border: {
+			type: Boolean,
+			default: false
+		},
+		// 输入框的边框颜色
+		borderColor: {
+			type: String,
+			default: '#dcdfe6'
+		},
+		autoHeight: {
+			type: Boolean,
+			default: true
+		},
+		// type=select时，旋转右侧的图标，标识当前处于打开还是关闭select的状态
+		// open-打开，close-关闭
+		selectOpen: {
+			type: Boolean,
+			default: false
+		},
+		// 高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: ''
+		},
+		// 是否可清空
+		clearable: {
+			type: Boolean,
+			default: true
+		},
+		// 指定光标与键盘的距离，单位 px
+		cursorSpacing: {
+			type: [Number, String],
+			default: 0
+		},
+		// 光标起始位置，自动聚焦时有效，需与selection-end搭配使用
+		selectionStart: {
+			type: [Number, String],
+			default: -1
+		},
+		// 光标结束位置，自动聚焦时有效，需与selection-start搭配使用
+		selectionEnd: {
+			type: [Number, String],
+			default: -1
+		},
+		// 是否自动去除两端的空格
+		trim: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示键盘上方带有”完成“按钮那一栏
+		showConfirmbar:{
+			type:Boolean,
+			default:true
+		},
+    // 是否只读
+    readonly:{
+      type:Boolean,
+      default:false
+    }
+	},
+	data() {
+		return {
+			defaultValue: this.value,
+			inputHeight: 70, // input的高度
+			textareaHeight: 100, // textarea的高度
+			validateState: false, // 当前input的验证状态，用于错误时，边框是否改为红色
+			focused: false, // 当前是否处于获得焦点的状态
+			showPassword: false, // 是否预览密码
+			lastValue: '', // 用于头条小程序，判断@input中，前后的值是否发生了变化，因为头条中文下，按下键没有输入内容，也会触发@input时间
+		};
+	},
+	watch: {
+		value(nVal, oVal) {
+			this.defaultValue = nVal;
+			// 当值发生变化，且为select类型时(此时input被设置为disabled，不会触发@input事件)，模拟触发@input事件
+			if(nVal != oVal && this.type == 'select') this.handleInput({
+				detail: {
+					value: nVal
+				}
+			})
+		},
+	},
+	computed: {
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength);
+		},
+		getStyle() {
+			let style = {};
+			// 如果没有自定义高度，就根据type为input还是textare来分配一个默认的高度
+			style.minHeight = this.height ? this.height + 'rpx' : this.type == 'textarea' ?
+				this.textareaHeight + 'rpx' : this.inputHeight + 'rpx';
+			style = Object.assign(style, this.customStyle);
+			return style;
+		},
+		//
+		getCursorSpacing() {
+			return Number(this.cursorSpacing);
+		},
+		// 光标起始位置
+		uSelectionStart() {
+			return String(this.selectionStart);
+		},
+		// 光标结束位置
+		uSelectionEnd() {
+			return String(this.selectionEnd);
+		}
+	},
+	created() {
+		// 监听u-form-item发出的错误事件，将输入框边框变红色
+		this.$on('on-form-item-error', this.onFormItemError);
+	},
+	methods: {
+		/**
+		 * change 事件
+		 * @param event
+		 */
+		handleInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if(this.trim) value = this.$u.trim(value);
+			// vue 原生的方法 return 出去
+			this.$emit('input', value);
+			// 当前model 赋值
+			this.defaultValue = value;
+			// 过一个生命周期再发送事件给u-form-item，否则this.$emit('input')更新了父组件的值，但是微信小程序上
+			// 尚未更新到u-form-item，导致获取的值为空，从而校验混论
+			// 这里不能延时时间太短，或者使用this.$nextTick，否则在头条上，会造成混乱
+			setTimeout(() => {
+				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+				// #ifdef MP-TOUTIAO
+				if(this.$u.trim(value) == this.lastValue) return ;
+				this.lastValue = value;
+				// #endif
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch('u-form-item', 'on-form-change', value);
+			}, 40)
+		},
+		/**
+		 * blur 事件
+		 * @param event
+		 */
+		handleBlur(event) {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100)
+			// vue 原生的方法 return 出去
+			this.$emit('blur', event.detail.value);
+			setTimeout(() => {
+				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+				// #ifdef MP-TOUTIAO
+				if(this.$u.trim(value) == this.lastValue) return ;
+				this.lastValue = value;
+				// #endif
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch('u-form-item', 'on-form-blur', event.detail.value);
+			}, 40)
+		},
+		onFormItemError(status) {
+			this.validateState = status;
+		},
+		onFocus(event) {
+			this.focused = true;
+			this.$emit('focus');
+		},
+		onConfirm(e) {
+			this.$emit('confirm', e.detail.value);
+		},
+		onClear(event) {
+			this.$emit('input', '');
+		},
+		inputClick() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-input {
+	position: relative;
+	flex: 1;
+	@include vue-flex;
+
+	&__input {
+		//height: $u-form-item-height;
+		font-size: 28rpx;
+		color: $u-main-color;
+		flex: 1;
+	}
+
+	&__textarea {
+		width: auto;
+		font-size: 28rpx;
+		color: $u-main-color;
+		padding: 10rpx 0;
+		line-height: normal;
+		flex: 1;
+	}
+
+	&--border {
+		border-radius: 6rpx;
+		border-radius: 4px;
+		border: 1px solid $u-form-item-border-color;
+	}
+
+	&--error {
+		border-color: $u-type-error!important;
+	}
+
+	&__right-icon {
+
+		&__item {
+			margin-left: 10rpx;
+		}
+
+		&--select {
+			transition: transform .4s;
+
+			&--reverse {
+				transform: rotate(-180deg);
+			}
+		}
+	}
+}
+</style>
diff --git a/uview-ui/components/u-keyboard/u-keyboard.vue b/uview-ui/components/u-keyboard/u-keyboard.vue
new file mode 100644
index 0000000..1904a2b
--- /dev/null
+++ b/uview-ui/components/u-keyboard/u-keyboard.vue
@@ -0,0 +1,217 @@
+<template>
+	<u-popup class="" :mask="mask" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto"
+	 :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :zIndex="uZIndex">
+		<slot />
+		<view class="u-tooltip" v-if="tooltip">
+			<view class="u-tooltip-item u-tooltip-cancel" hover-class="u-tooltip-cancel-hover" @tap="onCancel">
+				{{cancelBtn ? cancelText : ''}}
+			</view>
+			<view v-if="showTips" class="u-tooltip-item u-tooltip-tips">
+				{{tips ? tips : mode == 'number' ? '数字键盘' : mode == 'card' ? '身份证键盘' : '车牌号键盘'}}
+			</view>
+			<view v-if="confirmBtn" @tap="onConfirm" class="u-tooltip-item u-tooltips-submit" hover-class="u-tooltips-submit-hover">
+				{{confirmBtn ? confirmText : ''}}
+			</view>
+		</view>
+		<block v-if="mode == 'number' || mode == 'card'">
+			<u-number-keyboard :random="random" @backspace="backspace" @change="change" :mode="mode" :dotEnabled="dotEnabled"></u-number-keyboard>
+		</block>
+		<block v-else>
+			<u-car-keyboard :random="random" @backspace="backspace" @change="change"></u-car-keyboard>
+		</block>
+	</u-popup>
+</template>
+
+<script>
+	/**
+	 * keyboard 键盘
+	 * @description 此为uViw自定义的键盘面板，内含了数字键盘，车牌号键，身份证号键盘3中模式，都有可以打乱按键顺序的选项。
+	 * @tutorial https://www.uviewui.com/components/keyboard.html
+	 * @property {String} mode 键盘类型，见官网基本使用的说明（默认number）
+	 * @property {Boolean} dot-enabled 是否显示"."按键，只在mode=number时有效（默认true）
+	 * @property {Boolean} tooltip 是否显示键盘顶部工具条（默认true）
+	 * @property {String} tips 工具条中间的提示文字，见上方基本使用的说明，如不需要，请传""空字符
+	 * @property {Boolean} cancel-btn 是否显示工具条左边的"取消"按钮（默认true）
+	 * @property {Boolean} confirm-btn 是否显示工具条右边的"完成"按钮（默认true）
+	 * @property {Boolean} mask 是否显示遮罩（默认true）
+	 * @property {String} confirm-text 确认按钮的文字
+	 * @property {String} cancel-text 取消按钮的文字
+	 * @property {Number String} z-index 弹出键盘的z-index值（默认1075）
+	 * @property {Boolean} random 是否打乱键盘按键的顺序（默认false）
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+	 * @property {Boolean} mask-close-able 是否允许点击遮罩收起键盘（默认true）
+	 * @event {Function} change 按键被点击(不包含退格键被点击)
+	 * @event {Function} cancel 键盘顶部工具条左边的"取消"按钮被点击
+	 * @event {Function} confirm 键盘顶部工具条右边的"完成"按钮被点击
+	 * @event {Function} backspace 键盘退格键被点击
+	 * @example <u-keyboard mode="number" v-model="show"></u-keyboard> 
+	 */
+	export default {
+		name: "u-keyboard",
+		props: {
+			// 键盘的类型，number-数字键盘，card-身份证键盘，car-车牌号键盘
+			mode: {
+				type: String,
+				default: 'number'
+			},
+			// 是否显示键盘的"."符号
+			dotEnabled: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示顶部工具条
+			tooltip: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示工具条中间的提示
+			showTips: {
+				type: Boolean,
+				default: true
+			},
+			// 工具条中间的提示文字
+			tips: {
+				type: String,
+				default: ''
+			},
+			// 是否显示工具条左边的"取消"按钮
+			cancelBtn: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示工具条右边的"完成"按钮
+			confirmBtn: {
+				type: Boolean,
+				default: true
+			},
+			// 是否打乱键盘按键的顺序
+			random: {
+				type: Boolean,
+				default: false
+			},
+			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 是否允许通过点击遮罩关闭键盘
+			maskCloseAble: {
+				type: Boolean,
+				default: true
+			},
+			// 通过双向绑定控制键盘的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示遮罩，某些时候数字键盘时，用户希望看到自己的数值，所以可能不想要遮罩
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			// 取消按钮的文字
+			cancelText: {
+				type: String,
+				default: '取消'
+			},
+			// 确认按钮的文字
+			confirmText: {
+				type: String,
+				default: '确认'
+			}
+		},
+		data() {
+			return {
+				//show: false
+			}
+		},
+		computed: {
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		methods: {
+			change(e) {
+				this.$emit('change', e);
+			},
+			// 键盘关闭
+			popupClose() {
+				// 通过发送input这个特殊的事件名，可以修改父组件传给props的value的变量，也即双向绑定
+				this.$emit('input', false);
+			},
+			// 输入完成
+			onConfirm() {
+				this.popupClose();
+				this.$emit('confirm');
+			},
+			// 取消输入
+			onCancel() {
+				this.popupClose();
+				this.$emit('cancel');
+			},
+			// 退格键
+			backspace() {
+				this.$emit('backspace');
+			},
+			// 关闭键盘
+			// close() {
+			// 	this.show = false;
+			// },
+			// // 打开键盘
+			// open() {
+			// 	this.show = true;
+			// }
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-keyboard {
+		position: relative;
+		z-index: 1003;
+	}
+
+	.u-tooltip {
+		@include vue-flex;
+		justify-content: space-between;
+	}
+
+	.u-tooltip-item {
+		color: #333333;
+		flex: 0 0 33.333333%;
+		text-align: center;
+		padding: 20rpx 10rpx;
+		font-size: 28rpx;
+	}
+
+	.u-tooltips-submit {
+		text-align: right;
+		flex-grow: 1;
+		flex-wrap: 0;
+		padding-right: 40rpx;
+		color: $u-type-primary;
+	}
+
+	.u-tooltip-cancel {
+		text-align: left;
+		flex-grow: 1;
+		flex-wrap: 0;
+		padding-left: 40rpx;
+		color: #888888;
+	}
+
+	.u-tooltips-submit-hover {
+		color: $u-type-success;
+	}
+
+	.u-tooltip-cancel-hover {
+		color: #333333;
+	}
+</style>
diff --git a/uview-ui/components/u-lazy-load/u-lazy-load.vue b/uview-ui/components/u-lazy-load/u-lazy-load.vue
new file mode 100644
index 0000000..429a680
--- /dev/null
+++ b/uview-ui/components/u-lazy-load/u-lazy-load.vue
@@ -0,0 +1,244 @@
+<template>
+	<view class="u-wrap" :style="{
+			  opacity: Number(opacity),
+			  borderRadius: borderRadius + 'rpx',
+			  // 因为time值需要改变,所以不直接用duration值(不能改变父组件prop传过来的值)
+			  transition: `opacity ${time / 1000}s ease-in-out`
+		   }"
+	 :class="'u-lazy-item-' + elIndex">
+		<view :class="'u-lazy-item-' + elIndex">
+			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" v-if="!isError" class="u-lazy-item"
+			 :src="isShow ? image : loadingImg" :mode="imgMode" @load="imgLoaded" @error="loadError" @tap="clickImg"></image>
+			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" class="u-lazy-item error" v-else :src="errorImg"
+			 :mode="imgMode" @load="errorImgLoaded" @tap="clickImg"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * lazyLoad 懒加载
+	 * @description 懒加载使用的场景为：页面有很多图片时，APP会同时加载所有的图片，导致页面卡顿，各个位置的图片出现前后不一致等.
+	 * @tutorial https://www.uviewui.com/components/lazyLoad.html
+	 * @property {String Number} index 用户自定义值，在事件触发时回调，用以区分是哪个图片
+	 * @property {String} image 图片路径
+	 * @property {String} loading-img 预加载时的占位图
+	 * @property {String} error-img 图片加载出错时的占位图
+	 * @property {String} threshold 触发加载时的位置，见上方说明，单位 rpx（默认300）
+	 * @property {String Number} duration 图片加载成功时，淡入淡出时间，单位ms（默认）
+	 * @property {String} effect 图片加载成功时，淡入淡出的css动画效果（默认ease-in-out）
+	 * @property {Boolean} is-effect 图片加载成功时，是否启用淡入淡出效果（默认true）
+	 * @property {String Number} border-radius 图片圆角值，单位rpx（默认0）
+	 * @property {String Number} height 图片高度，注意：实际高度可能受img-mode参数影响（默认450）
+	 * @property {String Number} mg-mode 图片的裁剪模式，详见image组件裁剪模式（默认widthFix）
+	 * @event {Function} click 点击图片时触发
+	 * @event {Function} load 图片加载成功时触发
+	 * @event {Function} error 图片加载失败时触发
+	 * @example <u-lazy-load :image="image" :loading-img="loadingImg" :error-img="errorImg"></u-lazy-load>
+	 */
+	export default {
+		name: 'u-lazy-load',
+		props: {
+			index: {
+				type: [Number, String]
+			},
+			// 要显示的图片
+			image: {
+				type: String,
+				default: ''
+			},
+			// 图片裁剪模式
+			imgMode: {
+				type: String,
+				default: 'widthFix'
+			},
+			// 占位图片路径
+			loadingImg: {
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OUM0QjNBQjkyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OUM0QjNBQkEyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo5QzRCM0FCNzJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo5QzRCM0FCODJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtRHfPcAAAAzUExURZWVldfX18PDw62trZubm9zc3Li4uKGhoebm5tLS0uHh4c3Nzaenp729vcjIyLKysuvr6141L40AAAcXSURBVHja7NzZlqpGAEBR5lG0//9rIw7IJKJi4or7PGTdtN10wr5SVAEGf/qqArsAiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAg+nmQFMi5Jis+sIniED23jSzIgLTtg2D//iYme/8QBM/9lQ+CAEhbNLM3N9hEHAThX7GPCiBfAxK1b51kD+R7QMLjXg7iCsgWIPUh7pfVozG791oeBPngm48G583uW5GkBvI+SBaM2xXDn1oqum423bX/mgF5FySc2cv93Voug9TdZotsggnkBZB2NzbhrSY5HnoG07jei8dvzsJB/c3W60SALILE46+WCztsbhPR7R2VJq0ukEcT49nyy8QhaKcRa3fYHZD4+ufqOJAcgDz8/59vtw1I3QP5K6JsOG0vm3hce4I8LQp/BaRZGJC3AAn7IKOKXbC+7EdA5vdmmVwOLksgRThqOqiH4XEGsht+peoPUE8U/jJIO5OLH4GEwUslV5G0PTBG5Uiw/Y2jyigO3l9HAHKv9PYb82LloH74dZBoBUgar+l48NsNvtD0fkez9iwrAvIYZDRCl+Xs149Hm/KZmQ+QjUCiO1ei4ru7EsgnQYrkznlQb7thCuRfAzlOAPN72427P4VA/i2Q/DKT/Ls/VR8fvIBsDZIuz7TPF6TCbnk4GJkB2RokejTjuE7/unlgCuSTIO0Cy+Plp6vDfnQlBchy8QtjSHVd3EgmK1bHLm+H6+nXYbz2DuQRSPnqoL7vvq0u70on4zvxgCyWD3b9UyDVdW24PaWaiGTnFZJwPIQAebDpIKheBIm7n124ZthMJipAlkqHO+IZkP1tbfzOJark/A7MgKyvvl60fRqkvXfhuow+t9+q00+0/yyBrK8ZngOtBzldhw2X9tvpNGty0gvkmbPeJ0Cy/r09s/stbmfo0yMWkEdjevgKyOn2t2pxv7UXoibTdCDLje9/Ww1ymqzn87dbp92242ZmMRjI8hASvwKSLq4udqN6ksw8nxXN3tszD9L8Gkg+2mFrQYql5az4tvFj5xOx4VwnSdeBtGdyPwUytxK77pBVlNHdO7OK3rh/eTPUvdutT3fO52tuHMqD4N7llv8pyOQQ//w19YVDfX27+Sfuby9/6nau4pdA8vEdOZuChEH/quHt0Jg+IRJ/5+PrHwKZXfjbDiS73Zo7mu5UkzX7uTsXe0e/7nC3ePf1O69+BUg2XDfZCqSqOu7rGVf8cHBe8zhC2b61dtUHXv0OkGo6ZL4JkpbRYXdUaFevivx2M/1GIOctNh949TtAoumQ+TpIHMX54CJu+8BDd8FkE5BqcZh/59XvAClmTvKfB0nDqIlHo3T70SftyW1eX9dXtgQJqs1f/Q6QaOa/7wmQKtxH8eiGoCRuovODIO3VxOMmruZbHrLyD7z6DSDtGyT7ew1kf9hNn07c986JTovzzem0Id9wUG+Vk/IDr34DSNR7huZJkMFT6vEhqrPx/j5cnlZML8N6/PAzh9Y99Flm5Yde/c9BquDOkvkKkMP58dA4qi9vivE8JOvGz/j8FokfPpr288+pH2ZPOZrLmeGD+7KOh6dqYWJ48ki7yUg0tz0go/fv/LLddfV3sgOLJyaGPY/zrSlh1a36Arkzoue9CyG35ze6E6/dzO2Ga0EGHqdRJIkfn9/8OEjTW8Vq91ZWh39FeehWA7Nu9ft8CpUEk1WWOyDF0OPyEU2Pnzf/bZC0P6IPzmAvu7KauQBVrgKpJ0tG2arHzX8e5Pb3PezNs/PrX+3JMyCLn9XXf37tPFHvt09WfCDDjx+yyn1/p1V11j7GnB/q3leLuVva79S/tzed+db08YpF4uOZtmz/9oXWMq6BCAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiAALELvqt/BBgACqVeUBXxcCkAAAAASUVORK5CYII='
+			},
+			// 加载失败的错误占位图
+			errorImg: {
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODdDMjhENDYyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODdDMjhENDcyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4N0MyOEQ0NDJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4N0MyOEQ0NTJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhLwhikAAAAzUExURZWVldfX162trcPDw5ubm7i4uNzc3Obm5s3NzaGhoeHh4cjIyKenp9LS0r29vbKysuvr67sDMEkAAAlpSURBVHja7NzpYqMgAIVRUVHc8/5PO66R1WAbOzX97q+ZtDEpR0AWTR7kVyWhCAAhgABCAAGEAAIIAQQQAggBBBACCCAEEEAIIIAQQAgggBBAACGAAEIAAYQAQgABhAACCAEEEAIIIAQQAgggBBBACCCAEEAAIYAQQAAhgABCAAGEAAIIAYQAAggBBBACCCAEEEAIIAQQQAgggBBAACGAAEIAIYAAQgABhAACCAEEEAIIAQQQAgggBBBACCCAEEAAIYAQQAAhgABCAAGEAAIIAYQAAggBBBACCCAEEEAIIAQQQAgggBBAACGAAEIAIYAAQgABhAACCAEEEAIIAQQQAgggBBBACCCAEEAIIIAQQAAhgABCAAGEAEIAAYQAAggBBBACCCAEEAIIIAQQQAgggBBAACGAEEAAIYAAsqeX5QWHKIcs/Ptl03lfL4zDFPWfBGmSpPn+IZzSH5KkCL5B+n+oklwz6Iz//R2QzFOabzhEmiRirAmZt/bl0w/dpMbLqeeo4wEdpC7zR5WAPKziHKtO7ql+ReKvIa9BxgNaL5ZtEkpeAGIVp5jKJa09xVo9vgSSzQcszdYvmOqjQNSQ6pHK6rO1n1Xj32788miwHLaZz1Tl9i/yayDlYJ/60/+lp8GSY7OY1B8E4p55bWmfquFk22GLuUUxi78cX+m+BjL2GLkhMrV+/muS6Sfic0CEp5T1Yu2OQdTzsKV0MJV73KVjroyTffxfuv5Tf3fd6iLT9wz8YdVHgUzF2Is9/Xhi5sYJqP1w/GUpjOiHVbaI0w2L+pg3GZzvtokcgHxWDXHaiy78l3sPke01qphamT5c+dqyeAGSumdL/mkggauTam0e3L/mPEiqtzKDbl0Z1Wn8xOa4ySo8X/7TQIJnY/seEKWf12UmC72CKP9xYjr19RPT7NNA+oMO+R0gwmlotAry+C6I0f59ch8yXVQOr0BKYcXt1IUYRyCt+Ur9HGsrQKI79WY9sY9ARPKlzFOFdb41ioD8b5Bp+mqeeRKAxINkESBFGpOpKhgv9OuYpH8A8l4Qa3qp60Kl2/k+rG2sWafuuyCBafb2j4JkgZUob3nWcmicpkxEgmTLLGejTxnWSWCi8lPmsk6DlIHFJv24ojiYyYoGacwL8zXTLEAVaDI/Ybb3NIgKDSv2oXpmHkvNs+PTpMASEdlk7fOZeRk37fwJ6yGnQarQsGIfqqcvx43rTOXY6jf7uKXdRzdLDRPbjIrx1cIj3Kr4KyBFezzgUGuR5893qkOQ19fR2uVBaU+r16LphJNOiatK7PeBZK/Kb+tUn71rcQjSvARpghfH/yG/D2RetTuI3N5QrMWdP46brP7FmKZ//CGQ9At9SL01DLkzY/Vs8Z97fQZ7gelw7jHqCz+/Wile5J4g3Vc79eb5a6oLSue+Ve83gaSv2jp5PxCzjzwFUm9zw9MllSMil1kS4d2E9SaQ1xNo9wMxx0+nQNLnew/WDHvveMAHYm08mofl3TFI/8pD3Q6kMAv6DIi2jTCwRJUvNdDYrrJum9oHhusCbWALonwxBRk1vXMnEGWuT5wAmfYuVGUYpJ7fUZujCN92hvzwWlrFgxSfANKb10DxIMbShnfrynyZZV30imA7P43ArXXHbvBVkTCIuGy25AdBrHmNeBCpL214QdLp9LZarG3IMWrmW0ehtuO7F2PS09UcgqS3B7FKPhpknrStD0HGF/vQRne37LwLG8EbHT4WxN7/Fg0yD9Yr/3br4nnstA+0Il6QxzdBmg8A6a2/IRbkcK9h/uzV8zywF/oSkOyageCPglRWgcWClHnEzs9q/t/SENVXgFijlsq3VtXdCsRp4qObrLLLgjuzSq3fX89ZZW6AfxNIzF6X9FYgThN/fk093KkvHX/hbWd+DqS/FUhlf+G3gohEXzVs3g9iDluWoaW8fL73QhB34u+tIHIf19nLuF4Q98a09Eynnl56q+ePgEhnX+dbQOp6H5XnJ0ACd8dFgkwf12nTOTcEqd2pom+CFF02TIPw6dKmrLS5qOtBpo8b5quUtrwrSGbuqPkeSJqllTFHO02NPxdMrm+y5LKdWyWXjw4vA5nGEtnjuyCFyHqNYvEolzmASm3zK1Eg5zr13lhqV1tlksnVw8Pkwgri7O07AVKLJkutRYw87bPlRpBpNXE8xGb+fhBlvEGrGPLqViu5sILIx9dAmqF1705sxF4M8+R8P5dOdQwi12fMnATpjJ2JSt/POIvU9wPJEs/jduJAjLvU0yFT0i64Yb1bsVi79dA4pEy3TzoHMq2O7Re4vXm5O9+l290NpE4CU+YRIMNye2iaqbVS2AUnn2fsekthYKReVNutVedA5juttyIXrT38mOds+ps9DWhwL7GWc61/DVKPzVN9UHDarf1icU98IOU8tm6L031Iq63t1tKzj3fe/FCpO4F0/i0Z2+yvA1KeGBjqj1qYx8/zoxpKZ1Yl367I1k+sfcft/QPy9csXy/32qX1qLZsrryG5BGQaRj0vc/b7N54XXq293TCLB5HO42Fy517obW19b+qjl3CHp0fdLJcWvmdy1etESi/uAdJrs1hTaUklHuW8qSDdC3UfXVR5cnD3rAFSSqtFb7z7eapErx7rC739jCXfbK3aWiipjXo8UbmxXPa7QQq9R289j2Gr88N7Ag5AlHPRKc37pNZv0CZtX1tVMG6rm8qW1/KlCgQvcMss933ybwXZz3dReW5yce4ByZtHFIhwT9kmjxg8BzbKDUe1PB9edBJqSN7/KM1LmqyuMZ5BpeTUw1aD/uDI0relPfSHa/Wn8Pxq1BNfxy/h3IdwOJqIKumb9CHvTqMefyY82RoQAgggBBBACCCAEEAAIYAQQAAhgABCAAGEAAIIAYQAAggBBBACCCAEEEAIIAQQQAgggBBAACGAAEIAIYAAQgABhAACCAEEEAIIAQQQAgggBBBACCCAEEAIIIAQQAAhgABCAAGEAEIAAYQAAggBBBACCCAEEAIIIAQQQAgggBBAACGAEEAAIYAAQgABhAACCAEEEAIIAQQQAgggBBBACCCAEEAIIIAQQAAhgABCAAGEAEIAAYQAAggBBBACCCAEEAIIIAQQQAgggBBAACGAEEAAIYAAQgABhAACCAGEAAIIAQQQAgggBBBACCAEEEAIIIAQQAAhgABCACGAAEIAAYQAAggBBBACCAEEEAIIIAQQQAggfyL/BBgA8PgLdH0TBtkAAAAASUVORK5CYII='
+			},
+			// 图片进入可见区域前多少像素时，单位rpx，开始加载图片
+			// 负数为图片超出屏幕底部多少距离后触发懒加载，正数为图片顶部距离屏幕底部多少距离时触发(图片还没出现在屏幕上)
+			threshold: {
+				type: [Number, String],
+				default: 100
+			},
+			// 淡入淡出动画的过渡时间
+			duration: {
+				type: [Number, String],
+				default: 500
+			},
+			// 渡效果的速度曲线，各个之间差别不大，因为这是淡入淡出，且时间很短，不是那些变形或者移动的情况，会明显
+			// linear|ease|ease-in|ease-out|ease-in-out|cubic-bezier(n,n,n,n);
+			effect: {
+				type: String,
+				default: 'ease-in-out'
+			},
+			// 是否使用过渡效果
+			isEffect: {
+				type: Boolean,
+				default: true
+			},
+			// 圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 0
+			},
+			// 图片高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: '450'
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				opacity: 1,
+				time: this.duration,
+				loadStatus: '', // 默认是懒加载中的状态
+				isError: false, // 图片加载失败
+				elIndex: this.$u.guid()
+			}
+		},
+		computed: {
+			// 将threshold从rpx转为px
+			getThreshold() {
+				// 先取绝对值，因为threshold可能是负数，最后根据this.threshold是正数或者负数，重新还原
+				let thresholdPx = uni.upx2px(Math.abs(this.threshold));
+				return this.threshold < 0 ? -thresholdPx : thresholdPx;
+			},
+			// 计算图片的高度，可能为auto，带%，或者直接数值
+			imgHeight() {
+				return this.$u.addUnit(this.height);
+			}
+		},
+		created() {
+			// 由于一些特殊原因，不能将此变量放到data中定义
+			this.observer = {};
+		},
+		watch: {
+			isShow(nVal) {
+				// 如果是不开启过渡效果，直接返回
+				if (!this.isEffect) return;
+				this.time = 0;
+				// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的白色)，再改成1，是为了获得过渡效果
+				this.opacity = 0;
+				// 延时30ms，否则在浏览器H5，过渡效果无效
+				setTimeout(() => {
+					this.time = this.duration;
+					this.opacity = 1;
+				}, 30)
+			},
+			// 图片路径发生变化时，需要重新标记一些变量，否则会一直卡在某一个状态，比如isError
+			image(n) {
+				if(!n) {
+					// 如果传入null或者''，或者undefined，标记为错误状态
+					this.isError = true;
+				} else {
+					this.init();
+					this.isError = false;
+				}
+			}
+		},
+		methods: {
+			// 用于重新初始化
+			init() {
+				this.isError = false;
+				this.loadStatus = '';
+			},
+			// 点击图片触发的事件,loadlazy-还是懒加载中状态，loading-图片正在加载，loaded-图片加加载完成
+			clickImg() {
+				let whichImg = '';
+				// 如果isShow为false，意味着图片还没开始加载，点击的只能是最开始的占位图
+				if (this.isShow == false) whichImg = 'lazyImg';
+				// 如果isError为true，意味着图片加载失败，这是只剩下错误的占位图，所以点击的只能是错误占位图
+				// 当然，也可以给错误的占位图元素绑定点击事件，看你喜欢~
+				else if (this.isError == true) whichImg = 'errorImg';
+				// 总共三张图片，除了两个占位图，剩下的只能是正常的那张图片了
+				else whichImg = 'realImg';
+				// 只通知当前图片的index
+				this.$emit('click', this.index);
+			},
+			// 图片加载完成事件，可能是加载占位图时触发，也可能是加载真正的图片完成时触发，通过isShow区分
+			imgLoaded() {
+				// 占位图加载完成
+				if (this.loadStatus == '') {
+					this.loadStatus = 'lazyed';
+				}
+				// 真正的图片加载完成 
+				else if (this.loadStatus == 'lazyed') {
+					this.loadStatus = 'loaded';
+					this.$emit('load', this.index);
+				}
+			},
+			// 错误的图片加载完成
+			errorImgLoaded() {
+				this.$emit('error', this.index);
+			},
+			// 图片加载失败
+			loadError() {
+				this.isError = true;
+			},
+			disconnectObserver(observerName) {
+				const observer = this[observerName];
+				observer && observer.disconnect();
+			},
+		},
+		beforeDestroy() {
+			// 销毁页面时，可能还没触发某张很底部的懒加载图片，所以把这个事件给去掉
+			//observer.disconnect();
+		},
+		mounted() {
+			// 此uOnReachBottom事件由mixin.js发出，目的是让页面到底时，保证所有图片都进行加载，做到绝对稳定且可靠
+			this.$nextTick(() => {
+				uni.$once('uOnReachBottom', () => {
+					if (!this.isShow) this.isShow = true;
+				});
+			})
+			// mounted的时候，不一定挂载了这个元素，延时30ms，否则会报错或者不报错，但是也没有效果
+			setTimeout(() => {
+				// 这里是组件内获取布局状态，不能用uni.createIntersectionObserver，而必须用this.createIntersectionObserver
+				this.disconnectObserver('contentObserver');
+				const contentObserver = uni.createIntersectionObserver(this);
+				// 要理解这里怎么计算的，请看这个：
+				// https://blog.csdn.net/qq_25324335/article/details/83687695
+				contentObserver.relativeToViewport({
+					bottom: this.getThreshold,
+				}).observe('.u-lazy-item-' + this.elIndex, (res) => {
+					if (res.intersectionRatio > 0) {
+						// 懒加载状态改变
+						this.isShow = true;
+						// 如果图片已经加载，去掉监听，减少性能的消耗
+						this.disconnectObserver('contentObserver');
+					}
+				})
+				this.contentObserver = contentObserver;
+			}, 30)
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-wrap {
+		background-color: #eee;
+		overflow: hidden;
+	}
+
+	.u-lazy-item {
+		width: 100%;
+		// 骗系统开启硬件加速
+		transform: transition3d(0, 0, 0);
+		// 防止图片加载“闪一下”
+		will-change: transform;
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+	}
+</style>
diff --git a/uview-ui/components/u-line-progress/u-line-progress.vue b/uview-ui/components/u-line-progress/u-line-progress.vue
new file mode 100644
index 0000000..77e2da2
--- /dev/null
+++ b/uview-ui/components/u-line-progress/u-line-progress.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="u-progress" :style="{
+		borderRadius: round ? '100rpx' : 0,
+		height: height + 'rpx',
+		backgroundColor: inactiveColor
+	}">
+		<view :class="[
+			type ? `u-type-${type}-bg` : '',
+			striped ? 'u-striped' : '',
+			striped && stripedActive ? 'u-striped-active' : ''
+		]" class="u-active" :style="[progressStyle]">
+			<slot v-if="$slots.default || $slots.$default" />
+			<block v-else-if="showPercent">
+				{{percent + '%'}}
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * lineProgress 线型进度条
+	 * @description 展示操作或任务的当前进度，比如上传文件，是一个线形的进度条。
+	 * @tutorial https://www.uviewui.com/components/lineProgress.html
+	 * @property {String Number} percent 进度条百分比值，为数值类型，0-100
+	 * @property {Boolean} round 进度条两端是否为半圆（默认true）
+	 * @property {String} type 如设置，active-color值将会失效
+	 * @property {String} active-color 进度条激活部分的颜色（默认#19be6b）
+	 * @property {String} inactive-color 进度条的底色（默认#ececec）
+	 * @property {Boolean} show-percent 是否在进度条内部显示当前的百分比值数值（默认true）
+	 * @property {String Number} height 进度条的高度，单位rpx（默认28）
+	 * @property {Boolean} striped 是否显示进度条激活部分的条纹（默认false）
+	 * @property {Boolean} striped-active 条纹是否具有动态效果（默认false）
+	 * @example <u-line-progress :percent="70" :show-percent="true"></u-line-progress>
+	 */
+	export default {
+		name: "u-line-progress",
+		props: {
+			// 两端是否显示半圆形
+			round: {
+				type: Boolean,
+				default: true
+			},
+			// 主题颜色
+			type: {
+				type: String,
+				default: ''
+			},
+			// 激活部分的颜色
+			activeColor: {
+				type: String,
+				default: '#19be6b'
+			},
+			inactiveColor: {
+				type: String,
+				default: '#ececec'
+			},
+			// 进度百分比，数值
+			percent: {
+				type: Number,
+				default: 0
+			},
+			// 是否在进度条内部显示百分比的值
+			showPercent: {
+				type: Boolean,
+				default: true
+			},
+			// 进度条的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 28
+			},
+			// 是否显示条纹
+			striped: {
+				type: Boolean,
+				default: false
+			},
+			// 条纹是否显示活动状态
+			stripedActive: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			progressStyle() {
+				let style = {};
+				style.width = this.percent + '%';
+				if(this.activeColor) style.backgroundColor = this.activeColor;
+				return style;
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-progress {
+		overflow: hidden;
+		height: 15px;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+		width: 100%;
+		border-radius: 100rpx;
+	}
+
+	.u-active {
+		width: 0;
+		height: 100%;
+		align-items: center;
+		@include vue-flex;
+		justify-items: flex-end;
+		justify-content: space-around;
+		font-size: 20rpx;
+		color: #ffffff;
+		transition: all 0.4s ease;
+	}
+
+	.u-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: 39px 39px;
+	}
+
+	.u-striped-active {
+		animation: progress-stripes 2s linear infinite;
+	}
+
+	@keyframes progress-stripes {
+		0% {
+			background-position: 0 0;
+		}
+
+		100% {
+			background-position: 39px 0;
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-line/u-line.vue b/uview-ui/components/u-line/u-line.vue
new file mode 100644
index 0000000..c56fbc3
--- /dev/null
+++ b/uview-ui/components/u-line/u-line.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="u-line" :style="[lineStyle]">
+		
+	</view>
+</template>
+
+<script>
+	/**
+	 * line 线条
+	 * @description 此组件一般用于显示一根线条，用于分隔内容块，有横向和竖向两种模式，且能设置0.5px线条，使用也很简单
+	 * @tutorial https://www.uviewui.com/components/line.html
+	 * @property {String} color 线条的颜色(默认#e4e7ed)
+	 * @property {String} length 长度，竖向时表现为高度，横向时表现为长度，可以为百分比，带rpx单位的值等
+	 * @property {String} direction 线条的方向，row-横向，col-竖向(默认row)
+	 * @property {String} border-style 线条的类型，solid-实线，dashed-方形虚线，dotted-圆点虚线(默认solid)
+	 * @property {Boolean} hair-line 是否显示细线条(默认true)
+	 * @property {String} margin 线条与上下左右元素的间距，字符串形式，如"30rpx"
+	 * @example <u-line color="red"></u-line>
+	 */
+	export default {
+		name: 'u-line',
+		props: {
+			color: {
+				type: String,
+				default: '#e4e7ed'
+			},
+			// 长度，竖向时表现为高度，横向时表现为长度，可以为百分比，带rpx单位的值等
+			length: {
+				type: String,
+				default: '100%'
+			},
+			// 线条方向，col-竖向，row-横向
+			direction: {
+				type: String,
+				default: 'row'
+			},
+			// 是否显示细边框
+			hairLine: {
+				type: Boolean,
+				default: true
+			},
+			// 线条与上下左右元素的间距，字符串形式，如"30rpx"、"20rpx 30rpx"
+			margin: {
+				type: String,
+				default: '0'
+			},
+			// 线条的类型，solid-实线，dashed-方形虚线，dotted-圆点虚线
+			borderStyle: {
+				type: String,
+				default: 'solid'
+			}
+		},
+		computed: {
+			lineStyle() {
+				let style = {};
+				style.margin = this.margin;
+				// 如果是水平线条，边框高度为1px，再通过transform缩小一半，就是0.5px了
+				if(this.direction == 'row') {
+					// 此处采用兼容分开写，兼容nvue的写法
+					style.borderBottomWidth = '1px';
+					style.borderBottomStyle = this.borderStyle;
+					style.width = this.$u.addUnit(this.length);
+					if(this.hairLine) style.transform = 'scaleY(0.5)';
+				} else {
+					// 如果是竖向线条，边框宽度为1px，再通过transform缩小一半，就是0.5px了
+					style.borderLeftWidth = '1px';
+					style.borderLeftStyle = this.borderStyle;
+					style.height = this.$u.addUnit(this.length);
+					if(this.hairLine) style.transform = 'scaleX(0.5)';
+				}
+				style.borderColor = this.color;
+				return style;
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-line {
+		vertical-align: middle;
+	}
+</style>
diff --git a/uview-ui/components/u-link/u-link.vue b/uview-ui/components/u-link/u-link.vue
new file mode 100644
index 0000000..2dd2a73
--- /dev/null
+++ b/uview-ui/components/u-link/u-link.vue
@@ -0,0 +1,89 @@
+<template>
+	<text class="u-link" @tap.stop="openLink" :style="{
+		color: color,
+		fontSize: fontSize + 'rpx',
+		borderBottom: underLine ? `1px solid ${lineColor ? lineColor : color}` : 'none',
+		paddingBottom: underLine ? '0rpx' : '0'
+	}">
+		<slot></slot>
+	</text>
+</template>
+
+<script>
+	/**
+	 * link 超链接
+	 * @description 该组件为超链接组件，在不同平台有不同表现形式：在APP平台会通过plus环境打开内置浏览器，在小程序中把链接复制到粘贴板，同时提示信息，在H5中通过window.open打开链接。
+	 * @tutorial https://www.uviewui.com/components/link.html
+	 * @property {String} color 文字颜色（默认#606266）
+	 * @property {String Number} font-size 字体大小，单位rpx（默认28）
+	 * @property {Boolean} under-line 是否显示下划线（默认false）
+	 * @property {String} href 跳转的链接，要带上http(s)
+	 * @property {String} line-color 下划线颜色，默认同color参数颜色 
+	 * @property {String} mp-tips 各个小程序平台把链接复制到粘贴板后的提示语（默认“链接已复制，请在浏览器打开”）
+	 * @example <u-link href="http://www.uviewui.com">蜀道难，难于上青天</u-link>
+	 */
+	export default {
+		name: "u-link",
+		props: {
+			// 文字颜色
+			color: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [String, Number],
+				default: 28
+			},
+			// 是否显示下划线
+			underLine: {
+				type: Boolean,
+				default: false
+			},
+			// 要跳转的链接
+			href: {
+				type: String,
+				default: ''
+			},
+			// 小程序中复制到粘贴板的提示语
+			mpTips: {
+				type: String,
+				default: '链接已复制，请在浏览器打开'
+			},
+			// 下划线颜色
+			lineColor: {
+				type: String,
+				default: ''
+			}
+		},
+		methods: {
+			openLink() {
+				// #ifdef APP-PLUS
+				plus.runtime.openURL(this.href)
+				// #endif
+				// #ifdef H5
+				window.open(this.href)
+				// #endif
+				// #ifdef MP
+				uni.setClipboardData({
+					data: this.href,
+					success: () => {
+						uni.hideToast();
+						this.$nextTick(() => {
+							this.$u.toast(this.mpTips);
+						})
+					}
+				});
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-link {
+		line-height: 1;
+	}
+</style>
diff --git a/uview-ui/components/u-loading-page/u-loading-page.vue b/uview-ui/components/u-loading-page/u-loading-page.vue
new file mode 100644
index 0000000..7e04401
--- /dev/null
+++ b/uview-ui/components/u-loading-page/u-loading-page.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="u-loading-page">
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/uview-ui/components/u-loading/u-loading.vue b/uview-ui/components/u-loading/u-loading.vue
new file mode 100644
index 0000000..c747f64
--- /dev/null
+++ b/uview-ui/components/u-loading/u-loading.vue
@@ -0,0 +1,103 @@
+<template>
+	<view v-if="show" class="u-loading" :class="mode == 'circle' ? 'u-loading-circle' : 'u-loading-flower'" :style="[cricleStyle]">
+	</view>
+</template>
+
+<script>
+	/**
+	 * loading 加载动画
+	 * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
+	 * @tutorial https://www.uviewui.com/components/loading.html
+	 * @property {String} mode 模式选择，见官网说明（默认circle）
+	 * @property {String} color 动画活动区域的颜色，只对 mode = flower 模式有效（默认#c7c7c7）
+	 * @property {String Number} size 加载图标的大小，单位rpx（默认34）
+	 * @property {Boolean} show 是否显示动画（默认true）
+	 * @example <u-loading mode="circle"></u-loading>
+	 */
+	export default {
+		name: "u-loading",
+		props: {
+			// 动画的类型
+			mode: {
+				type: String,
+				default: 'circle'
+			},
+			// 动画的颜色
+			color: {
+				type: String,
+				default: '#c7c7c7'
+			},
+			// 加载图标的大小，单位rpx
+			size: {
+				type: [String, Number],
+				default: '34'
+			},
+			// 是否显示动画
+			show: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			// 加载中圆圈动画的样式
+			cricleStyle() {
+				let style = {};
+				style.width = this.size + 'rpx';
+				style.height = this.size + 'rpx';
+				if (this.mode == 'circle') style.borderColor = `#e4e4e4 #e4e4e4 #e4e4e4 ${this.color ? this.color : '#c7c7c7'}`;
+				return style;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-loading-circle {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		vertical-align: middle;
+		width: 28rpx;
+		height: 28rpx;
+		background: 0 0;
+		border-radius: 50%;
+		border: 2px solid;
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
+		animation: u-circle 1s linear infinite;
+	}
+
+	.u-loading-flower {
+		width: 20px;
+		height: 20px;
+		display: inline-block;
+		vertical-align: middle;
+		-webkit-animation: a 1s steps(12) infinite;
+		animation: u-flower 1s steps(12) infinite;
+		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+		background-size: 100%;
+	}
+
+	@keyframes u-flower {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn);
+		}
+	}
+
+	@-webkit-keyframes u-circle {
+		0% {
+			transform: rotate(0);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-loadmore/u-loadmore.vue b/uview-ui/components/u-loadmore/u-loadmore.vue
new file mode 100644
index 0000000..6b852a8
--- /dev/null
+++ b/uview-ui/components/u-loadmore/u-loadmore.vue
@@ -0,0 +1,203 @@
+<template>
+	<view class="u-load-more-wrap" :style="{
+		backgroundColor: bgColor,
+		marginBottom: marginBottom + 'rpx',
+		marginTop: marginTop + 'rpx',
+		height: $u.addUnit(height)
+	}">
+		<u-line color="#d4d4d4" length="50"></u-line>
+		<!-- 加载中和没有更多的状态才显示两边的横线 -->
+		<view :class="status == 'loadmore' || status == 'nomore' ? 'u-more' : ''" class="u-load-more-inner">
+			<view class="u-loadmore-icon-wrap">
+				<u-loading class="u-loadmore-icon" :color="iconColor" :mode="iconType == 'circle' ? 'circle' : 'flower'" :show="status == 'loading' && icon"></u-loading>
+			</view>
+			<!-- 如果没有更多的状态下，显示内容为dot（粗点），加载特定样式 -->
+			<view class="u-line-1" :style="[loadTextStyle]" :class="[(status == 'nomore' && isDot == true) ? 'u-dot-text' : 'u-more-text']" @tap="loadMore">
+				{{ showText }}
+			</view>
+		</view>
+		<u-line color="#d4d4d4" length="50"></u-line>
+	</view>
+</template>
+
+<script>
+	/**
+	 * loadmore 加载更多
+	 * @description 此组件一般用于标识页面底部加载数据时的状态。
+	 * @tutorial https://www.uviewui.com/components/loadMore.html
+	 * @property {String} status 组件状态（默认loadmore）
+	 * @property {String} bg-color 组件背景颜色，在页面是非白色时会用到（默认#ffffff）
+	 * @property {Boolean} icon 加载中时是否显示图标（默认true）
+	 * @property {String} icon-type 加载中时的图标类型（默认circle）
+	 * @property {String} icon-color icon-type为circle时有效，加载中的动画图标的颜色（默认#b7b7b7）
+	 * @property {Boolean} is-dot status为nomore时，内容显示为一个"●"（默认false）
+	 * @property {String} color 字体颜色（默认#606266）
+	 * @property {String Number} margin-top 到上一个相邻元素的距离
+	 * @property {String Number} margin-bottom 到下一个相邻元素的距离
+	 * @property {Object} load-text 自定义显示的文字，见上方说明示例
+	 * @event {Function} loadmore status为loadmore时，点击组件会发出此事件
+	 * @example <u-loadmore :status="status" icon-type="iconType" load-text="loadText" />
+	 */
+	export default {
+		name: "u-loadmore",
+		props: {
+			// 组件背景色
+			bgColor: {
+				type: String,
+				default: 'transparent'
+			},
+			// 是否显示加载中的图标
+			icon: {
+				type: Boolean,
+				default: true
+			},
+			// 字体大小
+			fontSize: {
+				type: String,
+				default: '28'
+			},
+			// 字体颜色
+			color: {
+				type: String, 
+				default: '#606266'
+			},
+			// 组件状态，loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
+			status: {
+				type: String,
+				default: 'loadmore'
+			},
+			// 加载中状态的图标，flower-花朵状图标，circle-圆圈状图标
+			iconType: {
+				type: String,
+				default: 'circle'
+			},
+			// 显示的文字
+			loadText: {
+				type: Object,
+				default () {
+					return {
+						loadmore: '加载更多',
+						loading: '正在加载...',
+						nomore: '没有更多了'
+					}
+				}
+			},
+			// 在“没有更多”状态下，是否显示粗点
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			// 加载中显示圆圈动画时，动画的颜色
+			iconColor: {
+				type: String,
+				default: '#b7b7b7'
+			},
+			// 上边距
+			marginTop: {
+				type: [String, Number],
+				default: 0
+			},
+			// 下边距
+			marginBottom: {
+				type: [String, Number],
+				default: 0
+			},
+			// 高度，单位rpx
+			height: {
+				type: [String, Number],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				// 粗点
+				dotText: "●"
+			}
+		},
+		computed: {
+			// 加载的文字显示的样式
+			loadTextStyle() {
+				return {
+					color: this.color,
+					fontSize: this.fontSize + 'rpx',
+					position: 'relative',
+					zIndex: 1,
+					backgroundColor: this.bgColor,
+					// 如果是加载中状态，动画和文字需要距离近一点
+				}
+			},
+			// 加载中圆圈动画的样式
+			cricleStyle() {
+				return {
+					borderColor: `#e5e5e5 #e5e5e5 #e5e5e5 ${this.circleColor}`
+				}
+			},
+			// 加载中花朵动画形式
+			// 动画由base64图片生成，暂不支持修改
+			flowerStyle() {
+				return {
+				}
+			},
+			// 显示的提示文字
+			showText() {
+				let text = '';
+				if(this.status == 'loadmore') text = this.loadText.loadmore;
+				else if(this.status == 'loading') text = this.loadText.loading;
+				else if(this.status == 'nomore' && this.isDot) text = this.dotText;
+				else text = this.loadText.nomore;
+				return text;
+			}
+		},
+		methods: {
+			loadMore() {
+				// 只有在“加载更多”的状态下才发送点击事件，内容不满一屏时无法触发底部上拉事件，所以需要点击来触发
+				if(this.status == 'loadmore') this.$emit('loadmore');
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	/* #ifdef MP */
+	// 在mp.scss中，赋予了u-line为flex: 1，这里需要一个明确的长度，所以重置掉它
+	// 在组件内部，把组件名(u-line)当做选择器，在微信开发工具会提示不合法，但不影响使用
+	u-line {
+		flex: none;
+	}
+	/* #endif */
+	
+	.u-load-more-wrap {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.u-load-more-inner {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0 12rpx;
+	}
+	
+	.u-more {
+		position: relative;
+		@include vue-flex;
+		justify-content: center;
+	}
+	
+	.u-dot-text {
+		font-size: 28rpx;
+	}
+	
+	.u-loadmore-icon-wrap {
+		margin-right: 8rpx;
+	}
+	
+	.u-loadmore-icon {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+</style>
diff --git a/uview-ui/components/u-mask/u-mask.vue b/uview-ui/components/u-mask/u-mask.vue
new file mode 100644
index 0000000..0b55d9d
--- /dev/null
+++ b/uview-ui/components/u-mask/u-mask.vue
@@ -0,0 +1,123 @@
+<template>
+	<view class="u-mask" hover-stop-propagation :style="[maskStyle, zoomStyle]" @tap="click" @touchmove.stop.prevent="() => {}" :class="{
+		'u-mask-zoom': zoom,
+		'u-mask-show': show
+	}">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * mask 遮罩
+	 * @description 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景
+	 * @tutorial https://www.uviewui.com/components/mask.html
+	 * @property {Boolean} show 是否显示遮罩（默认false）
+	 * @property {String Number} z-index z-index 层级（默认1070）
+	 * @property {Object} custom-style 自定义样式对象，见上方说明
+	 * @property {String Number} duration 动画时长，单位毫秒（默认300）
+	 * @property {Boolean} zoom 是否使用scale对遮罩进行缩放（默认true）
+	 * @property {Boolean} mask-click-able 遮罩是否可点击，为false时点击不会发送click事件（默认true）
+	 * @event {Function} click mask-click-able为true时，点击遮罩发送此事件
+	 * @example <u-mask :show="show" @click="show = false"></u-mask>
+	 */
+	export default {
+		name: "u-mask",
+		props: {
+			// 是否显示遮罩
+			show: {
+				type: Boolean,
+				default: false
+			},
+			// 层级z-index
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			// 用户自定义样式
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 遮罩的动画样式， 是否使用使用zoom进行scale进行缩放
+			zoom: {
+				type: Boolean,
+				default: true
+			},
+			// 遮罩的过渡时间，单位为ms
+			duration: {
+				type: [Number, String],
+				default: 300
+			},
+			// 是否可以通过点击遮罩进行关闭
+			maskClickAble: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				zoomStyle: {
+					transform: ''
+				},
+				scale: 'scale(1.2, 1.2)'
+			}
+		},
+		watch: {
+			show(n) {
+				if(n && this.zoom) {
+					// 当展示遮罩的时候，设置scale为1，达到缩小(原来为1.2)的效果
+					this.zoomStyle.transform = 'scale(1, 1)';
+				} else if(!n && this.zoom) {
+					// 当隐藏遮罩的时候，设置scale为1.2，达到放大(因为显示遮罩时已重置为1)的效果
+					this.zoomStyle.transform = this.scale;
+				}
+			}
+		},
+		computed: {
+			maskStyle() {
+				let style = {};
+				style.backgroundColor = "rgba(0, 0, 0, 0.6)";
+				if(this.show) style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.mask;
+				else style.zIndex = -1;
+				style.transition = `all ${this.duration / 1000}s ease-in-out`;
+				// 判断用户传递的对象是否为空，不为空就进行合并
+				if (Object.keys(this.customStyle).length) style = { 
+					...style,
+					...this.customStyle
+				};
+				return style;
+			}
+		},
+		methods: {
+			click() {
+				if (!this.maskClickAble) return;
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		opacity: 0;
+		transition: transform 0.3s;
+	}
+
+	.u-mask-show {
+		opacity: 1;
+	}
+	
+	.u-mask-zoom {
+		transform: scale(1.2, 1.2);
+	}
+</style>
diff --git a/uview-ui/components/u-message-input/u-message-input.vue b/uview-ui/components/u-message-input/u-message-input.vue
new file mode 100644
index 0000000..41e0719
--- /dev/null
+++ b/uview-ui/components/u-message-input/u-message-input.vue
@@ -0,0 +1,311 @@
+<template>
+	<view class="u-char-box">
+		<view class="u-char-flex">
+			<input :disabled="disabledKeyboard" :value="valueModel" type="number" :focus="focus" :maxlength="maxlength" class="u-input" @input="getVal"/>
+			<view v-for="(item, index) in loopCharArr" :key="index">
+				<view :class="[breathe && charArrLength == index ? 'u-breathe' : '', 'u-char-item',
+				charArrLength === index && mode == 'box' ? 'u-box-active' : '',
+				mode === 'box' ? 'u-box' : '']" :style="{
+					fontWeight: bold ? 'bold' : 'normal',
+					fontSize: fontSize + 'rpx',
+					width: width + 'rpx',
+					height: width + 'rpx',
+					color: inactiveColor,
+					borderColor: charArrLength === index && mode == 'box' ? activeColor : inactiveColor
+				}">
+					<view class="u-placeholder-line" :style="{
+							display: charArrLength === index ? 'block' : 'none',
+							height: width * 0.5 +'rpx'
+						}"
+						v-if="mode !== 'middleLine'"
+					></view>
+					<view v-if="mode === 'middleLine' && charArrLength <= index" :class="[breathe && charArrLength == index ? 'u-breathe' : '', charArrLength === index ? 'u-middle-line-active' : '']"
+					 class="u-middle-line" :style="{height: bold ? '4px' : '2px', background: charArrLength === index ? activeColor : inactiveColor}"></view>
+					<view v-if="mode === 'bottomLine'" :class="[breathe && charArrLength == index ? 'u-breathe' : '', charArrLength === index ? 'u-buttom-line-active' : '']"
+					 class="u-bottom-line" :style="{height: bold ? '4px' : '2px', background: charArrLength === index ? activeColor : inactiveColor}"></view>
+					<block v-if="!dotFill"> {{ charArr[index] ? charArr[index] : ''}}</block>
+					<block v-else>
+						<text class="u-dot">{{ charArr[index] ? '●' : ''}}</text>
+					</block>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * messageInput 验证码输入框
+	 * @description 该组件一般用于验证用户短信验证码的场景，也可以结合uView的键盘组件使用
+	 * @tutorial https://www.uviewui.com/components/messageInput.html
+	 * @property {String Number} maxlength 输入字符个数（默认4）
+	 * @property {Boolean} dot-fill 是否用圆点填充（默认false）
+	 * @property {String} mode 模式选择，见上方"基本使用"说明（默认box）
+	 * @property {String Number} value 预置值
+	 * @property {Boolean} breathe 是否开启呼吸效果，见上方说明（默认true）
+	 * @property {Boolean} focus 是否自动获取焦点（默认false）
+	 * @property {Boolean} bold 字体和输入横线是否加粗（默认true）
+	 * @property {String Number} font-size 字体大小，单位rpx（默认60）
+	 * @property {String} active-color 当前激活输入框的样式（默认#2979ff）
+	 * @property {String} inactive-color 非激活输入框的样式，文字颜色同此值（默认#606266）
+	 * @property {String | Number} width 输入框宽度，单位rpx，高等于宽（默认80）
+	 * @property {Boolean} disabled-keyboard 禁止点击输入框唤起系统键盘（默认false）
+	 * @event {Function} change 输入内容发生改变时触发，具体见官网说明
+	 * @event {Function} finish 输入字符个数达maxlength值时触发，见官网说明
+	 * @example <u-message-input mode="bottomLine"></u-message-input>
+	 */
+	export default {
+		name: "u-message-input",
+		props: {
+			// 最大输入长度
+			maxlength: {
+				type: [Number, String],
+				default: 4
+			},
+			// 是否用圆点填充
+			dotFill: {
+				type: Boolean,
+				default: false
+			},
+			// 显示模式，box-盒子模式，bottomLine-横线在底部模式，middleLine-横线在中部模式
+			mode: {
+				type: String,
+				default: "box"
+			},
+			// 预置值
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// 当前激活输入item，是否带有呼吸效果
+			breathe: {
+				type: Boolean,
+				default: true
+			},
+			// 是否自动获取焦点
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			// 字体是否加粗
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 60
+			},
+			// 激活样式
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 未激活的样式
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 输入框的大小，单位rpx，宽等于高
+			width: {
+				type: [Number, String],
+				default: '80'
+			},
+			// 是否隐藏原生键盘，如果想用自定义键盘的话，需设置此参数为true
+			disabledKeyboard: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			// maxlength: {
+			// 	// 此值设置为true，会在组件加载后无需maxlength变化就会执行一次本监听函数，无需再created生命周期中处理
+			// 	immediate: true,
+			// 	handler(val) {
+			// 		this.maxlength = Number(val);
+			// 	}
+			// }, 
+			value: {
+				immediate: true,
+				handler(val) {
+					// 转为字符串
+					val = String(val);
+					// 超出部分截掉
+					this.valueModel = val.substring(0, this.maxlength);
+				}
+			},
+		},
+		data() {
+			return {
+				valueModel: ""
+			}
+		},
+		computed: {
+			// 是否显示呼吸灯效果
+			animationClass() {
+				return (index) => {
+					if (this.breathe && this.charArr.length == index) return 'u-breathe';
+					else return '';
+				}
+			},
+			// 用于显示字符
+			charArr() {
+				return this.valueModel.split('');
+			},
+			charArrLength() {
+				return this.charArr.length;
+			},
+			// 根据长度，循环输入框的个数，因为头条小程序数值不能用于v-for
+			loopCharArr() {
+				return new Array(this.maxlength);
+			}
+		},
+		methods: {
+			getVal(e) {
+				let {
+					value
+				} = e.detail
+				this.valueModel = value;
+				// 判断长度是否超出了maxlength值，理论上不会发生，因为input组件设置了maxlength属性值
+				if (String(value).length > this.maxlength) return;
+				// 未达到maxlength之前，发送change事件，达到后发送finish事件
+				this.$emit('change', value);
+				if (String(value).length == this.maxlength) {
+					this.$emit('finish', value);
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	@keyframes breathe {
+		0% {
+			opacity: 0.3;
+		}
+
+		50% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0.3;
+		}
+	}
+
+	.u-char-box {
+		text-align: center;
+	}
+
+	.u-char-flex {
+		@include vue-flex;
+		justify-content: center;
+		flex-wrap: wrap;
+		position: relative;
+	}
+
+	.u-input {
+		position: absolute;
+		top: 0;
+		left: -100%;
+		width: 200%;
+		height: 100%;
+		text-align: left;
+		z-index: 9;
+		opacity: 0;
+		background: none;
+	}
+
+	.u-char-item {
+		position: relative;
+		width: 90rpx;
+		height: 90rpx;
+		margin: 10rpx 10rpx;
+		font-size: 60rpx;
+		font-weight: bold;
+		color: $u-main-color;
+		line-height: 90rpx;
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.u-middle-line {
+		border: none;
+	}
+
+	.u-box {
+		box-sizing: border-box;
+		border: 2rpx solid #cccccc;
+		border-radius: 6rpx;
+	}
+
+	.u-box-active {
+		overflow: hidden;
+		animation-timing-function: ease-in-out;
+		animation-duration: 1500ms;
+		animation-iteration-count: infinite;
+		animation-direction: alternate;
+		border: 2rpx solid $u-type-primary;
+	}
+
+	.u-middle-line-active {
+		background: $u-type-primary;
+	}
+
+	.u-breathe {
+		animation: breathe 2s infinite ease;
+	}
+
+	.u-placeholder-line {
+		/* #ifndef APP-NVUE */
+		display: none;
+		/* #endif */
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		width: 2rpx;
+		height: 40rpx;
+		background: #333333;
+		animation: twinkling 1.5s infinite ease;
+	}
+
+	.u-animation-breathe {
+		animation-name: breathe;
+	}
+
+	.u-dot {
+		font-size: 34rpx;
+		line-height: 34rpx;
+	}
+
+	.u-middle-line {
+		height: 4px;
+		background: #000000;
+		width: 80%;
+		position: absolute;
+		border-radius: 2px;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.u-buttom-line-active {
+		background: $u-type-primary;
+	}
+
+	.u-bottom-line {
+		height: 4px;
+		background: #000000;
+		width: 80%;
+		position: absolute;
+		border-radius: 2px;
+		bottom: 0;
+		left: 50%;
+		transform: translate(-50%);
+	}
+</style>
diff --git a/uview-ui/components/u-modal/u-modal.vue b/uview-ui/components/u-modal/u-modal.vue
new file mode 100644
index 0000000..ce58113
--- /dev/null
+++ b/uview-ui/components/u-modal/u-modal.vue
@@ -0,0 +1,283 @@
+<template>
+	<view>
+		<u-popup :zoom="zoom" mode="center" :popup="false" :z-index="uZIndex" v-model="value" :length="width"
+		 :mask-close-able="maskCloseAble" :border-radius="borderRadius" @close="popupClose" :negative-top="negativeTop">
+			<view class="u-model">
+				<view v-if="showTitle" class="u-model__title u-line-1" :style="[titleStyle]">{{ title }}</view>
+				<view class="u-model__content">
+					<view :style="[contentStyle]" v-if="$slots.default  || $slots.$default">
+						<slot />
+					</view>
+					<view v-else class="u-model__content__message" :style="[contentStyle]">{{ content }}</view>
+				</view>
+				<view class="u-model__footer u-border-top" v-if="showCancelButton || showConfirmButton">
+					<view v-if="showCancelButton" :hover-stay-time="100" hover-class="u-model__btn--hover" class="u-model__footer__button"
+					 :style="[cancelBtnStyle]" @tap="cancel">
+						{{cancelText}}
+					</view>
+					<view v-if="showConfirmButton || $slots['confirm-button']" :hover-stay-time="100" :hover-class="asyncClose ? 'none' : 'u-model__btn--hover'"
+					 class="u-model__footer__button hairline-left" :style="[confirmBtnStyle]" @tap="confirm">
+						<slot v-if="$slots['confirm-button']" name="confirm-button"></slot>
+						<block v-else>
+							<u-loading mode="circle" :color="confirmColor" v-if="loading"></u-loading>
+							<block v-else>
+								{{confirmText}}
+							</block>
+						</block>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	/**
+	 * modal 模态框
+	 * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
+	 * @tutorial https://www.uviewui.com/components/modal.html
+	 * @property {Boolean} value 是否显示模态框
+	 * @property {String | Number} z-index 层级
+	 * @property {String} title 模态框标题（默认"提示"）
+	 * @property {String | Number} width 模态框宽度（默认600）
+	 * @property {String} content 模态框内容（默认"内容"）
+	 * @property {Boolean} show-title 是否显示标题（默认true）
+	 * @property {Boolean} async-close 是否异步关闭，只对确定按钮有效（默认false）
+	 * @property {Boolean} show-confirm-button 是否显示确认按钮（默认true）
+	 * @property {Stringr | Number} negative-top modal往上偏移的值
+	 * @property {Boolean} show-cancel-button 是否显示取消按钮（默认false）
+	 * @property {Boolean} mask-close-able 是否允许点击遮罩关闭modal（默认false）
+	 * @property {String} confirm-text 确认按钮的文字内容（默认"确认"）
+	 * @property {String} cancel-text 取消按钮的文字内容（默认"取消"）
+	 * @property {String} cancel-color 取消按钮的颜色（默认"#606266"）
+	 * @property {String} confirm-color 确认按钮的文字内容（默认"#2979ff"）
+	 * @property {String | Number} border-radius 模态框圆角值，单位rpx（默认16）
+	 * @property {Object} title-style 自定义标题样式，对象形式
+	 * @property {Object} content-style 自定义内容样式，对象形式
+	 * @property {Object} cancel-style 自定义取消按钮样式，对象形式
+	 * @property {Object} confirm-style 自定义确认按钮样式，对象形式
+	 * @property {Boolean} zoom 是否开启缩放模式（默认true）
+	 * @event {Function} confirm 确认按钮被点击
+	 * @event {Function} cancel 取消按钮被点击
+	 * @example <u-modal :src="title" :content="content"></u-modal>
+	 */
+	export default {
+		name: 'u-modal',
+		props: {
+			// 是否显示Modal
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 层级z-index
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			// 标题
+			title: {
+				type: [String],
+				default: '提示'
+			},
+			// 弹窗宽度，可以是数值(rpx)，百分比，auto等
+			width: {
+				type: [Number, String],
+				default: 600
+			},
+			// 弹窗内容
+			content: {
+				type: String,
+				default: '内容'
+			},
+			// 是否显示标题
+			showTitle: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示确认按钮
+			showConfirmButton: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示取消按钮
+			showCancelButton: {
+				type: Boolean,
+				default: false
+			},
+			// 确认文案
+			confirmText: {
+				type: String,
+				default: '确认'
+			},
+			// 取消文案
+			cancelText: {
+				type: String,
+				default: '取消'
+			},
+			// 确认按钮颜色
+			confirmColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 取消文字颜色
+			cancelColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 16
+			},
+			// 标题的样式
+			titleStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 内容的样式
+			contentStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 取消按钮的样式
+			cancelStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 确定按钮的样式
+			confirmStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 是否开启缩放效果
+			zoom: {
+				type: Boolean,
+				default: true
+			},
+			// 是否异步关闭，只对确定按钮有效
+			asyncClose: {
+				type: Boolean,
+				default: false
+			},
+			// 是否允许点击遮罩关闭modal
+			maskCloseAble: {
+				type: Boolean,
+				default: false
+			},
+			// 给一个负的margin-top，往上偏移，避免和键盘重合的情况
+			negativeTop: {
+				type: [String, Number],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				loading: false, // 确认按钮是否正在加载中
+			}
+		},
+		computed: {
+			cancelBtnStyle() {
+				return Object.assign({
+					color: this.cancelColor
+				}, this.cancelStyle);
+			},
+			confirmBtnStyle() {
+				return Object.assign({
+					color: this.confirmColor
+				}, this.confirmStyle);
+			},
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		watch: {
+			// 如果是异步关闭时，外部修改v-model的值为false时，重置内部的loading状态
+			// 避免下次打开的时候，状态混乱
+			value(n) {
+				if (n === true) this.loading = false;
+			}
+		},
+		methods: {
+			confirm() {
+				// 异步关闭
+				if (this.asyncClose) {
+					this.loading = true;
+				} else {
+					this.$emit('input', false);
+				}
+				this.$emit('confirm');
+			},
+			cancel() {
+				this.$emit('cancel');
+				this.$emit('input', false);
+				// 目前popup弹窗关闭有一个延时操作，此处做一个延时
+				// 避免确认按钮文字变成了"确定"字样，modal还没消失，造成视觉不好的效果
+				setTimeout(() => {
+					this.loading = false;
+				}, 300);
+			},
+			// 点击遮罩关闭modal，设置v-model的值为false，否则无法第二次弹起modal
+			popupClose() {
+				this.$emit('input', false);
+			},
+			// 清除加载中的状态
+			clearLoading() {
+				this.loading = false;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-model {
+		height: auto;
+		overflow: hidden;
+		font-size: 32rpx;
+		background-color: #fff;
+
+		&__btn--hover {
+			background-color: rgb(230, 230, 230);
+		}
+
+		&__title {
+			padding-top: 48rpx;
+			font-weight: 500;
+			text-align: center;
+			color: $u-main-color;
+		}
+
+		&__content {
+			&__message {
+				padding: 48rpx;
+				font-size: 30rpx;
+				text-align: center;
+				color: $u-content-color;
+			}
+		}
+
+		&__footer {
+			@include vue-flex;
+
+			&__button {
+				flex: 1;
+				height: 100rpx;
+				line-height: 100rpx;
+				font-size: 32rpx;
+				box-sizing: border-box;
+				cursor: pointer;
+				text-align: center;
+				border-radius: 4rpx;
+			}
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-navbar/u-navbar.vue b/uview-ui/components/u-navbar/u-navbar.vue
new file mode 100644
index 0000000..6edc11b
--- /dev/null
+++ b/uview-ui/components/u-navbar/u-navbar.vue
@@ -0,0 +1,333 @@
+<template>
+	<view class="">
+		<view class="u-navbar" :style="[navbarStyle]"
+			:class="{ 'u-navbar-fixed': isFixed, 'u-border-bottom': borderBottom }">
+			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
+			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
+				<view class="u-back-wrap" v-if="isBack" @tap="goBack">
+					<view class="u-icon-wrap">
+						<u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon>
+					</view>
+					<view class="u-icon-wrap u-back-text u-line-1" v-if="backText" :style="[backTextStyle]">
+						{{ backText }}</view>
+				</view>
+				<view class="u-navbar-content-title" v-if="title" :style="[titleStyle]">
+					<view class="u-title u-line-1" :style="{
+							color: titleColor,
+							fontSize: titleSize + 'rpx',
+							fontWeight: titleBold ? 'bold' : 'normal'
+						}">
+						{{ title }}
+					</view>
+				</view>
+				<view class="u-slot-content">
+					<slot></slot>
+				</view>
+				<view class="u-slot-right">
+					<slot name="right"></slot>
+				</view>
+			</view>
+		</view>
+		<!-- 解决fixed定位后导航栏塌陷的问题 -->
+		<view class="u-navbar-placeholder" v-if="isFixed && !immersive"
+			:style="{ width: '100%', height: Number(navbarHeight) + statusBarHeight + 'px' }"></view>
+	</view>
+</template>
+
+<script>
+	// 获取系统状态栏的高度
+	let systemInfo = uni.getSystemInfoSync();
+	let menuButtonInfo = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/**
+	 * navbar 自定义导航栏
+	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uniapp自带的导航栏。
+	 * @tutorial https://www.uviewui.com/components/navbar.html
+	 * @property {String Number} height 导航栏高度(不包括状态栏高度在内，内部自动加上)，注意这里的单位是px（默认44）
+	 * @property {String} back-icon-color 左边返回图标的颜色（默认#606266）
+	 * @property {String} back-icon-name 左边返回图标的名称，只能为uView自带的图标（默认arrow-left）
+	 * @property {String Number} back-icon-size 左边返回图标的大小，单位rpx（默认30）
+	 * @property {String} back-text 返回图标右边的辅助提示文字
+	 * @property {Object} back-text-style 返回图标右边的辅助提示文字的样式，对象形式（默认{ color: '#606266' }）
+	 * @property {String} title 导航栏标题，如设置为空字符，将会隐藏标题占位区域
+	 * @property {String Number} title-width 导航栏标题的最大宽度，内容超出会以省略号隐藏，单位rpx（默认250）
+	 * @property {String} title-color 标题的颜色（默认#606266）
+	 * @property {String Number} title-size 导航栏标题字体大小，单位rpx（默认32）
+	 * @property {Function} custom-back 自定义返回逻辑方法
+	 * @property {String Number} z-index 固定在顶部时的z-index值（默认980）
+	 * @property {Boolean} is-back 是否显示导航栏左边返回图标和辅助文字（默认true）
+	 * @property {Object} background 导航栏背景设置，见官网说明（默认{ background: '#ffffff' }）
+	 * @property {Boolean} is-fixed 导航栏是否固定在顶部（默认true）
+	 * @property {Boolean} immersive 沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效（默认false）
+	 * @property {Boolean} border-bottom 导航栏底部是否显示下边框，如定义了较深的背景颜色，可取消此值（默认true）
+	 * @example <u-navbar back-text="返回" title="剑未配妥，出门已是江湖"></u-navbar>
+	 */
+	export default {
+		name: "u-navbar",
+		props: {
+			// 导航栏高度，单位px，非rpx
+			height: {
+				type: [String, Number],
+				default: ''
+			},
+			// 返回箭头的颜色
+			backIconColor: {
+				type: String,
+				default: '#191919'
+			},
+			// 左边返回的图标
+			backIconName: {
+				type: String,
+				default: 'nav-back'
+			},
+			// 左边返回图标的大小，rpx
+			backIconSize: {
+				type: [String, Number],
+				default: '44'
+			},
+			// 返回的文字提示
+			backText: {
+				type: String,
+				default: ''
+			},
+			// 返回的文字的 样式
+			backTextStyle: {
+				type: Object,
+				default () {
+					return {
+						color: '#191919'
+					}
+				}
+			},
+			// 导航栏标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 标题的宽度，如果需要自定义右侧内容，且右侧内容很多时，可能需要减少这个宽度，单位rpx
+			titleWidth: {
+				type: [String, Number],
+				default: '250'
+			},
+			// 标题的颜色
+			titleColor: {
+				type: String,
+				default: '#191919'
+			},
+			// 标题字体是否加粗
+			titleBold: {
+				type: Boolean,
+				default: true
+			},
+			// 标题的字体大小
+			titleSize: {
+				type: [String, Number],
+				default: 34
+			},
+			isBack: {
+				type: [Boolean, String],
+				default: true
+			},
+			// 对象形式，因为用户可能定义一个纯色，或者线性渐变的颜色
+			background: {
+				type: Object,
+				default () {
+					return {
+						background: '#ffffff'
+					}
+				}
+			},
+			// 导航栏是否固定在顶部
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+			// 是否沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效
+			immersive: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示导航栏的下边框
+			borderBottom: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [String, Number],
+				default: ''
+			},
+			// 自定义返回逻辑
+			customBack: {
+				type: Function,
+				default: null
+			}
+		},
+		data() {
+			return {
+				menuButtonInfo: menuButtonInfo,
+				statusBarHeight: systemInfo.statusBarHeight
+			};
+		},
+		computed: {
+			// 导航栏内部盒子的样式
+			navbarInnerStyle() {
+				let style = {};
+				// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+				style.height = this.navbarHeight + 'px';
+				// // 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
+				// #ifdef MP
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.marginRight = rightButtonWidth + 'px';
+				// #endif
+				return style;
+			},
+			// 整个导航栏的样式
+			navbarStyle() {
+				let style = {};
+				style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.navbar;
+				// 合并用户传递的背景色对象
+				Object.assign(style, this.background);
+				return style;
+			},
+			// 导航中间的标题的样式
+			titleStyle() {
+				let style = {};
+				// #ifndef MP
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				// #endif
+				// #ifdef MP
+				// 此处是为了让标题显示区域即使在小程序有右侧胶囊的情况下也能处于屏幕的中间，是通过绝对定位实现的
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = rightButtonWidth - (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 +
+					rightButtonWidth +
+					'px';
+				// #endif
+				style.width = uni.upx2px(this.titleWidth) + 'px';
+				return style;
+			},
+			// 转换字符数值为真正的数值
+			navbarHeight() {
+				// #ifdef APP-PLUS || H5
+				return this.height ? this.height : 44;
+				// #endif
+				// #ifdef MP
+				// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
+				// 此方法有缺陷，暂不用(会导致少了几个px)，采用直接固定值的方式
+				// return menuButtonInfo.height + (menuButtonInfo.top - this.statusBarHeight) * 2;//导航高度
+				let height = systemInfo.platform == 'ios' ? 44 : 48;
+				return this.height ? this.height : height;
+				// #endif
+			}
+		},
+		created() {},
+		methods: {
+			goBack() {
+				// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
+				if (typeof this.customBack === 'function') {
+					// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+					// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+					this.customBack.bind(this.$u.$parent.call(this))();
+				} else {
+					const canNavBack = getCurrentPages()
+					//判断是否刷新了浏览器，刷新了浏览器，页面栈只有当前一个
+					if (canNavBack && canNavBack.length > 1) {
+						uni.navigateBack({
+							delta: 1
+						})
+					} else {
+						if (history.length > 1) {
+							history.back()
+						} else {
+							uni.switchTab({
+								url: '/pages/main/index/index'
+							})
+						}
+					}
+
+					// uni.navigateBack();
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-navbar {
+		width: 100%;
+	}
+
+	.u-navbar-fixed {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 991;
+	}
+
+	.u-status-bar {
+		width: 100%;
+	}
+
+	.u-navbar-inner {
+		@include vue-flex;
+		justify-content: space-between;
+		position: relative;
+		align-items: center;
+	}
+
+	.u-back-wrap {
+		@include vue-flex;
+		align-items: center;
+		flex: 1;
+		flex-grow: 0;
+		padding: 14rpx 14rpx 14rpx 24rpx;
+	}
+
+	.u-back-text {
+		padding-left: 4rpx;
+		font-size: 30rpx;
+	}
+
+	.u-navbar-content-title {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60rpx;
+		text-align: center;
+		flex-shrink: 0;
+	}
+
+	.u-navbar-centent-slot {
+		flex: 1;
+	}
+
+	.u-title {
+		line-height: 60rpx;
+		font-size: 32rpx;
+		flex: 1;
+	}
+
+	.u-navbar-right {
+		flex: 1;
+		@include vue-flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.u-slot-content {
+		flex: 1;
+		@include vue-flex;
+		align-items: center;
+	}
+</style>
diff --git a/uview-ui/components/u-no-network/u-no-network.vue b/uview-ui/components/u-no-network/u-no-network.vue
new file mode 100644
index 0000000..51d9f4f
--- /dev/null
+++ b/uview-ui/components/u-no-network/u-no-network.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="u-no-network" v-if="!isConnected" :style="{'z-index': uZIndex}" @touchmove.stop.prevent="() => {}">
+		<view class="u-inner">
+			<image class="u-error-icon" :src="image" mode="widthFix"></image>
+			<view class="u-tips">
+				{{tips}}
+			</view>
+			<!-- 只有APP平台，才能跳转设置页，因为需要调用plus环境 -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="u-to-setting">
+				请检查网络，或前往<text class="u-setting-btn" @tap="openSettings">设置</text>
+			</view>
+			<!-- #endif -->
+			<view class="u-retry" :hover-stay-time="150" @tap="retry" hover-class="u-retry-hover">
+				重试
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * noNetwork 无网络提示
+	 * @description 该组件无需任何配置，引入即可，内部自动处理所有功能和事件。
+	 * @tutorial https://www.uviewui.com/components/noNetwork.html
+	 * @property {String} tips 没有网络时的提示语（默认哎呀，网络信号丢失）
+	 * @property {String Number} zIndex 组件的z-index值（默认1080）
+	 * @property {String} image 无网络的图片提示，可用的src地址或base64图片
+	 * @event {Function} retry 用户点击页面的"重试"按钮时触发
+	 * @example <u-no-network></u-no-network>
+	 */
+	export default {
+		name: "u-no-network",
+		props: {
+			// 页面文字提示
+			tips: {
+				type: String,
+				default: '哎呀，网络信号丢失'
+			},
+			// 一个z-index值，用于设置没有网络这个组件的层次，因为页面可能会有其他定位的元素层级过高，导致此组件被覆盖
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			// image 没有网络的图片提示
+			image: {
+				type: String,
+				default: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAEYCAMAAABFglBLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6M0U3MjVFMzQwNEY1MTFFQUE4MTNDOUEzMTVBREMxQjIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6M0U3MjVFMzUwNEY1MTFFQUE4MTNDOUEzMTVBREMxQjIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozRTcyNUUzMjA0RjUxMUVBQTgxM0M5QTMxNUFEQzFCMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozRTcyNUUzMzA0RjUxMUVBQTgxM0M5QTMxNUFEQzFCMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PkHIU9QAAAMAUExURdHW2OWiou7u7tve4dnc3/vw8N3g4sPCwvjn5+jo6M7Q0u6+vtyEhPXY2Li+wuikpPXW1uXo6dba3Pbg4Na5u+qurqqyt/HJydjb3fjo6LrAxO7Bwey1td6MjOrs7fbc3OTn6Maytf7+/vz19eqqqrzCxvzz87a8wLO6vuqxsf78/PDFxenr7L/FyNTY26+2u/z09MjMzqy0udnZ2dvb27G4vMjN0O7v8P339+Ll5u3v8NDS1ODj5frt7bC3vP76+u24uOKamtTW2MTIy9zc3N7e3vPQ0OCTk8DGyfDDw9LR0c7S1LussNbY2fPOztLU1cLHyrK6vvji4vrv78bKzPX29/np6crP0vjk5Ozu78bLzuepqczR1MHFyMDEyOq1tfTS0vP09cLIy9DU173Ex8bGxvHy88/U18vO0LK4vM7OzsTKzcPJzPLMzM/T1sbMz8HJy+7FxbW8wNTW18XKzvb3+MjLzczP0d3e3+Dh4r3Dxtna29zd3rK5vdPU1cfM0Prq6uOenuPm58HGyfHz8/ro6Lq/w8nO0bzCxcrKytjZ2uXm5vTU1LvBxbW7v+rp6eefn/39/eLi4u3t7Ozs7Pj4+Pr6+vX19fHx8erq6vPz8+Xl5ff39+fn5/v7+/z8/PLx8fX09Pb29ri4uOTk5PHw8OPj4/Py8ubm5vn5+e3s7Pb19fTz8/f29tfX1+7t7cvQ0+zr6/Ly8u3t7fr5+efm5quzuOvq6vT19uvr6/j5+a61uuy6uvb39/T09Ojn5+jq6621uvn6+t/i5KyzuPn4+Le+wvv6+s3S1fj4+fDw8OHk5vv7/Pr7++Xk5LS7v7y8vObl5fz9/ff4+OTj48DEx8XJy+Hk5euysu/x8re9wfn5+v38/Pv8/Pr6++vt7uLi4+Pi4ubl5uXk5dPV1tbV1fHMzNPX2e7u7ejn6PT19fX19PDw7/b29f39/vnr6+Hh4a+3u+7t7q61uePi48PHyf35+enp6fLz9PPz8qmxtuDg4N/f3/Dv7////////1cfN/UAAAEAdFJOU////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wBT9wclAAAlqElEQVR42uydCXwUVZrAk5CEJBAQshACCGyjIRwBJR0It6JBGZZBkRtm5PBgFXAXHBghqAMz6LjGTrd9n7lvwn0JQhARxYNxVJTMwcwOM+7uzK6Z3VXcrnTXVr2q6q7urrvfq26c+n4egXTSVfXv993veym4JkklKdoj0IBoogHRgGiiAdGAaKIB0YBoogHRgGiiAdFEA6IBUVuwx+vqet/v1YAkhxwmcNT9gvjnsAYkGcT7eN1TtThe+1TdL2o1IEkg+rrvUV90MF9oQBIqv6ijF4a3d51XA5J4jVVXx3z587ojGpDEm/QwkO9pQJJB2CvksAYk8fJUXT31xZG63ppRTwI5QgcgR35Rd1MDkgxSX1f31P33P1V3i3u936HUyc3edWSsjuEakKRRW3r9kVv+JrRsrwbklpKTnXs+z0wfONOtAUm8rJu55oqfkZ0TOzUgCZS3Zh7s54+S5RqQhNGYMsnPISkakCSiQcjkNzUgasvUDaVsBF1fb9GXd//B0ziliPzjEA2IujLqGRaMST+cawgLNpn4q30aEDV1Va+dYRqzNy00RMoYUmdpQNTzcb8sCtuKH8w9Z4iWLuIbVzQgapmOBedDOO6c0WjgENK2vKwBUUUmvBSiUbrqxwZuOU18d5MGhEe/dI6a2WvIxA0HX1hfvH7V8gUpA9Mz3x/VuVTRLxvwdAhH5aJjBj4hv39QAxIl743ITHm6azBPnOCfVLwlc6pR3upYFbLjvIuDlEUqRYZo38JYS4gVt5rNZhMQO46byksoMeG4w8QIjtvMpJA/wP1EdZ0bKvkitkh555mBA3zSLnBlSFnNnlJvEJJ95ItW3pJAamvtZhy3m/T0g7fhthJGiG+EviYgmEJ/wHFP6GsbnlZSoicoucxmGwHVguPTBz543C9LHky/Jnql1w5KxWGo8KsThsAFYneYMOb5mlnP11ZCrwOPjfgGI8RqsZuZtUOsFmbllFhZP+zEbc8vGcqzMibv7qos3rd7Mg+TrQv2vCVkiLYcl4rDYLhKvi79FgFirDU7TPpyHHexINg9ZnOazWazyPxlVhsBzcKAKrl84cHo5zx758H0ASufWGrVBWkxup8YMepCespDV6Jfe3z9kOnc7/OjLydJx2FoJF983norAEkLqSbiw4+ZHGY7+UQhyYCDEZml8+ufzLz+RlBAPpieGYPloczYdaIb8rAMHAbD1yr5WHEBqTW7XIwZwEykBoIcrH3JrkgcL554PShRPpie/hDbE9v97oTIXz2zUhYOw0Lw4glJDMRiNtGrIo1AYUFwYZlsVbVzwyhfUJ4YO1MqWb/hsfRw6rzzPnk4DNlk2sQ/BU9aIGZaS2EOI6LLunBn+Fk+fWFpUJmcvPBSWH2dXz4A/OqTB2XiMBimgJf/NCmBGO0OykM1mW3ILur9cNq1cuATwbjk801htC8QcUQmk0NcIhWHoWKwPBdr9KwVuWvz//nVxYXIgTg9wCu1OZxGdJ+RacWhxNKazmD8snJL2DN44Z/oL/btMkgWsFr3Sr+BvmF5oP+fMpABMaaBSKHcgnTJ7tnLPLz1mW8E4ch76S9Hec47pOOgPCz/COm38EDfCEkdn4UCiNVDGg69Ay2OqSEFU7wnCFNGvcB2hHtk8Lhbdn/D6r7RMigLARDSbjgRW7QhTNBdeSEIW6ZPYXgUzZXBg3IB9n0o4y6+iAHS9/Zhc2ACMToIS27yoA5URzCe7ju9gigk5O767/sXqTz04PUPT5VzH31uv3f1o30eTb2djeQnr8IDkqYnLTlqMX7JfIAHeoOI5P3HmDSXRJv+8WC5BoQtZSv++SdhJMMgAbGSISDy1YEPYFzdJ91BhJL5Dv020sw6VdgdEMd9zfrTallERIE4ieWB2VDj+GALE1F3BtHKB0N209E/Js6Dyt28H+fNzbtXBhExIGaqiIHaetDLY/LAIHo5STtcs2+I8ZgNXtdLtqYadiY1NfXMsGEFob+QTkQEiIPwdJEvD7zX29Qj2jQ9qIqk087c1X8XzGBRL3pX9u3khZ2rsfOovyqgF8m8eIFYSjAjahxvLKdzsr2CaslK2p/rJ1BFP0ZXHvE4gJCxOsXgK4rIA7PiAkJYcidyHp1DqTufsi6ooqTQXREL+Xj8gY5PFdxRQWQM8kABi8igeIDYS+zItRX+Pm3NBwbVlVF0sSWHm8f/Ut8d40pTkJqIDgvzWUT+pByIhXCvkPPIpG78yij2w7K6/7PFiJrIe3QafjsXj266+Z1M3uld1jiB9B1L/m0uZVaWKQaClegtyM05nUf8ll1asr9Oihv5IhlCvfneWB4Y7WQ4HRhVhrN77DJ0dx75n4y8M/dGEukDvjyjFEhaSUka8moMdeMb2I9J92+vU/Jn5EToj8NQzp4fv/8FkEBwknkjFyjHyU7l5aWyg8Jx4E+3FyoEokevsOgezkjvyv46I1bkRKZR/m9RJI/7qct6ie3+0z1KLrmf0TwmF58bcr/GKwNiJ3t50ApdiBoVWQsP8Xjdjt60X6PC9vNsHrQmWxPlcaa5yPpDOeF4ii6Ugrxh8/LoqLCMzpw8UMYk5u9VBgQj3xup0LHAyshH1BIGElDB2dL1iybyCnVZWziu2GbGPDheTi4UQTt/hkJwhioWjg0rrXngq1eVADEityB0AuPNqCdkCQN5XRX/l0oAb43s+BEoSBmpDg/MzO/xMJkSyoCX0badwFMGMvKrlQCxlSPOuL9L3XjM87GqqrJIWUPlGikec6nLmiiYvqB8rxKXKJC+95KLhMIA6DwKlo4yo46WB138+DD2+QRCQP5TpRhxA9WFEtp0QESpojUJuwuokHIPl0GZF45A7iVNR35fhsNI8NVoGCVcJPEHV8NVaIn8RbWonSrubjQY6CKApI4fo9OKO8m4MZYJO5kFTDjlahHhyV3MF7KBODwofaxOqhD3U87HY6ECkb8YVQMSpPy9nDV+mfl2C+j8iGFSlpeXN+wBVt4kP6Sz7hVLn/ABQVoFWbeVy78Ke75/tgf+zx1UU7pYPSmZsu7FSTHhyPrl0yl4QmllUP1AjMv1qAIgGEIgur0c8UdiZWl4B8pM2fdDMNEbcTuWFs6ugCgkL1wDoWJ04ov55P9TFQAx8fsQccuahKR3RSokDI9pim7JQn6ECb+LUl15hFuVWsB4W6tDkQmxVnIfzV02DlcExISKBxUJrwkml9BVmT2Kb8sOfGG9w4pnADf39gzGmFPq6/bUM1K6SlN4a+moMlkDqERRkvHo56f8jAVx3JnVDDJerjOhDO8ZJiLMyJXa4pvCn+tFUys8CeznC8mF463TCk16jDkhwhMHneJdTZZAHlg9LLdMVgKcvzqFpm8UNO8O/W1S8fiW5WOVXo7v/qxp1tUhY15WJvvnU/iz7w50FZBRScVjBIXi9ELgaj0d9z0W3B6K0XF4QFxIgMykMndqPm4sm+5Mbf8om/MFM+kOFAzL8cPZ/FxAKK0HMnC4QKwoTMhvgQG587/UBPK93r3/mO1tr/h5794Y1/cH0lXkYCOGgW7sSZfjv9GMAsUqRChbg0hhdQZVBsIIFxC61YHwwrMxrGcMHKUVzyPij3VMethELoMOxYnBJALyULgJyYxh2CK/WhMbFKTfOdJZRmNcywdkVe/UJQ+QT+he+JmgmE8AwfbCUloIVJapJGaJuDFqu6fX6VAQN+6hevuDSQPkGtXjMJiaSGAjgVQUJVhpCQCxxS4RN3nNjsvN5P/kvxdocd+iMo/2x8NA/hi1o4reIERXZVrIu4LmaaEw6rFLBAChRVlRqus9lYE81ZslH7G/c4Hezhjqd6Du6zPQ+P1eMgKxxJSN4wHyVldIW6soFWwevR9vj+lbXB/+GxO4r12zJRVxEwGE3B1igwZkInmfz6rMw9w7Up7yRhbS/ctZL66nbmwjaDb+VTICMeqjmrPYQGS6WSfBB++6ujy8j0cB6V1BfcNH75GOyBlk03d2RaWp4vKB4M4SV8Rzb2YBkZlZeRIkt9VOU3mz/8jWWCVm6q9P0k166REvdtB3tgMYO28yAsEjNVYAY4usbPBUstxQejIBqUNvNm3XK8yh8iBVQj8/LfKVR5g7G5NAR0u0DcgaXiPuCB6YSc5naE0Cq7ZuoLhKwnt1qPCjK1p/hj5vwPXtZ0xKIFZ9yNMymiKBYM3S3+YJct7k0P9KDBBg2sPmnN4j9FhMU5gzdGf9FO2+VWeFOELhodsRBSS7RfLbbInV2GpKSe/eIYd3IsWDw9+zYRFLZGhyAiG7KRhLYnSGmcgambWOnIjw1x8lDIj35x9FdvJyuhcslbwPxsAAREAI35e1tc1IOVoyZ/uBtPu7CSwKMm13S5+lm6mDwkDAEtmUnEDInFZ5+Pl7SUtSL4/Hm2Ck24jEF2sn0NndzKAIEOw18mXTkxMIuZmKFQaSpq9F3pukgx34iefRixpl3cVTIWMDAWPLnkxSICzDDv6EBWS+yYP8n0o1ZQE9LOs/guJA9GRj0O5fJSkQ3ONhGxW5Xb/XQHLog0T3+tDFwSf5DQ3bhSxOkOcreX+IUXnz9RDVO004ZBQ1wfe4wEKNAHIDxCrJC8SIKZ+zAXbxTU8sj3S612dCUCIQDKRXOpMZiFIiU8Eg0ITi8NEDh559MygZyEbVjr9VqLIUE5mYcJM+9TG/lAa9SCA/JvsYd+uSFohyIo8l2qS/T022nvRcUA4QqpbbmbxAABEFe9fXJXo3CJ28qhQtjp3FYnXWl0kMBBDxyH4H0NvwfsJwvEcPKHhBfG754Ugg+oT4WbK2RRNE5E/8W8U1r0E1uV4pkLziq4ew61RvJTMQ3GiSzeM3pALfmSgemdTg3dLPpbw4LQrI18r3HKoFBETt8qCMApo4QTzoeVyPTZVWx4oCsohjKFDyAYnMNIoLaLeZkBAcJ+mjFpZ/KO31N6OAgCPUt6J9/uMgrBCCiIzRf8WcI2bUkE461z5E6g9kRwMBO3OXIgWiix8IOexa+jDGX05md2uqmmunttUWST+HpDkayEbkRkQHwYYArSU5RLwODgBUH4eOniPzoIwjrBqjgSxEfiDxXVCAgAH9EkPEXonJmzxBH5y0Rs5mlO5oIGA46XqUQArhAMEt+hK9tHlaz5D3NFVtHnSuXV6fizGGB0ZOZNwNmcE3rK9HwwJChIgSpzc9nAibTje2b5W3N6glFgiIKt9A51e9WAYLCDAlke6v2+l0x7zmLb/6Nv0kfWT9s/8h7+dssUDug3/iKpvH6Kw5EIFYIt3fNHJCXkP0i8CQnSmq8pi2VeEweXsskBz4Tb6PsL7+KksHc4VEuL9HqRmS0e2+M9XedvvLJ+nSoPytjGmxQBZGD1SO389lASnLehGHCYR0f/WM++umgBzlKk5NUzGXSB/V85KCLklHLBDgZu2D6laxBjzMyvoKLhDg/tojVkg0kCnqOlnp1FE9gxV1ETdj3G6WHyaQrHDkMScr6xHIQEj3lx6JojtB8jgRrRPBMbJela15pbIeSRMHkH2Q3azRWWG/6pGsrELYQHBLqBXb0mowtMbsGAF1aZWt+cG3FP04RxiCYeAM3W/hAXkx7FeNy8qCbUOogEQoZPeBU4NUteanlZ5k1cIFBAT816HxKMti+VWzCCKjoQMhR2xYeCskb6q285ax5sUrlf4GGxeQq2C6FzQgs7JY5+voCCDL4AMBm6wwnjzKNbVSi7Q19z+pfPqynQvIxvin/rGEMONsv+ougshdCICAww658/ET1CkXMta8NJ4zps1cQHKgDhEgzHjWuIgFk1WgQwAEBCScRPaospONseYPXYvnt7i4gNyAuiuBMCFZ7IMMSbteiAIIb4UkU4VpGow1j7Od28fFA3sFbqieQRD4JkppjUMBBAQkHESGoJ/HxFjzojjzAZw2HauAXBFZFmlF8K+ysjKQAAFEYjPyE5F3ODDWfFO854SmcQLBlJ72KaC0yqKU1hwkQHBLOUdTI2ogjDWHkL/08AOBWTPMiIoGC6OXCLyKsdEYu6kHMRDGmr8Tv1bkNiEUEKi7caOiwWVRVgXqCTtGLLr1FymQkDWfAqFRtVYAyAswgRBKq8AYocIilwhUIK7oJjqUQEbQ1vw8FLc6IABkCtwKFZsAGYkU4qiAUE10RnWA0JsM/A+thPLrsgWAHIRbVGfZ8W+yspaNxhECiSaCDAhzQj2saqSxWwAI3PZeMvZ4JGTiZ83BkQIBRKyRcQiCyfsDqQkA/p2wYPOZEAz+/ADSjH9Fub6/zspAkVyMlDR2GiUTSZvc1PVMbP5LWL/yshCQFMhGPWsW7VcVjsbRA8HtLKW1R1azs9RY8DzdxwBx6TULAZkI8/G8SNh0OqGo4zqMCkHnqt0aOiZ0AvyRAdfoM7/9774B75da+Hjsgj3PoSzGiqMHQloSWmtdg77hs9dfKRxXPof5W/mcXirbuwfik5n11RxcfSA2xo6AiuEqeA/u22eYWHAp1GXHq7HAgNKVEBeI6DEvaFaITV+it8GvqWeW0oUoyH6Cm48Htc0Q4pad0XhigITS8WTXyRVYmcSX6OXx9BOQ3YQ0XiCg2xreNIdxeKKAMETIvqzjcJ7ahSIKx2T4FUgXLxDyPUtxNQXZ/iCKCOhchOEOvUmPj/E/uBI6D36NBbZ9xjuddHOf/NvyZpUlGgjY1GOcCKmV9POtcFMlEjUWlIJhnyogdwxPMBCCiJPqfo87gHuDnu3q34nkPDF+jbVNaW7xxe/nz+9zT5/NuSsK8UEUkKrViQZC9tDNhBGqT6P3N/s3+FDwqOXXWBsVBeovzmMY0NJncd7aqqqErxAyaAfDPTfF9bys9H5afyWi80GP8ANRNKFpflW05BMBCIElCYBQg/Vmx7U8+jGZRB8aHsw5LlwCLNeH8pK5d8TwqFpLROgAS6KBEDwGx+dmrWOcq2JklXknPw/sbdlO1m1VHDISx/Oqql5NOBCmqKd8Wlavh+nYA+FBFzf5eSyUbdOXcfGoysLxV6uqFsMAUhgHD6D7qWMBFdY96EHt/k0IR5oKmHT5rdZzOHlUZeD4eMKGjP9+bt5XZfEBmaecB1A2Y7D/IWNdZWVBuu5R2iuIUMwCQEAma538kCNK+o/D8TPhPw26Z9jm3MVlioBk9f9GKQ/w6X6t2wB6QxS0FU4oZhK736LkYRXgATa0SRrPNKdwVsHikbfN414gY4lXEI5wlC88TwGQWf0l+mqxAh5n0e8MBqC4ZG8T+JAePebvQtyqnSYEZLbEpqzRVYJCPsPUqjuIwCxj8W35Zxgwt8kFMgs41HfcVqh0fexuNBgMPUoikWlDmbLgJ2h5+BoFeGwTGRsw7pGfzXqksOybccuEgYwnXkrEhbmLmVp62bKR8+4gCclcIYWkSpyvhAc4pLy0HuyUniQ7Ell6EHEoKKG5ITRYg7s6tTi/zxf9IxTQq7l5+TxACOWUQX2VOmj4/M0jV5CP9J6qKgU2pA/pQitIIYNw8A/U1vWdcvOLmVdQh4Lhdqx6ISCkh1jJSaN/zEMn9+GM5QFCPMOsyL9JHTSIL3IXBvLNWMXx+WkXxcOQI28X1ROrkIeCYbEL8bjBPUh57SCuhz6aUCh8KmsFjo8kgpGR88afGcRC+aIStzdLAQ+QUDzfTPMwgBT2UMk9PpPQh4Ih0bkwMad3RPTqGA4e5j3z543MKsTLCr9akZe7lvg7XcwqiAhDCP+LVv3Gwp+NXDu+zz19limKQxR4veCU8sHnDCEplX4I7oi9KoSCYTmMiWmsqDknZePJBzxoc5RdvYPwffILeIGMIxOOqRILwdBTJ0ujeRhWST2i7Q36BGf/FZVmAjYL8QBTezdE3NsK0krMXxFzz6nguX/Bw4P0poZXDUpQxfA34Ika2AIc39m/EU9cMVXBd1UaTC68QH4Qk3pfS64OLi/nrs2DBLze4WAN3ZMgICBZ3h0BxCDpZPsJDzHGvFMdHEGfoIuFkZq2KyKNRFY2+DIeGd8fzgdkGI7rQDCiHEhq3zyFPECnzsJIHoZF4t1ZS5ki7Wz1zmc9IsgDtMhtieKRK3TvGf25gXwfOGDzEgLkS5B8iuJh+HdwOrPQrv703TSP5T9VjYdbkAd1PvGASB4iPudm3jCkQIQlKiAgAFliiJEfCPeLDHiMicxVnD0nVAchZAZ5PXdG8hB7KDwprSwQhqxIAJALYItZLA8qFCni69dlioLHv/SpyMMpvEBeZuexRhf0qZKidIbxhSGEO7D6izP580b+7C4VgVwnNdNOA5dc4e0G0g2k29n9z65UEYdI0gRbSJaeS98bnZW7edjw1ULp8oiokS8MYWW5+o89k782L0MFIB+SbaNdn3ICyeGbmzXtThrHVpXHkacJLxAQpf8920rPl/IMcrmAgJxg6qD+MSl5xEBIzXO6gpOH4V/e5jwueuoUpuq+5RN1ediEeVSQlRB/6k8ifFdJbaOxPMiI8AsQHZbNyruNWHBUW8pmSUCG9Y0UuQZ9roFHXuY4XPKTlLeZft1OdXEEjc3CQLaTV/UPgMegM+PX5r0otTMXj40QiYgw2L9q+G15BYVGJp21bBBP8l0ciKkEc5md4oP3J5D7Ynfw8TD0DI6xIr2YLHtRr6DaIqKwekBrxt/l5y5+ZJxcRXEHR3mqMFROH94n/9W8grtI869QZZlKgOC4RfAMl/fIEt99Bn75LGoI/LTHQtpK/RPcRBQWtgQUjxVuC5kf2yXHVVEcpBCI0+whmJhIMnqX2SIUoe8T4GFofJu9Q3olU/Twr5da9bCeaq4/ZVVFYeknxbX3dmTkIskDXXLLRv9s5GZ2lTEvHqNuIVQWtVL0rjQu9UUe2zK5QgiIAXzqroAZlUuZqTH+rZK11ZGSDlJOqaCwqLRivw8U5/PmrJg3PKKW+GqoGoIbM1bk5vNXQ2R4WUanmVJf5QSgqLGwb5DmYIYgD8O5SXQjvG7IwwyPJ92SeXSUHLG5D3d3ZMfP46wID9Db4L8QX5J1DvHcCYcqtaqqjAxD+ku2RfLcXqcDI0eLl5eYIrQXWUPfaxARkK3764/er2RwbLou+RlaS0qoKL67wxZ3J1ajCJBKiEPLxlZV5S6b00dyNURBHGK04lZKe3ns9EKZSnhYRY1iQAwggcjUPPxdciLBU8zKsMW/RG6K8ABBLKxTXFaHfV+UuSxLGu18UYP4p3Ck3Dnkhj8sk76U1RHf2HGY/qqjG7EBoU7AhTUASFacH1eByuj0lIOj2vSeCt4UVpSMYXAc3yKztzSsqTrK0Xq8GNhiNHsdJCB3FYxcm39mbP985ECohWLFnSUlr5HGWgKPuUwacbnsXaCnGPfK3dEcFw9vvZhFf5t/lrWvZX9bTXtN2/4WI45M4i3hWhxkz36xOI5tTGB+XsHESlvH/ZRRbw7pLmXiEFsg4MCQSo4H7mtrCISlyf3rJAVCtY1WiOFY1BW2H0qG0WR39DiJ9dHc0YjWgIBoieM4BF9bIFpsviQFUuT3fyZM419n0NZjE7V/c4/8J+nLBnFhR2NcNazDYjxuHOceWHaxIRArDZakBDJCLCbsuXs2jWMAvYunn5JRPrbm8vLm+PRVbbcYEFBI3xmjsNoC3FKTfECMblJjYfw4Fv7QH8aB4yeBJbkvmAixihl06viW2BCkJhBQj0hcQIy1DQHiQ1XKr6v6ReDA6SmMkvoYoTfy3hRVWIM5k4r8PFAQiQdISzVxSZOIKJ0bh/4qrav8q1hWcoEfxRxGCWIW41HxGqiiRd+lOyAkliQCYgNXtIm4iX/lshyv0TRKNzxHxPSYyWQ2m624zUQtmglq87gsxoNqNDk/PeouvYI8Ag2+pAFCr+QhHJXbj3P6hVJWMz7BXSWM2PC0kudB2vevKvOwi/L42s+5g61GGEjAnSxAqukL+u/TZLOiJwTjd6/k3BkKOR6kktg2p9lsMplIIBaTB0z6lL5jRCUeVL/Flujb1DWIADmcJEDCVwQ+WVt/uGrGK4vu/uzK8XAA2O/gcwHOYvxAv1qHt0ktgdCdiv5VsZmIgJhcSgog1eELat7n55DXCBqEVHNmfabEN3ADdhsvc9aUv99vcakhCDKzrgxIxGW2boqmMXvKc8J+IVWkUqv5xyvKo4e6bo4zVp2iQNqSAEhL1DXt6sdoquNjijfO7WF/7yLnb6B2Eg5QB4gojwrq4kdwXGiDKJD22qPGRANpirmqtN/p5y6Y23Mz9nqrObtpPvErzWrJ7zER5UF5GdxTZsSBgOTvfl8igbQE5IibNwWG4uQEBfpqG12l4bzOdqm32WTRJQxIkywg3EsEX+lXJWRvkehf8Z2NVyvjRlsSBMQbCEBYIgwRtCfl1oryyBHkIZI4iTYn1oQAccsEwpeAu049igUJjT9oHg/x3ayuGsaHDy2QdplAmiJ/PGj0tlzcX1vjbHqOHojlS1x8vsPPExDKiAzhpn9TkC+QQMBIczhqqa1pYrstP6bVxTU0PMTziVQBRPD04aA8ixk4qzIQd4NsHoH9be127u/QAcBuJO7vETEc99NNlNsD1U02t+WSl9P9sMq824tqArFWB+BKuh+ZsyVaj3qePm5hIyuZXt3edtEbFeftl3lPLeoBsQagyy66iLUcsiER23KAYRup/VvHb3AUOZra3Faj5Ax8tPjUAoKARyDg2onCkLSYpJU//F2ZAt5IzX4qKyIvEo4vu5WSYB6E7IBvSEQbRrfRKeq9N8Xjvfb9Vp88z9KqChBjNSIggSG7IRsS0f6rq3Qy9CCaGzqrChB3AJl4imHuxtWJuVeL6L690iGobsioAhBvAKGkMXNID8Y/NdniEXF2mal1O/cgux+3CkBqYDNoPXTCcO5Ys6vR1N3T05Pzj3RtK1695RRpT8yh9ePg7R97bjpOHTqQhgBIkwpAYFiQtLTWU4bsY/UAQZTod4Y+uAjbqRcy77Lv+fBbY6ZPXceyDYda4bHRIQeii+PqDhxyZHtc9SasR1BymA09Uy4r9nazhSvnewfTM0+381xDN4HGk+2IG40POZBLirTSiXMff2rqkSxLJtPPa+I6ZepKcD+n/ip93IJ/aIfopXSbXMcMJw4oBWJFDkSej3Uo+9hHjViPbAlplMkHR8gPzgXVVcVVeiKw//RGGVfU3ejKdhySDcSCHIjkYLU122XqUS4hveXfJLNNyCY4FfluZoigf+cr8q8Kazwmb7W0IAcixes9YDhWj/XEK4ze8vsr038lvXQu1Et9Y28p8ztfvqH4wro/zj4k1bZ4UQMRT/Meajb1wJGFn4XaH3dvkJjhcvLv/dh2X5EfAg56qXya3Yo2MpQE5NJZkfc/kv37HojySmgjg99fPFF84IP1FK+bu2RMuH9v6AwoV1cvnv8KII1DdCLtlAeyG3tgS8VG1oPsWiPcUXeYx7natqSfHzoOsE6aDyEr5IoD0YnE6AdMPUgkZyjraZ5+9sKHfKkSzq3O5TP27mb//M4cuFeXjapGJQrEKFKzTUPEg5Btn01mdwwXb8mcaozJJHL5uq/cvW8w+yf3bbwf+sUZhHbx6NAB8Ylpy/oehLLr7n3HI/u433lm4ADWJt6zUb7urhnbPxtzOuInti5ZiOTaHGgqVGJARHsabvagFf3GyvPR3fWTitevWr4gZeCQRTk5i2bMyMnZsfHu7UvuG7p7cPQr//EHixBdVz2/B9xgRAdEQo63uQe55Oyc5Jcvx4du34bskrAjiLrlUuJTWKAq3qOC3Pi66G05NIq+noHycrpPCGxyM6IDclRatsRjUoNJzyszrr5cJM5idtdnO/QorwNzOQQidrsXRwdEcu/3oWPdPSrJwh1Xh75WenpwLInzr+28mtNRjvj9G88JxuqX42y4hgSEEEezqUdN+fGujudzNm6/umT7jpxFNzp26cvRvyfWKBYSBuLdkwBDZYVjRIenvrvnOyom102zeG4RcbO1LyBfWh3HTN8xFli9R2r23YcWiIRdwTxr5US2x2XCbnkSja7sm6dk1HPR7w+Jr7chrdVwrrnx1tNimMnluXmiVf4No99BZYTU83PK4DnmakzuNUN1n5xoVVxJDxxVYUubDnIH6QGyEaj5o0ZTd7JQaPyo+ZzhBIweoP3qbPrcH0AkaQdaTzhuZje7Pvp9dzemJoJ6V3O24QTMRiyyKxvKXnUpFcOWhoAKQuA5dOqEw3DznOeY51jzx/WfNv7eZDJhCklh3SZTIyHEsz/mOZd97qbBceIUZATQl4fUEq6xLZBgSUsj/jlwgPz3QOuR1gOtrYcOmQ8R/xL/aW09YCb+Jb+bRvwLXqy6tMMaryGxycFbE9BEQFu14Li6QIigvUl77rzaKoirDwTHL9VWa8+eQ1lZoE6Cl7Xp03ixXQMQue8A+gx4ufvUfW5NdYVo7Pfi0EXBaA2f+6wGI1CNggaudMSfz1LT8LdMo8F2VIfjSQSETKlY3c6/TRg1Fm8QRyZxzX7XWff/bVkUe02LD0crcR9XQayUs5f/JoxG21Ejjl5SoPwWn8V2+LsM43AbMpuBBggIUryWtvbvnqmvrnFb1YIBFwitwbwXbd8Nu1Ld3ub2GnG1JQXJbzVesrQ1NdzCi6IlAShQArlFlViCFoVqQCgBwxb31ziTNzNZ3VTT5j7q9enwJJAUFd/L6LNe3G9rr06SRWNvt+23WL3GpOCQECBhy++71OJuO9vU1KA2m4aGJnI5XEyS5ZAsQNgKTWf0ei+1XHTXtp1tPwx98Vyurm5vt7W53S0tl7y/1iUrhSQCErt6dD6f9WiLez8ptbU2Ww0p7U5nEyHVhNiZZdVgJ/9YTfy10+lsBy+z2WpryZ9zW45avT6jLojfcpKCa6IB0UQDogHRRAOiAdFEA6IB0UQDogHRRAOiiQZEA6KJBuTWl/8XYADnNmjWHFGctAAAAABJRU5ErkJggg=="
+			}
+		},
+		data() {
+			return {
+				isConnected: true, // 是否有网络连接
+				networkType: "none", // 网络类型
+			}
+		},
+		computed: {
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.noNetwork;
+			}
+		},
+		mounted() {
+			this.isIOS = (uni.getSystemInfoSync().platform === 'ios');
+			uni.onNetworkStatusChange((res) => {
+				this.isConnected = res.isConnected;
+				this.networkType = res.networkType;
+			});
+			uni.getNetworkType({
+				success: (res) => {
+					this.networkType = res.networkType;
+					if (res.networkType == 'none') {
+						this.isConnected = false;
+					} else {
+						this.isConnected = true;
+					}
+				}
+			});
+		},
+		methods: {
+			retry() {
+				// 重新检查网络
+				uni.getNetworkType({
+					success: (res) => {
+						this.networkType = res.networkType;
+						if (res.networkType == 'none') {
+							uni.showToast({
+								title: '无网络连接',
+								icon: 'none',
+								position: 'top'
+							})
+							this.isConnected = false;
+						} else {
+							uni.showToast({
+								title: '网络已连接',
+								icon: 'none',
+								position: 'top'
+							})
+							this.isConnected = true;
+						}
+					}
+				});
+				this.$emit('retry');
+			},
+			async openSettings() {
+				if (this.networkType == "none") {
+					this.openSystemSettings();
+					return;
+				}
+			},
+			openAppSettings() {
+				this.gotoAppSetting();
+			},
+			openSystemSettings() {
+				// 以下方法来自5+范畴，如需深究，请自行查阅相关文档
+				// https://ask.dcloud.net.cn/docs/
+				if (this.isIOS) {
+					this.gotoiOSSetting();
+				} else {
+					this.gotoAndroidSetting();
+				}
+			},
+			network() {
+				var result = null;
+				var cellularData = plus.ios.newObject("CTCellularData");
+				var state = cellularData.plusGetAttribute("restrictedState");
+				if (state == 0) {
+					result = null;
+				} else if (state == 2) {
+					result = 1;
+				} else if (state == 1) {
+					result = 2;
+				}
+				plus.ios.deleteObject(cellularData);
+				return result;
+			},
+			gotoAppSetting() {
+				if (this.isIOS) {
+					var UIApplication = plus.ios.import("UIApplication");
+					var application2 = UIApplication.sharedApplication();
+					var NSURL2 = plus.ios.import("NSURL");
+					var setting2 = NSURL2.URLWithString("app-settings:");
+					application2.openURL(setting2);
+					plus.ios.deleteObject(setting2);
+					plus.ios.deleteObject(NSURL2);
+					plus.ios.deleteObject(application2);
+				} else {
+					var Intent = plus.android.importClass("android.content.Intent");
+					var Settings = plus.android.importClass("android.provider.Settings");
+					var Uri = plus.android.importClass("android.net.Uri");
+					var mainActivity = plus.android.runtimeMainActivity();
+					var intent = new Intent();
+					intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+					var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+					intent.setData(uri);
+					mainActivity.startActivity(intent);
+				}
+			},
+			gotoiOSSetting() {
+				var UIApplication = plus.ios.import("UIApplication");
+				var application2 = UIApplication.sharedApplication();
+				var NSURL2 = plus.ios.import("NSURL");
+				var setting2 = NSURL2.URLWithString("App-prefs:root=General");
+				application2.openURL(setting2);
+				plus.ios.deleteObject(setting2);
+				plus.ios.deleteObject(NSURL2);
+				plus.ios.deleteObject(application2);
+			},
+			gotoAndroidSetting() {
+				var Intent = plus.android.importClass("android.content.Intent");
+				var Settings = plus.android.importClass("android.provider.Settings");
+				var mainActivity = plus.android.runtimeMainActivity();
+				var intent = new Intent(Settings.ACTION_SETTINGS);
+				mainActivity.startActivity(intent);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-no-network {
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.u-inner {
+		height: 100vh;
+		@include vue-flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		margin-top: -15%;
+	}
+
+	.u-tips {
+		color: $u-tips-color;
+		font-size: 28rpx;
+		padding: 30rpx 0;
+	}
+
+	.u-error-icon {
+		width: 300rpx;
+	}
+
+	.u-to-setting {
+		color: $u-light-color;
+		font-size: 26rpx;
+	}
+
+	.u-setting-btn {
+		font-size: 26rpx;
+		color: $u-type-primary;
+	}
+
+	.u-retry {
+		margin-top: 30rpx;
+		border: 1px solid $u-tips-color;
+		color: $u-tips-color;
+		font-size: 28rpx;
+		padding: 6rpx 30rpx;
+		border-radius: 3px;
+	}
+
+	.u-retry-hover {
+		color: #fff;
+		background-color: $u-tips-color;
+	}
+</style>
diff --git a/uview-ui/components/u-notice-bar/u-notice-bar.vue b/uview-ui/components/u-notice-bar/u-notice-bar.vue
new file mode 100644
index 0000000..41a6cc4
--- /dev/null
+++ b/uview-ui/components/u-notice-bar/u-notice-bar.vue
@@ -0,0 +1,272 @@
+<template>
+	<view class="u-notice-bar-wrap" v-if="isShow" :style="{
+		borderRadius: borderRadius + 'rpx',
+	}">
+		<block v-if="mode == 'horizontal' && isCircular">
+			<u-row-notice
+				:type="type"
+				:color="color"
+				:bgColor="bgColor"
+				:list="list"
+				:volumeIcon="volumeIcon"
+				:moreIcon="moreIcon"
+				:volumeSize="volumeSize"
+				:closeIcon="closeIcon"
+				:mode="mode"
+				:fontSize="fontSize"
+				:speed="speed"
+				:playState="playState"
+				:padding="padding"
+				@getMore="getMore"
+				@close="close"
+				@click="click"
+			></u-row-notice>
+		</block>
+		<block v-if="mode == 'vertical' || (mode == 'horizontal' && !isCircular)">
+			<u-column-notice
+				:type="type"
+				:color="color"
+				:bgColor="bgColor"
+				:list="list"
+				:volumeIcon="volumeIcon"
+				:moreIcon="moreIcon"
+				:closeIcon="closeIcon"
+				:mode="mode"
+				:volumeSize="volumeSize"
+				:disable-touch="disableTouch"
+				:fontSize="fontSize"
+				:duration="duration"
+				:playState="playState"
+				:padding="padding"
+				@getMore="getMore"
+				@close="close"
+				@click="click"
+				@end="end"
+			></u-column-notice>
+		</block>
+	</view>
+</template>
+<script>
+/**
+ * noticeBar 滚动通知
+ * @description 该组件用于滚动通告场景，有多种模式可供选择
+ * @tutorial https://www.uviewui.com/components/noticeBar.html
+ * @property {Array} list 滚动内容，数组形式，见上方说明
+ * @property {String} type 显示的主题（默认warning）
+ * @property {Boolean} volume-icon 是否显示小喇叭图标（默认true）
+ * @property {Boolean} more-icon 是否显示右边的向右箭头（默认false）
+ * @property {Boolean} close-icon 是否显示关闭图标（默认false）
+ * @property {Boolean} autoplay 是否自动播放（默认true）
+ * @property {String} color 文字颜色
+ * @property {String Number} bg-color 背景颜色
+ * @property {String} mode 滚动模式（默认horizontal）
+ * @property {Boolean} show 是否显示（默认true）
+ * @property {String Number} font-size 字体大小，单位rpx（默认28）
+ * @property {String Number} volume-size 左边喇叭的大小（默认34）
+ * @property {String Number} duration 滚动周期时长，只对步进模式有效，横向衔接模式无效，单位ms（默认2000）
+ * @property {String Number} speed 水平滚动时的滚动速度，即每秒移动多少距离，只对水平衔接方式有效，单位rpx（默认160）
+ * @property {String Number} font-size 字体大小，单位rpx（默认28）
+ * @property {Boolean} is-circular mode为horizontal时，指明是否水平衔接滚动（默认true）
+ * @property {String} play-state 播放状态，play - 播放，paused - 暂停（默认play）
+ * @property {String Nubmer} border-radius 通知栏圆角（默认为0）
+ * @property {String Nubmer} padding 内边距，字符串，与普通的内边距css写法一直（默认"18rpx 24rpx"）
+ * @property {Boolean} no-list-hidden 列表为空时，是否显示组件（默认false）
+ * @property {Boolean} disable-touch 是否禁止通过手动滑动切换通知，只有mode = vertical，或者mode = horizontal且is-circular = false时有效（默认true）
+ * @event {Function} click 点击通告文字触发，只有mode = vertical，或者mode = horizontal且is-circular = false时有效
+ * @event {Function} close 点击右侧关闭图标触发
+ * @event {Function} getMore 点击右侧向右图标触发
+ * @event {Function} end 列表的消息每次被播放一个周期时触发，只有mode = vertical，或者mode = horizontal且is-circular = false时有效
+ * @example <u-notice-bar :more-icon="true" :list="list"></u-notice-bar>
+ */
+export default {
+	name: "u-notice-bar",
+	props: {
+		// 显示的内容，数组
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 显示的主题，success|error|primary|info|warning
+		type: {
+			type: String,
+			default: 'warning'
+		},
+		// 是否显示左侧的音量图标
+		volumeIcon: {
+			type: Boolean,
+			default: true
+		},
+		// 音量喇叭的大小
+		volumeSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 是否显示右侧的右箭头图标
+		moreIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示右侧的关闭图标
+		closeIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动播放
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 文字颜色，各图标也会使用文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: ''
+		},
+		// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
+		mode: {
+			type: String,
+			default: 'horizontal'
+		},
+		// 是否显示
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 28
+		},
+		// 滚动一个周期的时间长，单位ms
+		duration: {
+			type: [Number, String],
+			default: 2000
+		},
+		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+		speed: {
+			type: [Number, String],
+			default: 160
+		},
+		// 水平滚动时，是否采用衔接形式滚动
+		// 水平衔接模式，采用的是swiper组件，水平滚动
+		isCircular: {
+			type: Boolean,
+			default: true
+		},
+		// 播放状态，play-播放，paused-暂停
+		playState: {
+			type: String,
+			default: 'play'
+		},
+		// 是否禁止用手滑动切换
+		// 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
+		disableTouch: {
+			type: Boolean,
+			default: true
+		},
+		// 滚动通知设置圆角
+		borderRadius: {
+			type: [Number, String],
+			default: 0
+		},
+		// 通知的边距
+		padding: {
+			type: [Number, String],
+			default: '18rpx 24rpx'
+		},
+		// list列表为空时，是否显示组件
+		noListHidden: {
+			type: Boolean,
+			default: true
+		}
+	},
+	computed: {
+		// 如果设置show为false，或者设置了noListHidden为true，且list长度又为零的话，隐藏组件
+		isShow() {
+			if(this.show == false || (this.noListHidden == true && this.list.length == 0)) return false;
+			else return true;
+		}
+	},
+	methods: {
+		// 点击通告栏
+		click(index) {
+			this.$emit('click', index);
+		},
+		// 点击关闭按钮
+		close() {
+			this.$emit('close');
+		},
+		// 点击更多箭头按钮
+		getMore() {
+			this.$emit('getMore');
+		},
+		// 滚动一个周期结束，只对垂直，或者水平步进形式有效
+		end() {
+			this.$emit('end');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-notice-bar-wrap {
+	overflow: hidden;
+}
+
+.u-notice-bar {
+	padding: 18rpx 24rpx;
+	overflow: hidden;
+}
+
+.u-direction-row {
+	@include vue-flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.u-left-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-notice-box {
+	flex: 1;
+	@include vue-flex;
+	overflow: hidden;
+	margin-left: 12rpx;
+}
+
+.u-right-icon {
+	margin-left: 12rpx;
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-notice-content {
+	line-height: 1;
+	white-space: nowrap;
+	font-size: 26rpx;
+	animation: u-loop-animation 10s linear infinite both;
+	text-align: right;
+	// 这一句很重要，为了能让滚动左右连接起来
+	padding-left: 100%;
+}
+
+@keyframes u-loop-animation {
+	0% {
+		transform: translate3d(0, 0, 0);
+	}
+
+	100% {
+		transform: translate3d(-100%, 0, 0);
+	}
+}
+</style>
diff --git a/uview-ui/components/u-number-box/u-number-box.vue b/uview-ui/components/u-number-box/u-number-box.vue
new file mode 100644
index 0000000..54a679e
--- /dev/null
+++ b/uview-ui/components/u-number-box/u-number-box.vue
@@ -0,0 +1,363 @@
+<template>
+	<view class="u-numberbox">
+		<view class="u-icon-minus" @touchstart.stop.prevent="btnTouchStart('minus')" @touchend.stop.prevent="clearTimer" :class="{ 'u-icon-disabled': disabled || inputVal <= min }"
+		    :style="{
+				background: bgColor,
+				height: inputHeight + 'rpx',
+				color: color
+			}">
+			<u-icon name="minus" :size="size"></u-icon>
+		</view>
+		<input :disabled="disabledInput || disabled" :cursor-spacing="getCursorSpacing" :class="{ 'u-input-disabled': disabled }"
+		    v-model="inputVal" class="u-number-input" @blur="onBlur" @focus="onFocus"
+		    type="number" :style="{
+				color: color,
+				fontSize: size + 'rpx',
+				background: bgColor,
+				height: inputHeight + 'rpx',
+				width: inputWidth + 'rpx'
+			}" />
+		<view class="u-icon-plus" @touchstart.stop.prevent="btnTouchStart('plus')" @touchend.stop.prevent="clearTimer" :class="{ 'u-icon-disabled': disabled || inputVal >= max }"
+		    :style="{
+				background: bgColor,
+				height: inputHeight + 'rpx',
+				color: color
+			}">
+			<u-icon name="plus" :size="size"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * numberBox 步进器
+	 * @description 该组件一般用于商城购物选择物品数量的场景。注意：该输入框只能输入大于或等于0的整数，不支持小数输入
+	 * @tutorial https://www.uviewui.com/components/numberBox.html
+	 * @property {Number} value 输入框初始值（默认1）
+	 * @property {String} bg-color 输入框和按钮的背景颜色（默认#F2F3F5）
+	 * @property {Number} min 用户可输入的最小值（默认0）
+	 * @property {Number} max 用户可输入的最大值（默认99999）
+	 * @property {Number} step 步长，每次加或减的值（默认1）
+	 * @property {Boolean} disabled 是否禁用操作，禁用后无法加减或手动修改输入框的值（默认false）
+	 * @property {Boolean} disabled-input 是否禁止输入框手动输入值（默认false）
+	 * @property {Boolean} positive-integer 是否只能输入正整数（默认true）
+	 * @property {String | Number} size 输入框文字和按钮字体大小，单位rpx（默认26）
+	 * @property {String} color 输入框文字和加减按钮图标的颜色（默认#323233）
+	 * @property {String | Number} input-width 输入框宽度，单位rpx（默认80）
+	 * @property {String | Number} input-height 输入框和按钮的高度，单位rpx（默认50）
+	 * @property {String | Number} index 事件回调时用以区分当前发生变化的是哪个输入框
+	 * @property {Boolean} long-press 是否开启长按连续递增或递减(默认true)
+	 * @property {String | Number} press-time 开启长按触发后，每触发一次需要多久，单位ms(默认250)
+	 * @property {String | Number} cursor-spacing 指定光标于键盘的距离，避免键盘遮挡输入框，单位rpx（默认200）
+	 * @event {Function} change 输入框内容发生变化时触发，对象形式
+	 * @event {Function} blur 输入框失去焦点时触发，对象形式
+	 * @event {Function} minus 点击减少按钮时触发(按钮可点击情况下)，对象形式
+	 * @event {Function} plus 点击增加按钮时触发(按钮可点击情况下)，对象形式
+	 * @example <u-number-box :min="1" :max="100"></u-number-box>
+	 */
+	export default {
+		name: "u-number-box",
+		props: {
+			// 预显示的数字
+			value: {
+				type: Number,
+				default: 1
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#F2F3F5'
+			},
+			// 最小值
+			min: {
+				type: Number,
+				default: 0
+			},
+			// 最大值
+			max: {
+				type: Number,
+				default: 99999
+			},
+			// 步进值，每次加或减的值
+			step: {
+				type: Number,
+				default: 1
+			},
+			// 是否禁用加减操作
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// input的字体大小，单位rpx
+			size: {
+				type: [Number, String],
+				default: 26
+			},
+			// 加减图标的颜色
+			color: {
+				type: String,
+				default: '#323233'
+			},
+			// input宽度，单位rpx
+			inputWidth: {
+				type: [Number, String],
+				default: 80
+			},
+			// input高度，单位rpx
+			inputHeight: {
+				type: [Number, String],
+				default: 50
+			},
+			// index索引，用于列表中使用，让用户知道是哪个numberbox发生了变化，一般使用for循环出来的index值即可
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否禁用输入框，与disabled作用于输入框时，为OR的关系，即想要禁用输入框，又可以加减的话
+			// 设置disabled为false，disabledInput为true即可
+			disabledInput: {
+				type: Boolean,
+				default: false
+			},
+			// 输入框于键盘之间的距离
+			cursorSpacing: {
+				type: [Number, String],
+				default: 100
+			},
+			// 是否开启长按连续递增或递减
+			longPress: {
+				type: Boolean,
+				default: true
+			},
+			// 开启长按触发后，每触发一次需要多久
+			pressTime: {
+				type: [Number, String],
+				default: 250
+			},
+			// 是否只能输入大于或等于0的整数(正整数)
+			positiveInteger: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+			value(v1, v2) {
+				// 只有value的改变是来自外部的时候，才去同步inputVal的值，否则会造成循环错误
+				if(!this.changeFromInner) {
+					this.inputVal = v1;
+					// 因为inputVal变化后，会触发this.handleChange()，在其中changeFromInner会再次被设置为true，
+					// 造成外面修改值，也导致被认为是内部修改的混乱，这里进行this.$nextTick延时，保证在运行周期的最后处
+					// 将changeFromInner设置为false
+					this.$nextTick(function(){
+						this.changeFromInner = false;
+					})
+				}
+			},
+			inputVal(v1, v2) {
+				// 为了让用户能够删除所有输入值，重新输入内容，删除所有值后，内容为空字符串
+				if (v1 == '') return;
+				let value = 0;
+				// 首先判断是否数值，并且在min和max之间，如果不是，使用原来值
+				let tmp = this.$u.test.number(v1);
+				if (tmp && v1 >= this.min && v1 <= this.max) value = v1;
+				else value = v2;
+				// 判断是否只能输入大于等于0的整数
+				if(this.positiveInteger) {
+					// 小于0，或者带有小数点，
+					if(v1 < 0 || String(v1).indexOf('.') !== -1) {
+						value = v2;
+						// 双向绑定input的值，必须要使用$nextTick修改显示的值
+						this.$nextTick(() => {
+							this.inputVal = v2;
+						})
+					}
+				}
+				// 发出change事件
+				this.handleChange(value, 'change');
+			}
+		},
+		data() {
+			return {
+				inputVal: 1, // 输入框中的值，不能直接使用props中的value，因为应该改变props的状态
+				timer: null, // 用作长按的定时器
+				changeFromInner: false, // 值发生变化，是来自内部还是外部
+				innerChangeTimer: null, // 内部定时器
+			};
+		},
+		created() {
+			this.inputVal = Number(this.value);
+		},
+		computed: {
+			getCursorSpacing() {
+				// 先将值转为px单位，再转为数值
+				return Number(uni.upx2px(this.cursorSpacing));
+			}
+		},
+		methods: {
+			// 点击退格键
+			btnTouchStart(callback) {
+				// 先执行一遍方法，否则会造成松开手时，就执行了clearTimer，导致无法实现功能
+				this[callback]();
+				// 如果没开启长按功能，直接返回
+				if (!this.longPress) return;
+				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
+				this.timer = null;
+				this.timer = setInterval(() => {
+					// 执行加或减函数
+					this[callback]();
+				}, this.pressTime);
+			},
+			clearTimer() {
+				this.$nextTick(() => {
+					clearInterval(this.timer);
+					this.timer = null;
+				})
+			},
+			minus() {
+				this.computeVal('minus');
+			},
+			plus() {
+				this.computeVal('plus');
+			},
+			// 为了保证小数相加减出现精度溢出的问题
+			calcPlus(num1, num2) {
+				let baseNum, baseNum1, baseNum2;
+				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, baseNum1, baseNum2;
+				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);
+			},
+			computeVal(type) {
+				uni.hideKeyboard();
+				if (this.disabled) return;
+				let value = 0;
+				// 减
+				if (type === 'minus') {
+					value = this.calcMinus(this.inputVal, this.step);
+				} else if (type === 'plus') {
+					value = this.calcPlus(this.inputVal, this.step);
+				}
+				// 判断是否小于最小值和大于最大值
+				if (value < this.min || value > this.max) {
+					return;
+				}
+				this.inputVal = value;
+				this.handleChange(value, type);
+			},
+			// 处理用户手动输入的情况
+			onBlur(event) {
+				let val = 0;
+				let value = event.detail.value;
+				// 如果为非0-9数字组成，或者其第一位数值为0，直接让其等于min值
+				// 这里不直接判断是否正整数，是因为用户传递的props min值可能为0
+				if (!/(^\d+$)/.test(value) || value[0] == 0) val = this.min;
+				val = +value;
+				if (val > this.max) {
+					val = this.max;
+				} else if (val < this.min) {
+					val = this.min;
+				}
+				this.$nextTick(() => {
+					this.inputVal = val;
+				})
+				this.handleChange(val, 'blur');
+			},
+			// 输入框获得焦点事件
+			onFocus() {
+				this.$emit('focus');
+			},
+			handleChange(value, type) {
+				if (this.disabled) return;
+				// 清除定时器，避免造成混乱
+				if(this.innerChangeTimer) {
+					clearTimeout(this.innerChangeTimer);
+					this.innerChangeTimer = null;
+				}
+				// 发出input事件，修改通过v-model绑定的值，达到双向绑定的效果
+				this.changeFromInner = true;
+				// 一定时间内，清除changeFromInner标记，否则内部值改变后
+				// 外部通过程序修改value值，将会无效
+				this.innerChangeTimer = setTimeout(() => {
+					this.changeFromInner = false;
+				}, 150);
+				this.$emit('input', Number(value));
+				this.$emit(type, {
+					// 转为Number类型
+					value: Number(value),
+					index: this.index
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-numberbox {
+		display: inline-flex;
+		align-items: center;
+	}
+
+	.u-number-input {
+		position: relative;
+		text-align: center;
+		padding: 0;
+		margin: 0 6rpx;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-icon-plus,
+	.u-icon-minus {
+		width: 60rpx;
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.u-icon-plus {
+		border-radius: 0 8rpx 8rpx 0;
+	}
+
+	.u-icon-minus {
+		border-radius: 8rpx 0 0 8rpx;
+	}
+
+	.u-icon-disabled {
+		color: #c8c9cc !important;
+		background: #f7f8fa !important;
+	}
+
+	.u-input-disabled {
+		color: #c8c9cc !important;
+		background-color: #f2f3f5 !important;
+	}
+</style>
diff --git a/uview-ui/components/u-number-keyboard/u-number-keyboard.vue b/uview-ui/components/u-number-keyboard/u-number-keyboard.vue
new file mode 100644
index 0000000..6425a1f
--- /dev/null
+++ b/uview-ui/components/u-number-keyboard/u-number-keyboard.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
+		<view class="u-keyboard-grids">
+			<view
+			    class="u-keyboard-grids-item"
+			    :class="[btnBgGray(index) ? 'u-bg-gray' : '', index <= 2 ? 'u-border-top' : '', index < 9 ? 'u-border-bottom' : '', (index + 1) % 3 != 0 ? 'u-border-right' : '']"
+			    :style="[itemStyle(index)]"
+			    v-for="(item, index) in numList"
+			    :key="index"
+			    :hover-class="hoverClass(index)"
+			    :hover-stay-time="100"
+			    @tap="keyboardClick(item)">
+				<view class="u-keyboard-grids-btn">{{ item }}</view>
+			</view>
+			<view class="u-keyboard-grids-item u-bg-gray" hover-class="u-hover-class" :hover-stay-time="100" @touchstart.stop="backspaceClick"
+			    @touchend="clearTimer">
+				<view class="u-keyboard-back u-keyboard-grids-btn">
+					<u-icon name="backspace" :size="38" :bold="true"></u-icon>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			// 键盘的类型，number-数字键盘，card-身份证键盘
+			mode: {
+				type: String,
+				default: 'number'
+			},
+			// 是否显示键盘的"."符号
+			dotEnabled: {
+				type: Boolean,
+				default: true
+			},
+			// 是否打乱键盘按键的顺序
+			random: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				backspace: 'backspace', // 退格键内容
+				dot: '.', // 点
+				timer: null, // 长按多次删除的事件监听
+				cardX: 'X' // 身份证的X符号
+			};
+		},
+		computed: {
+			// 键盘需要显示的内容
+			numList() {
+				let tmp = [];
+				if (!this.dotEnabled && this.mode == 'number') {
+					if (!this.random) {
+						return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+					} else {
+						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
+					}
+				} else if (this.dotEnabled && this.mode == 'number') {
+					if (!this.random) {
+						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0];
+					} else {
+						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]);
+					}
+				} else if (this.mode == 'card') {
+					if (!this.random) {
+						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0];
+					} else {
+						return this.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]);
+					}
+				}
+			},
+			// 按键的样式，在非乱序&&数字键盘&&不显示点按钮时，index为9时，按键占位两个空间
+			itemStyle() {
+				return index => {
+					let style = {};
+					if (this.mode == 'number' && !this.dotEnabled && index == 9) style.flex = '0 0 66.6666666666%';
+					return style;
+				};
+			},
+			// 是否让按键显示灰色，只在非乱序&&数字键盘&&且允许点按键的时候
+			btnBgGray() {
+				return index => {
+					if (!this.random && index == 9 && (this.mode != 'number' || (this.mode == 'number' && this.dotEnabled))) return true;
+					else return false;
+				};
+			},
+			hoverClass() {
+				return index => {
+					if (!this.random && index == 9 && (this.mode == 'number' && this.dotEnabled || this.mode == 'card')) return 'u-hover-class';
+					else return 'u-keyboard-hover';
+				}
+			}
+		},
+		methods: {
+			// 点击退格键
+			backspaceClick() {
+				this.$emit('backspace');
+				clearInterval(this.timer); //再次清空定时器，防止重复注册定时器
+				this.timer = null;
+				this.timer = setInterval(() => {
+					this.$emit('backspace');
+				}, 250);
+			},
+			clearTimer() {
+				clearInterval(this.timer);
+				this.timer = null;
+			},
+			// 获取键盘显示的内容
+			keyboardClick(val) {
+				// 允许键盘显示点模式和触发非点按键时，将内容转为数字类型
+				if (this.dotEnabled && val != this.dot && val != this.cardX) val = Number(val);
+				this.$emit('change', val);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-keyboard {
+		position: relative;
+		z-index: 1003;
+	}
+
+	.u-keyboard-grids {
+		@include vue-flex;
+		flex-wrap: wrap;
+	}
+
+	.u-keyboard-grids-item {
+		flex: 0 0 33.3333333333%;
+		text-align: center;
+		font-size: 50rpx;
+		color: #333;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		height: 110rpx;
+		font-weight: 500;
+	}
+
+	.u-bg-gray {
+		background-color: $u-border-color;
+	}
+
+	.u-keyboard-back {
+		font-size: 36rpx;
+	}
+
+	.u-keyboard-hover {
+		background-color: #e7e6eb;
+	}
+</style>
diff --git a/uview-ui/components/u-parse/libs/CssHandler.js b/uview-ui/components/u-parse/libs/CssHandler.js
new file mode 100644
index 0000000..75c6015
--- /dev/null
+++ b/uview-ui/components/u-parse/libs/CssHandler.js
@@ -0,0 +1,100 @@
+const cfg = require('./config.js'),
+	isLetter = c => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+
+function CssHandler(tagStyle) {
+	var styles = Object.assign(Object.create(null), cfg.userAgentStyles);
+	for (var item in tagStyle)
+		styles[item] = (styles[item] ? styles[item] + ';' : '') + tagStyle[item];
+	this.styles = styles;
+}
+CssHandler.prototype.getStyle = function(data) {
+	this.styles = new parser(data, this.styles).parse();
+}
+CssHandler.prototype.match = function(name, attrs) {
+	var tmp, matched = (tmp = this.styles[name]) ? tmp + ';' : '';
+	if (attrs.class) {
+		var items = attrs.class.split(' ');
+		for (var i = 0, item; item = items[i]; i++)
+			if (tmp = this.styles['.' + item])
+				matched += tmp + ';';
+	}
+	if (tmp = this.styles['#' + attrs.id])
+		matched += tmp + ';';
+	return matched;
+}
+module.exports = CssHandler;
+
+function parser(data, init) {
+	this.data = data;
+	this.floor = 0;
+	this.i = 0;
+	this.list = [];
+	this.res = init;
+	this.state = this.Space;
+}
+parser.prototype.parse = function() {
+	for (var c; c = this.data[this.i]; this.i++)
+		this.state(c);
+	return this.res;
+}
+parser.prototype.section = function() {
+	return this.data.substring(this.start, this.i);
+}
+// 状态机
+parser.prototype.Space = function(c) {
+	if (c == '.' || c == '#' || isLetter(c)) {
+		this.start = this.i;
+		this.state = this.Name;
+	} else if (c == '/' && this.data[this.i + 1] == '*')
+		this.Comment();
+	else if (!cfg.blankChar[c] && c != ';')
+		this.state = this.Ignore;
+}
+parser.prototype.Comment = function() {
+	this.i = this.data.indexOf('*/', this.i) + 1;
+	if (!this.i) this.i = this.data.length;
+	this.state = this.Space;
+}
+parser.prototype.Ignore = function(c) {
+	if (c == '{') this.floor++;
+	else if (c == '}' && !--this.floor) {
+		this.list = [];
+		this.state = this.Space;
+	}
+}
+parser.prototype.Name = function(c) {
+	if (cfg.blankChar[c]) {
+		this.list.push(this.section());
+		this.state = this.NameSpace;
+	} else if (c == '{') {
+		this.list.push(this.section());
+		this.Content();
+	} else if (c == ',') {
+		this.list.push(this.section());
+		this.Comma();
+	} else if (!isLetter(c) && (c < '0' || c > '9') && c != '-' && c != '_')
+		this.state = this.Ignore;
+}
+parser.prototype.NameSpace = function(c) {
+	if (c == '{') this.Content();
+	else if (c == ',') this.Comma();
+	else if (!cfg.blankChar[c]) this.state = this.Ignore;
+}
+parser.prototype.Comma = function() {
+	while (cfg.blankChar[this.data[++this.i]]);
+	if (this.data[this.i] == '{') this.Content();
+	else {
+		this.start = this.i--;
+		this.state = this.Name;
+	}
+}
+parser.prototype.Content = function() {
+	this.start = ++this.i;
+	if ((this.i = this.data.indexOf('}', this.i)) == -1) this.i = this.data.length;
+	var content = this.section();
+	for (var i = 0, item; item = this.list[i++];)
+		if (this.res[item]) this.res[item] += ';' + content;
+		else this.res[item] = content;
+	this.list = [];
+	this.state = this.Space;
+}
diff --git a/uview-ui/components/u-parse/libs/MpHtmlParser.js b/uview-ui/components/u-parse/libs/MpHtmlParser.js
new file mode 100644
index 0000000..aeb0fc3
--- /dev/null
+++ b/uview-ui/components/u-parse/libs/MpHtmlParser.js
@@ -0,0 +1,580 @@
+/**
+ * html 解析器
+ * @tutorial https://github.com/jin-yufeng/Parser
+ * @version 20201029
+ * @author JinYufeng
+ * @listens MIT
+ */
+const cfg = require('./config.js'),
+	blankChar = cfg.blankChar,
+	CssHandler = require('./CssHandler.js'),
+	windowWidth = uni.getSystemInfoSync().windowWidth;
+var emoji;
+
+function MpHtmlParser(data, options = {}) {
+	this.attrs = {};
+	this.CssHandler = new CssHandler(options.tagStyle, windowWidth);
+	this.data = data;
+	this.domain = options.domain;
+	this.DOM = [];
+	this.i = this.start = this.audioNum = this.imgNum = this.videoNum = 0;
+	options.prot = (this.domain || '').includes('://') ? this.domain.split('://')[0] : 'http';
+	this.options = options;
+	this.state = this.Text;
+	this.STACK = [];
+	// 工具函数
+	this.bubble = () => {
+		for (var i = this.STACK.length, item; item = this.STACK[--i];) {
+			if (cfg.richOnlyTags[item.name]) return false;
+			item.c = 1;
+		}
+		return true;
+	}
+	this.decode = (val, amp) => {
+		var i = -1,
+			j, en;
+		while (1) {
+			if ((i = val.indexOf('&', i + 1)) == -1) break;
+			if ((j = val.indexOf(';', i + 2)) == -1) break;
+			if (val[i + 1] == '#') {
+				en = parseInt((val[i + 2] == 'x' ? '0' : '') + val.substring(i + 2, j));
+				if (!isNaN(en)) val = val.substr(0, i) + String.fromCharCode(en) + val.substr(j + 1);
+			} else {
+				en = val.substring(i + 1, j);
+				if (cfg.entities[en] || en == amp)
+					val = val.substr(0, i) + (cfg.entities[en] || '&') + val.substr(j + 1);
+			}
+		}
+		return val;
+	}
+	this.getUrl = url => {
+		if (url[0] == '/') {
+			if (url[1] == '/') url = this.options.prot + ':' + url;
+			else if (this.domain) url = this.domain + url;
+		} else if (this.domain && url.indexOf('data:') != 0 && !url.includes('://'))
+			url = this.domain + '/' + url;
+		return url;
+	}
+	this.isClose = () => this.data[this.i] == '>' || (this.data[this.i] == '/' && this.data[this.i + 1] == '>');
+	this.section = () => this.data.substring(this.start, this.i);
+	this.parent = () => this.STACK[this.STACK.length - 1];
+	this.siblings = () => this.STACK.length ? this.parent().children : this.DOM;
+}
+MpHtmlParser.prototype.parse = function() {
+	if (emoji) this.data = emoji.parseEmoji(this.data);
+	for (var c; c = this.data[this.i]; this.i++)
+		this.state(c);
+	if (this.state == this.Text) this.setText();
+	while (this.STACK.length) this.popNode(this.STACK.pop());
+	return this.DOM;
+}
+// 设置属性
+MpHtmlParser.prototype.setAttr = function() {
+	var name = this.attrName.toLowerCase(),
+		val = this.attrVal;
+	if (cfg.boolAttrs[name]) this.attrs[name] = 'T';
+	else if (val) {
+		if (name == 'src' || (name == 'data-src' && !this.attrs.src)) this.attrs.src = this.getUrl(this.decode(val, 'amp'));
+		else if (name == 'href' || name == 'style') this.attrs[name] = this.decode(val, 'amp');
+		else if (name.substr(0, 5) != 'data-') this.attrs[name] = val;
+	}
+	this.attrVal = '';
+	while (blankChar[this.data[this.i]]) this.i++;
+	if (this.isClose()) this.setNode();
+	else {
+		this.start = this.i;
+		this.state = this.AttrName;
+	}
+}
+// 设置文本节点
+MpHtmlParser.prototype.setText = function() {
+	var back, text = this.section();
+	if (!text) return;
+	text = (cfg.onText && cfg.onText(text, () => back = true)) || text;
+	if (back) {
+		this.data = this.data.substr(0, this.start) + text + this.data.substr(this.i);
+		let j = this.start + text.length;
+		for (this.i = this.start; this.i < j; this.i++) this.state(this.data[this.i]);
+		return;
+	}
+	if (!this.pre) {
+		// 合并空白符
+		var flag, tmp = [];
+		for (let i = text.length, c; c = text[--i];)
+			if (!blankChar[c]) {
+				tmp.unshift(c);
+				if (!flag) flag = 1;
+			} else {
+				if (tmp[0] != ' ') tmp.unshift(' ');
+				if (c == '\n' && flag == void 0) flag = 0;
+			}
+		if (flag == 0) return;
+		text = tmp.join('');
+	}
+	this.siblings().push({
+		type: 'text',
+		text: this.decode(text)
+	});
+}
+// 设置元素节点
+MpHtmlParser.prototype.setNode = function() {
+	var node = {
+			name: this.tagName.toLowerCase(),
+			attrs: this.attrs
+		},
+		close = cfg.selfClosingTags[node.name];
+	if (this.options.nodes.length) node.type = 'node';
+	this.attrs = {};
+	if (!cfg.ignoreTags[node.name]) {
+		// 处理属性
+		var attrs = node.attrs,
+			style = this.CssHandler.match(node.name, attrs, node) + (attrs.style || ''),
+			styleObj = {};
+		if (attrs.id) {
+			if (this.options.compress & 1) attrs.id = void 0;
+			else if (this.options.useAnchor) this.bubble();
+		}
+		if ((this.options.compress & 2) && attrs.class) attrs.class = void 0;
+		switch (node.name) {
+			case 'a':
+			case 'ad': // #ifdef APP-PLUS
+			case 'iframe':
+				// #endif
+				this.bubble();
+				break;
+			case 'font':
+				if (attrs.color) {
+					styleObj['color'] = attrs.color;
+					attrs.color = void 0;
+				}
+				if (attrs.face) {
+					styleObj['font-family'] = attrs.face;
+					attrs.face = void 0;
+				}
+				if (attrs.size) {
+					var size = parseInt(attrs.size);
+					if (size < 1) size = 1;
+					else if (size > 7) size = 7;
+					var map = ['xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large'];
+					styleObj['font-size'] = map[size - 1];
+					attrs.size = void 0;
+				}
+				break;
+			case 'embed':
+				// #ifndef APP-PLUS
+				var src = node.attrs.src || '',
+					type = node.attrs.type || '';
+				if (type.includes('video') || src.includes('.mp4') || src.includes('.3gp') || src.includes('.m3u8'))
+					node.name = 'video';
+				else if (type.includes('audio') || src.includes('.m4a') || src.includes('.wav') || src.includes('.mp3') || src.includes(
+						'.aac'))
+					node.name = 'audio';
+				else break;
+				if (node.attrs.autostart)
+					node.attrs.autoplay = 'T';
+				node.attrs.controls = 'T';
+				// #endif
+				// #ifdef APP-PLUS
+				this.bubble();
+				break;
+				// #endif
+			case 'video':
+			case 'audio':
+				if (!attrs.id) attrs.id = node.name + (++this[`${node.name}Num`]);
+				else this[`${node.name}Num`]++;
+				if (node.name == 'video') {
+					if (this.videoNum > 3)
+						node.lazyLoad = 1;
+					if (attrs.width) {
+						styleObj.width = parseFloat(attrs.width) + (attrs.width.includes('%') ? '%' : 'px');
+						attrs.width = void 0;
+					}
+					if (attrs.height) {
+						styleObj.height = parseFloat(attrs.height) + (attrs.height.includes('%') ? '%' : 'px');
+						attrs.height = void 0;
+					}
+				}
+				if (!attrs.controls && !attrs.autoplay) attrs.controls = 'T';
+				attrs.source = [];
+				if (attrs.src) {
+					attrs.source.push(attrs.src);
+					attrs.src = void 0;
+				}
+				this.bubble();
+				break;
+			case 'td':
+			case 'th':
+				if (attrs.colspan || attrs.rowspan)
+					for (var k = this.STACK.length, item; item = this.STACK[--k];)
+						if (item.name == 'table') {
+							item.flag = 1;
+							break;
+						}
+		}
+		if (attrs.align) {
+			if (node.name == 'table') {
+				if (attrs.align == 'center') styleObj['margin-inline-start'] = styleObj['margin-inline-end'] = 'auto';
+				else styleObj['float'] = attrs.align;
+			} else styleObj['text-align'] = attrs.align;
+			attrs.align = void 0;
+		}
+		// 压缩 style
+		var styles = style.split(';');
+		style = '';
+		for (var i = 0, len = styles.length; i < len; i++) {
+			var info = styles[i].split(':');
+			if (info.length < 2) continue;
+			let key = info[0].trim().toLowerCase(),
+				value = info.slice(1).join(':').trim();
+			if (value[0] == '-' || value.includes('safe'))
+				style += `;${key}:${value}`;
+			else if (!styleObj[key] || value.includes('import') || !styleObj[key].includes('import'))
+				styleObj[key] = value;
+		}
+		if (node.name == 'img') {
+			if (attrs.src && !attrs.ignore) {
+				if (this.bubble())
+					attrs.i = (this.imgNum++).toString();
+				else attrs.ignore = 'T';
+			}
+			if (attrs.ignore) {
+				style += ';-webkit-touch-callout:none';
+				styleObj['max-width'] = '100%';
+			}
+			var width;
+			if (styleObj.width) width = styleObj.width;
+			else if (attrs.width) width = attrs.width.includes('%') ? attrs.width : parseFloat(attrs.width) + 'px';
+			if (width) {
+				styleObj.width = width;
+				attrs.width = '100%';
+				if (parseInt(width) > windowWidth) {
+					styleObj.height = '';
+					if (attrs.height) attrs.height = void 0;
+				}
+			}
+			if (styleObj.height) {
+				attrs.height = styleObj.height;
+				styleObj.height = '';
+			} else if (attrs.height && !attrs.height.includes('%'))
+				attrs.height = parseFloat(attrs.height) + 'px';
+		}
+		for (var key in styleObj) {
+			var value = styleObj[key];
+			if (!value) continue;
+			if (key.includes('flex') || key == 'order' || key == 'self-align') node.c = 1;
+			// 填充链接
+			if (value.includes('url')) {
+				var j = value.indexOf('(');
+				if (j++ != -1) {
+					while (value[j] == '"' || value[j] == "'" || blankChar[value[j]]) j++;
+					value = value.substr(0, j) + this.getUrl(value.substr(j));
+				}
+			}
+			// 转换 rpx
+			else if (value.includes('rpx'))
+				value = value.replace(/[0-9.]+\s*rpx/g, $ => parseFloat($) * windowWidth / 750 + 'px');
+			else if (key == 'white-space' && value.includes('pre') && !close)
+				this.pre = node.pre = true;
+			style += `;${key}:${value}`;
+		}
+		style = style.substr(1);
+		if (style) attrs.style = style;
+		if (!close) {
+			node.children = [];
+			if (node.name == 'pre' && cfg.highlight) {
+				this.remove(node);
+				this.pre = node.pre = true;
+			}
+			this.siblings().push(node);
+			this.STACK.push(node);
+		} else if (!cfg.filter || cfg.filter(node, this) != false)
+			this.siblings().push(node);
+	} else {
+		if (!close) this.remove(node);
+		else if (node.name == 'source') {
+			var parent = this.parent();
+			if (parent && (parent.name == 'video' || parent.name == 'audio') && node.attrs.src)
+				parent.attrs.source.push(node.attrs.src);
+		} else if (node.name == 'base' && !this.domain) this.domain = node.attrs.href;
+	}
+	if (this.data[this.i] == '/') this.i++;
+	this.start = this.i + 1;
+	this.state = this.Text;
+}
+// 移除标签
+MpHtmlParser.prototype.remove = function(node) {
+	var name = node.name,
+		j = this.i;
+	// 处理 svg
+	var handleSvg = () => {
+		var src = this.data.substring(j, this.i + 1);
+		node.attrs.xmlns = 'http://www.w3.org/2000/svg';
+		for (var key in node.attrs) {
+			if (key == 'viewbox') src = ` viewBox="${node.attrs.viewbox}"` + src;
+			else if (key != 'style') src = ` ${key}="${node.attrs[key]}"` + src;
+		}
+		src = '<svg' + src;
+		var parent = this.parent();
+		if (node.attrs.width == '100%' && parent && (parent.attrs.style || '').includes('inline'))
+			parent.attrs.style = 'width:300px;max-width:100%;' + parent.attrs.style;
+		this.siblings().push({
+			name: 'img',
+			attrs: {
+				src: 'data:image/svg+xml;utf8,' + src.replace(/#/g, '%23'),
+				style: node.attrs.style,
+				ignore: 'T'
+			}
+		})
+	}
+	if (node.name == 'svg' && this.data[j] == '/') return handleSvg(this.i++);
+	while (1) {
+		if ((this.i = this.data.indexOf('</', this.i + 1)) == -1) {
+			if (name == 'pre' || name == 'svg') this.i = j;
+			else this.i = this.data.length;
+			return;
+		}
+		this.start = (this.i += 2);
+		while (!blankChar[this.data[this.i]] && !this.isClose()) this.i++;
+		if (this.section().toLowerCase() == name) {
+			// 代码块高亮
+			if (name == 'pre') {
+				this.data = this.data.substr(0, j + 1) + cfg.highlight(this.data.substring(j + 1, this.i - 5), node.attrs) + this.data
+					.substr(this.i - 5);
+				return this.i = j;
+			} else if (name == 'style')
+				this.CssHandler.getStyle(this.data.substring(j + 1, this.i - 7));
+			else if (name == 'title')
+				this.DOM.title = this.data.substring(j + 1, this.i - 7);
+			if ((this.i = this.data.indexOf('>', this.i)) == -1) this.i = this.data.length;
+			if (name == 'svg') handleSvg();
+			return;
+		}
+	}
+}
+// 节点出栈处理
+MpHtmlParser.prototype.popNode = function(node) {
+	// 空白符处理
+	if (node.pre) {
+		node.pre = this.pre = void 0;
+		for (let i = this.STACK.length; i--;)
+			if (this.STACK[i].pre)
+				this.pre = true;
+	}
+	var siblings = this.siblings(),
+		len = siblings.length,
+		childs = node.children;
+	if (node.name == 'head' || (cfg.filter && cfg.filter(node, this) == false))
+		return siblings.pop();
+	var attrs = node.attrs;
+	// 替换一些标签名
+	if (cfg.blockTags[node.name]) node.name = 'div';
+	else if (!cfg.trustTags[node.name]) node.name = 'span';
+	// 处理列表
+	if (node.c && (node.name == 'ul' || node.name == 'ol')) {
+		if ((node.attrs.style || '').includes('list-style:none')) {
+			for (let i = 0, child; child = childs[i++];)
+				if (child.name == 'li')
+					child.name = 'div';
+		} else if (node.name == 'ul') {
+			var floor = 1;
+			for (let i = this.STACK.length; i--;)
+				if (this.STACK[i].name == 'ul') floor++;
+			if (floor != 1)
+				for (let i = childs.length; i--;)
+					childs[i].floor = floor;
+		} else {
+			for (let i = 0, num = 1, child; child = childs[i++];)
+				if (child.name == 'li') {
+					child.type = 'ol';
+					child.num = ((num, type) => {
+						if (type == 'a') return String.fromCharCode(97 + (num - 1) % 26);
+						if (type == 'A') return String.fromCharCode(65 + (num - 1) % 26);
+						if (type == 'i' || type == 'I') {
+							num = (num - 1) % 99 + 1;
+							var one = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'],
+								ten = ['X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC'],
+								res = (ten[Math.floor(num / 10) - 1] || '') + (one[num % 10 - 1] || '');
+							if (type == 'i') return res.toLowerCase();
+							return res;
+						}
+						return num;
+					})(num++, attrs.type) + '.';
+				}
+		}
+	}
+	// 处理表格
+	if (node.name == 'table') {
+		var padding = parseFloat(attrs.cellpadding),
+			spacing = parseFloat(attrs.cellspacing),
+			border = parseFloat(attrs.border);
+		if (node.c) {
+			if (isNaN(padding)) padding = 2;
+			if (isNaN(spacing)) spacing = 2;
+		}
+		if (border) attrs.style = `border:${border}px solid gray;${attrs.style || ''}`;
+		if (node.flag && node.c) {
+			// 有 colspan 或 rowspan 且含有链接的表格转为 grid 布局实现
+			attrs.style = `${attrs.style || ''};${spacing ? `;grid-gap:${spacing}px` : ';border-left:0;border-top:0'}`;
+			var row = 1,
+				col = 1,
+				colNum,
+				trs = [],
+				children = [],
+				map = {};
+			(function f(ns) {
+				for (var i = 0; i < ns.length; i++) {
+					if (ns[i].name == 'tr') trs.push(ns[i]);
+					else f(ns[i].children || []);
+				}
+			})(node.children)
+			for (let i = 0; i < trs.length; i++) {
+				for (let j = 0, td; td = trs[i].children[j]; j++) {
+					if (td.name == 'td' || td.name == 'th') {
+						while (map[row + '.' + col]) col++;
+						var cell = {
+							name: 'div',
+							c: 1,
+							attrs: {
+								style: (td.attrs.style || '') + (border ? `;border:${border}px solid gray` + (spacing ? '' :
+									';border-right:0;border-bottom:0') : '') + (padding ? `;padding:${padding}px` : '')
+							},
+							children: td.children
+						}
+						if (td.attrs.colspan) {
+							cell.attrs.style += ';grid-column-start:' + col + ';grid-column-end:' + (col + parseInt(td.attrs.colspan));
+							if (!td.attrs.rowspan) cell.attrs.style += ';grid-row-start:' + row + ';grid-row-end:' + (row + 1);
+							col += parseInt(td.attrs.colspan) - 1;
+						}
+						if (td.attrs.rowspan) {
+							cell.attrs.style += ';grid-row-start:' + row + ';grid-row-end:' + (row + parseInt(td.attrs.rowspan));
+							if (!td.attrs.colspan) cell.attrs.style += ';grid-column-start:' + col + ';grid-column-end:' + (col + 1);
+							for (var k = 1; k < td.attrs.rowspan; k++) map[(row + k) + '.' + col] = 1;
+						}
+						children.push(cell);
+						col++;
+					}
+				}
+				if (!colNum) {
+					colNum = col - 1;
+					attrs.style += `;grid-template-columns:repeat(${colNum},auto)`
+				}
+				col = 1;
+				row++;
+			}
+			node.children = children;
+		} else {
+			attrs.style = `border-spacing:${spacing}px;${attrs.style || ''}`;
+			if (border || padding)
+				(function f(ns) {
+					for (var i = 0, n; n = ns[i]; i++) {
+						if (n.name == 'th' || n.name == 'td') {
+							if (border) n.attrs.style = `border:${border}px solid gray;${n.attrs.style || ''}`;
+							if (padding) n.attrs.style = `padding:${padding}px;${n.attrs.style || ''}`;
+						} else f(n.children || []);
+					}
+				})(childs)
+		}
+		if (this.options.autoscroll) {
+			var table = Object.assign({}, node);
+			node.name = 'div';
+			node.attrs = {
+				style: 'overflow:scroll'
+			}
+			node.children = [table];
+		}
+	}
+	this.CssHandler.pop && this.CssHandler.pop(node);
+	// 自动压缩
+	if (node.name == 'div' && !Object.keys(attrs).length && childs.length == 1 && childs[0].name == 'div')
+		siblings[len - 1] = childs[0];
+}
+// 状态机
+MpHtmlParser.prototype.Text = function(c) {
+	if (c == '<') {
+		var next = this.data[this.i + 1],
+			isLetter = c => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+		if (isLetter(next)) {
+			this.setText();
+			this.start = this.i + 1;
+			this.state = this.TagName;
+		} else if (next == '/') {
+			this.setText();
+			if (isLetter(this.data[++this.i + 1])) {
+				this.start = this.i + 1;
+				this.state = this.EndTag;
+			} else this.Comment();
+		} else if (next == '!' || next == '?') {
+			this.setText();
+			this.Comment();
+		}
+	}
+}
+MpHtmlParser.prototype.Comment = function() {
+	var key;
+	if (this.data.substring(this.i + 2, this.i + 4) == '--') key = '-->';
+	else if (this.data.substring(this.i + 2, this.i + 9) == '[CDATA[') key = ']]>';
+	else key = '>';
+	if ((this.i = this.data.indexOf(key, this.i + 2)) == -1) this.i = this.data.length;
+	else this.i += key.length - 1;
+	this.start = this.i + 1;
+	this.state = this.Text;
+}
+MpHtmlParser.prototype.TagName = function(c) {
+	if (blankChar[c]) {
+		this.tagName = this.section();
+		while (blankChar[this.data[this.i]]) this.i++;
+		if (this.isClose()) this.setNode();
+		else {
+			this.start = this.i;
+			this.state = this.AttrName;
+		}
+	} else if (this.isClose()) {
+		this.tagName = this.section();
+		this.setNode();
+	}
+}
+MpHtmlParser.prototype.AttrName = function(c) {
+	if (c == '=' || blankChar[c] || this.isClose()) {
+		this.attrName = this.section();
+		if (blankChar[c])
+			while (blankChar[this.data[++this.i]]);
+		if (this.data[this.i] == '=') {
+			while (blankChar[this.data[++this.i]]);
+			this.start = this.i--;
+			this.state = this.AttrValue;
+		} else this.setAttr();
+	}
+}
+MpHtmlParser.prototype.AttrValue = function(c) {
+	if (c == '"' || c == "'") {
+		this.start++;
+		if ((this.i = this.data.indexOf(c, this.i + 1)) == -1) return this.i = this.data.length;
+		this.attrVal = this.section();
+		this.i++;
+	} else {
+		for (; !blankChar[this.data[this.i]] && !this.isClose(); this.i++);
+		this.attrVal = this.section();
+	}
+	this.setAttr();
+}
+MpHtmlParser.prototype.EndTag = function(c) {
+	if (blankChar[c] || c == '>' || c == '/') {
+		var name = this.section().toLowerCase();
+		for (var i = this.STACK.length; i--;)
+			if (this.STACK[i].name == name) break;
+		if (i != -1) {
+			var node;
+			while ((node = this.STACK.pop()).name != name) this.popNode(node);
+			this.popNode(node);
+		} else if (name == 'p' || name == 'br')
+			this.siblings().push({
+				name,
+				attrs: {}
+			});
+		this.i = this.data.indexOf('>', this.i);
+		this.start = this.i + 1;
+		if (this.i == -1) this.i = this.data.length;
+		else this.state = this.Text;
+	}
+}
+module.exports = MpHtmlParser;
diff --git a/uview-ui/components/u-parse/libs/config.js b/uview-ui/components/u-parse/libs/config.js
new file mode 100644
index 0000000..1f772e9
--- /dev/null
+++ b/uview-ui/components/u-parse/libs/config.js
@@ -0,0 +1,80 @@
+/* 配置文件 */
+var cfg = {
+	// 出错占位图
+	errorImg: null,
+	// 过滤器函数
+	filter: null,
+	// 代码高亮函数
+	highlight: null,
+	// 文本处理函数
+	onText: null,
+	// 实体编码列表
+	entities: {
+		quot: '"',
+		apos: "'",
+		semi: ';',
+		nbsp: '\xA0',
+		ensp: '\u2002',
+		emsp: '\u2003',
+		ndash: '–',
+		mdash: '—',
+		middot: '·',
+		lsquo: '‘',
+		rsquo: '’',
+		ldquo: '“',
+		rdquo: '”',
+		bull: '•',
+		hellip: '…'
+	},
+	blankChar: makeMap(' ,\xA0,\t,\r,\n,\f'),
+	boolAttrs: makeMap('allowfullscreen,autoplay,autostart,controls,ignore,loop,muted'),
+	// 块级标签，将被转为 div
+	blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section'),
+	// 将被移除的标签
+	ignoreTags: makeMap('area,base,canvas,frame,iframe,input,link,map,meta,param,script,source,style,svg,textarea,title,track,wbr'),
+	// 只能被 rich-text 显示的标签
+	richOnlyTags: makeMap('a,colgroup,fieldset,legend'),
+	// 自闭合的标签
+	selfClosingTags: makeMap('area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'),
+	// 信任的标签
+	trustTags: makeMap('a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'),
+	// 默认的标签样式
+	userAgentStyles: {
+		address: 'font-style:italic',
+		big: 'display:inline;font-size:1.2em',
+		blockquote: 'background-color:#f6f6f6;border-left:3px solid #dbdbdb;color:#6c6c6c;padding:5px 0 5px 10px',
+		caption: 'display:table-caption;text-align:center',
+		center: 'text-align:center',
+		cite: 'font-style:italic',
+		dd: 'margin-left:40px',
+		mark: 'background-color:yellow',
+		pre: 'font-family:monospace;white-space:pre;overflow:scroll',
+		s: 'text-decoration:line-through',
+		small: 'display:inline;font-size:0.8em',
+		u: 'text-decoration:underline'
+	}
+}
+
+function makeMap(str) {
+	var map = Object.create(null),
+		list = str.split(',');
+	for (var i = list.length; i--;)
+		map[list[i]] = true;
+	return map;
+}
+
+// #ifdef MP-WEIXIN
+if (wx.canIUse('editor')) {
+	cfg.blockTags.pre = void 0;
+	cfg.ignoreTags.rp = true;
+	Object.assign(cfg.richOnlyTags, makeMap('bdi,bdo,caption,rt,ruby'));
+	Object.assign(cfg.trustTags, makeMap('bdi,bdo,caption,pre,rt,ruby'));
+}
+// #endif
+
+// #ifdef APP-PLUS
+cfg.ignoreTags.iframe = void 0;
+Object.assign(cfg.trustTags, makeMap('embed,iframe'));
+// #endif
+
+module.exports = cfg;
diff --git a/uview-ui/components/u-parse/libs/handler.wxs b/uview-ui/components/u-parse/libs/handler.wxs
new file mode 100644
index 0000000..d3b1aaa
--- /dev/null
+++ b/uview-ui/components/u-parse/libs/handler.wxs
@@ -0,0 +1,22 @@
+var inline = {
+	abbr: 1,
+	b: 1,
+	big: 1,
+	code: 1,
+	del: 1,
+	em: 1,
+	i: 1,
+	ins: 1,
+	label: 1,
+	q: 1,
+	small: 1,
+	span: 1,
+	strong: 1,
+	sub: 1,
+	sup: 1
+}
+module.exports = {
+	use: function(item) {
+		return !item.c && !inline[item.name] && (item.attrs.style || '').indexOf('display:inline') == -1
+	}
+}
diff --git a/uview-ui/components/u-parse/libs/trees.vue b/uview-ui/components/u-parse/libs/trees.vue
new file mode 100644
index 0000000..2b24820
--- /dev/null
+++ b/uview-ui/components/u-parse/libs/trees.vue
@@ -0,0 +1,505 @@
+<template>
+	<view :class="'interlayer '+(c||'')" :style="s">
+		<block v-for="(n, i) in nodes" v-bind:key="i">
+			<!--图片-->
+			<view v-if="n.name=='img'" :class="'_img '+n.attrs.class" :style="n.attrs.style" :data-attrs="n.attrs" @tap.stop="imgtap">
+				<rich-text v-if="ctrl[i]!=0" :nodes="[{attrs:{src:loading&&(ctrl[i]||0)<2?loading:(lazyLoad&&!ctrl[i]?placeholder:(ctrl[i]==3?errorImg:n.attrs.src||'')),alt:n.attrs.alt||'',width:n.attrs.width||'',style:'-webkit-touch-callout:none;max-width:100%;display:block'+(n.attrs.height?';height:'+n.attrs.height:'')},name:'img'}]" />
+				<image class="_image" :src="lazyLoad&&!ctrl[i]?placeholder:n.attrs.src" :lazy-load="lazyLoad"
+				 :show-menu-by-longpress="!n.attrs.ignore" :data-i="i" :data-index="n.attrs.i" data-source="img" @load="loadImg"
+				 @error="error" />
+			</view>
+			<!--文本-->
+			<text v-else-if="n.type=='text'" decode>{{n.text}}</text>
+			<!--#ifndef MP-BAIDU-->
+			<text v-else-if="n.name=='br'">\n</text>
+			<!--#endif-->
+			<!--视频-->
+			<view v-else-if="((n.lazyLoad&&!n.attrs.autoplay)||(n.name=='video'&&!loadVideo))&&ctrl[i]==undefined" :id="n.attrs.id"
+			 :class="'_video '+(n.attrs.class||'')" :style="n.attrs.style" :data-i="i" @tap.stop="_loadVideo" />
+			<video v-else-if="n.name=='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay||ctrl[i]==0"
+			 :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :poster="n.attrs.poster" :src="n.attrs.source[ctrl[i]||0]"
+			 :unit-id="n.attrs['unit-id']" :data-id="n.attrs.id" :data-i="i" data-source="video" @error="error" @play="play" />
+			<!--音频-->
+			<audio v-else-if="n.name=='audio'" :ref="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :author="n.attrs.author"
+			 :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster"
+			 :src="n.attrs.source[ctrl[i]||0]" :data-i="i" :data-id="n.attrs.id" data-source="audio" @error.native="error"
+			 @play.native="play" />
+			<!--链接-->
+			<view v-else-if="n.name=='a'" :id="n.attrs.id" :class="'_a '+(n.attrs.class||'')" hover-class="_hover" :style="n.attrs.style"
+			 :data-attrs="n.attrs" @tap.stop="linkpress">
+				<trees class="_span" c="_span" :nodes="n.children" />
+			</view>
+			<!--广告-->
+			<!--<ad v-else-if="n.name=='ad'" :class="n.attrs.class" :style="n.attrs.style" :unit-id="n.attrs['unit-id']" :appid="n.attrs.appid" :apid="n.attrs.apid" :type="n.attrs.type" :adpid="n.attrs.adpid" data-source="ad" @error="error" />-->
+			<!--列表-->
+			<view v-else-if="n.name=='li'" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:flex;flex-direction:row'">
+				<view v-if="n.type=='ol'" class="_ol-bef">{{n.num}}</view>
+				<view v-else class="_ul-bef">
+					<view v-if="n.floor%3==0" class="_ul-p1">█</view>
+					<view v-else-if="n.floor%3==2" class="_ul-p2" />
+					<view v-else class="_ul-p1" style="border-radius:50%">█</view>
+				</view>
+				<trees class="_li" c="_li" :nodes="n.children" :lazyLoad="lazyLoad" :loading="loading" />
+			</view>
+			<!--表格-->
+			<view v-else-if="n.name=='table'&&n.c&&n.flag" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:grid'">
+				<trees v-for="(cell,n) in n.children" v-bind:key="n" :class="cell.attrs.class" :c="cell.attrs.class" :style="cell.attrs.style"
+				 :s="cell.attrs.style" :nodes="cell.children" />
+			</view>
+			<view v-else-if="n.name=='table'&&n.c" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:table'">
+				<view v-for="(tbody, o) in n.children" v-bind:key="o" :class="tbody.attrs.class" :style="(tbody.attrs.style||'')+(tbody.name[0]=='t'?';display:table-'+(tbody.name=='tr'?'row':'row-group'):'')">
+					<view v-for="(tr, p) in tbody.children" v-bind:key="p" :class="tr.attrs.class" :style="(tr.attrs.style||'')+(tr.name[0]=='t'?';display:table-'+(tr.name=='tr'?'row':'cell'):'')">
+						<trees v-if="tr.name=='td'" :nodes="tr.children" />
+						<trees v-else v-for="(td, q) in tr.children" v-bind:key="q" :class="td.attrs.class" :c="td.attrs.class" :style="(td.attrs.style||'')+(td.name[0]=='t'?';display:table-'+(td.name=='tr'?'row':'cell'):'')"
+						 :s="(td.attrs.style||'')+(td.name[0]=='t'?';display:table-'+(td.name=='tr'?'row':'cell'):'')" :nodes="td.children" />
+					</view>
+				</view>
+			</view>
+			<!--#ifdef APP-PLUS-->
+			<iframe v-else-if="n.name=='iframe'" :style="n.attrs.style" :allowfullscreen="n.attrs.allowfullscreen" :frameborder="n.attrs.frameborder"
+			 :width="n.attrs.width" :height="n.attrs.height" :src="n.attrs.src" />
+			<embed v-else-if="n.name=='embed'" :style="n.attrs.style" :width="n.attrs.width" :height="n.attrs.height" :src="n.attrs.src" />
+			<!--#endif-->
+			<!--富文本-->
+			<!--#ifdef MP-WEIXIN || MP-QQ || APP-PLUS-->
+			<rich-text v-else-if="handler.use(n)" :id="n.attrs.id" :class="'_p __'+n.name" :nodes="[n]" />
+			<!--#endif-->
+			<!--#ifndef MP-WEIXIN || MP-QQ || APP-PLUS-->
+			<rich-text v-else-if="!n.c" :id="n.attrs.id" :nodes="[n]" style="display:inline" />
+			<!--#endif-->
+			<trees v-else :class="(n.attrs.id||'')+' _'+n.name+' '+(n.attrs.class||'')" :c="(n.attrs.id||'')+' _'+n.name+' '+(n.attrs.class||'')"
+			 :style="n.attrs.style" :s="n.attrs.style" :nodes="n.children" :lazyLoad="lazyLoad" :loading="loading" />
+		</block>
+	</view>
+</template>
+<script module="handler" lang="wxs" src="./handler.wxs"></script>
+<script>
+	global.Parser = {};
+	import trees from './trees'
+	const errorImg = require('../libs/config.js').errorImg;
+	export default {
+		components: {
+			trees
+		},
+		name: 'trees',
+		data() {
+			return {
+				ctrl: [],
+				placeholder: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="300" height="225"/>',
+				errorImg,
+				loadVideo: typeof plus == 'undefined',
+				// #ifndef MP-ALIPAY
+				c: '',
+				s: ''
+				// #endif
+			}
+		},
+		props: {
+			nodes: Array,
+			lazyLoad: Boolean,
+			loading: String,
+			// #ifdef MP-ALIPAY
+			c: String,
+			s: String
+			// #endif
+		},
+		mounted() {
+			for (this.top = this.$parent; this.top.$options.name != 'parser'; this.top = this.top.$parent);
+			this.init();
+		},
+		// #ifdef APP-PLUS
+		beforeDestroy() {
+			this.observer && this.observer.disconnect();
+		},
+		// #endif
+		methods: {
+			init() {
+				for (var i = this.nodes.length, n; n = this.nodes[--i];) {
+					if (n.name == 'img') {
+						this.top.imgList.setItem(n.attrs.i, n.attrs['original-src'] || n.attrs.src);
+						// #ifdef APP-PLUS
+						if (this.lazyLoad && !this.observer) {
+							this.observer = uni.createIntersectionObserver(this).relativeToViewport({
+								top: 500,
+								bottom: 500
+							});
+							setTimeout(() => {
+								this.observer.observe('._img', res => {
+									if (res.intersectionRatio) {
+										for (var j = this.nodes.length; j--;)
+											if (this.nodes[j].name == 'img')
+												this.$set(this.ctrl, j, 1);
+										this.observer.disconnect();
+									}
+								})
+							}, 0)
+						}
+						// #endif
+					} else if (n.name == 'video' || n.name == 'audio') {
+						var ctx;
+						if (n.name == 'video') {
+							ctx = uni.createVideoContext(n.attrs.id
+								// #ifndef MP-BAIDU
+								, this
+								// #endif
+							);
+						} else if (this.$refs[n.attrs.id])
+							ctx = this.$refs[n.attrs.id][0];
+						if (ctx) {
+							ctx.id = n.attrs.id;
+							this.top.videoContexts.push(ctx);
+						}
+					}
+				}
+				// #ifdef APP-PLUS
+				// APP 上避免 video 错位需要延时渲染
+				setTimeout(() => {
+					this.loadVideo = true;
+				}, 1000)
+				// #endif
+			},
+			play(e) {
+				var contexts = this.top.videoContexts;
+				if (contexts.length > 1 && this.top.autopause)
+					for (var i = contexts.length; i--;)
+						if (contexts[i].id != e.currentTarget.dataset.id)
+							contexts[i].pause();
+			},
+			imgtap(e) {
+				var attrs = e.currentTarget.dataset.attrs;
+				if (!attrs.ignore) {
+					var preview = true,
+						data = {
+							id: e.target.id,
+							src: attrs.src,
+							ignore: () => preview = false
+						};
+					global.Parser.onImgtap && global.Parser.onImgtap(data);
+					this.top.$emit('imgtap', data);
+					if (preview) {
+						var urls = this.top.imgList,
+							current = urls[attrs.i] ? parseInt(attrs.i) : (urls = [attrs.src], 0);
+						uni.previewImage({
+							current,
+							urls
+						})
+					}
+				}
+			},
+			loadImg(e) {
+				var i = e.currentTarget.dataset.i;
+				if (this.lazyLoad && !this.ctrl[i]) {
+					// #ifdef QUICKAPP-WEBVIEW
+					this.$set(this.ctrl, i, 0);
+					this.$nextTick(function() {
+						// #endif
+						// #ifndef APP-PLUS
+						this.$set(this.ctrl, i, 1);
+						// #endif
+						// #ifdef QUICKAPP-WEBVIEW
+					})
+					// #endif
+				} else if (this.loading && this.ctrl[i] != 2) {
+					// #ifdef QUICKAPP-WEBVIEW
+					this.$set(this.ctrl, i, 0);
+					this.$nextTick(function() {
+						// #endif
+						this.$set(this.ctrl, i, 2);
+						// #ifdef QUICKAPP-WEBVIEW
+					})
+					// #endif
+				}
+			},
+			linkpress(e) {
+				var jump = true,
+					attrs = e.currentTarget.dataset.attrs;
+				attrs.ignore = () => jump = false;
+				global.Parser.onLinkpress && global.Parser.onLinkpress(attrs);
+				this.top.$emit('linkpress', attrs);
+				if (jump) {
+					// #ifdef MP
+					if (attrs['app-id']) {
+						return uni.navigateToMiniProgram({
+							appId: attrs['app-id'],
+							path: attrs.path
+						})
+					}
+					// #endif
+					if (attrs.href) {
+						if (attrs.href[0] == '#') {
+							if (this.top.useAnchor)
+								this.top.navigateTo({
+									id: attrs.href.substring(1)
+								})
+						} else if (attrs.href.indexOf('http') == 0 || attrs.href.indexOf('//') == 0) {
+							// #ifdef APP-PLUS
+							plus.runtime.openWeb(attrs.href);
+							// #endif
+							// #ifndef APP-PLUS
+							uni.setClipboardData({
+								data: attrs.href,
+								success: () =>
+									uni.showToast({
+										title: '链接已复制'
+									})
+							})
+							// #endif
+						} else
+							uni.navigateTo({
+								url: attrs.href,
+								fail() {
+									uni.switchTab({
+										url: attrs.href,
+									})
+								}
+							})
+					}
+				}
+			},
+			error(e) {
+				var target = e.currentTarget,
+					source = target.dataset.source,
+					i = target.dataset.i;
+				if (source == 'video' || source == 'audio') {
+					// 加载其他 source
+					var index = this.ctrl[i] ? this.ctrl[i].i + 1 : 1;
+					if (index < this.nodes[i].attrs.source.length)
+						this.$set(this.ctrl, i, index);
+					if (e.detail.__args__)
+						e.detail = e.detail.__args__[0];
+				} else if (errorImg && source == 'img') {
+					this.top.imgList.setItem(target.dataset.index, errorImg);
+					this.$set(this.ctrl, i, 3);
+				}
+				this.top && this.top.$emit('error', {
+					source,
+					target,
+					errMsg: e.detail.errMsg
+				});
+			},
+			_loadVideo(e) {
+				this.$set(this.ctrl, e.target.dataset.i, 0);
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 在这里引入自定义样式 */
+
+	/* 链接和图片效果 */
+	._a {
+		display: inline;
+		padding: 1.5px 0 1.5px 0;
+		color: #366092;
+		word-break: break-all;
+	}
+
+	._hover {
+		text-decoration: underline;
+		opacity: 0.7;
+	}
+
+	._img {
+		display: inline-block;
+		max-width: 100%;
+		overflow: hidden;
+	}
+
+	/* #ifdef MP-WEIXIN */
+	:host {
+		display: inline;
+	}
+
+	/* #endif */
+
+	/* #ifndef MP-ALIPAY || APP-PLUS */
+	.interlayer {
+		display: inherit;
+		flex-direction: inherit;
+		flex-wrap: inherit;
+		align-content: inherit;
+		align-items: inherit;
+		justify-content: inherit;
+		width: 100%;
+		white-space: inherit;
+	}
+
+	/* #endif */
+
+	._b,
+	._strong {
+		font-weight: bold;
+	}
+
+	/* #ifndef MP-ALIPAY */
+	._blockquote,
+	._div,
+	._p,
+	._ol,
+	._ul,
+	._li {
+		display: block;
+	}
+
+	/* #endif */
+
+	._code {
+		font-family: monospace;
+	}
+
+	._del {
+		text-decoration: line-through;
+	}
+
+	._em,
+	._i {
+		font-style: italic;
+	}
+
+	._h1 {
+		font-size: 2em;
+	}
+
+	._h2 {
+		font-size: 1.5em;
+	}
+
+	._h3 {
+		font-size: 1.17em;
+	}
+
+	._h5 {
+		font-size: 0.83em;
+	}
+
+	._h6 {
+		font-size: 0.67em;
+	}
+
+	._h1,
+	._h2,
+	._h3,
+	._h4,
+	._h5,
+	._h6 {
+		display: block;
+		font-weight: bold;
+	}
+
+	._image {
+		display: block;
+		width: 100%;
+		height: 360px;
+		margin-top: -360px;
+		opacity: 0;
+	}
+
+	._ins {
+		text-decoration: underline;
+	}
+
+	._li {
+		flex: 1;
+		width: 0;
+	}
+
+	._ol-bef {
+		width: 36px;
+		margin-right: 5px;
+		text-align: right;
+	}
+
+	._ul-bef {
+		display: block;
+		margin: 0 12px 0 23px;
+		line-height: normal;
+	}
+
+	._ol-bef,
+	._ul-bef {
+		flex: none;
+		user-select: none;
+	}
+
+	._ul-p1 {
+		display: inline-block;
+		width: 0.3em;
+		height: 0.3em;
+		overflow: hidden;
+		line-height: 0.3em;
+	}
+
+	._ul-p2 {
+		display: inline-block;
+		width: 0.23em;
+		height: 0.23em;
+		border: 0.05em solid black;
+		border-radius: 50%;
+	}
+
+	._q::before {
+		content: '"';
+	}
+
+	._q::after {
+		content: '"';
+	}
+
+	._sub {
+		font-size: smaller;
+		vertical-align: sub;
+	}
+
+	._sup {
+		font-size: smaller;
+		vertical-align: super;
+	}
+
+	/* #ifdef MP-ALIPAY || APP-PLUS || QUICKAPP-WEBVIEW */
+	._abbr,
+	._b,
+	._code,
+	._del,
+	._em,
+	._i,
+	._ins,
+	._label,
+	._q,
+	._span,
+	._strong,
+	._sub,
+	._sup {
+		display: inline;
+	}
+
+	/* #endif */
+
+	/* #ifdef MP-WEIXIN || MP-QQ */
+	.__bdo,
+	.__bdi,
+	.__ruby,
+	.__rt {
+		display: inline-block;
+	}
+
+	/* #endif */
+	._video {
+		position: relative;
+		display: inline-block;
+		width: 300px;
+		height: 225px;
+		background-color: black;
+	}
+
+	._video::after {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin: -15px 0 0 -15px;
+		content: '';
+		border-color: transparent transparent transparent white;
+		border-style: solid;
+		border-width: 15px 0 15px 30px;
+	}
+</style>
diff --git a/uview-ui/components/u-parse/u-parse.vue b/uview-ui/components/u-parse/u-parse.vue
new file mode 100644
index 0000000..57a105e
--- /dev/null
+++ b/uview-ui/components/u-parse/u-parse.vue
@@ -0,0 +1,645 @@
+<template>
+	<view>
+		<slot v-if="!nodes.length" />
+		<!--#ifdef APP-PLUS-NVUE-->
+		<web-view id="_top" ref="web" :style="'margin-top:-2px;height:'+height+'px'" @onPostMessage="_message" />
+		<!--#endif-->
+		<!--#ifndef APP-PLUS-NVUE-->
+		<view id="_top" :style="showAm+(selectable?';user-select:text;-webkit-user-select:text':'')">
+			<!--#ifdef H5 || MP-360-->
+			<div :id="'rtf'+uid"></div>
+			<!--#endif-->
+			<!--#ifndef H5 || MP-360-->
+			<trees :nodes="nodes" :lazyLoad="lazyLoad" :loading="loadingImg" />
+			<!--#endif-->
+		</view>
+		<!--#endif-->
+	</view>
+</template>
+
+<script>
+	var search;
+	// #ifndef H5 || APP-PLUS-NVUE || MP-360
+	import trees from './libs/trees';
+	var cache = {},
+		// #ifdef MP-WEIXIN || MP-TOUTIAO
+		fs = uni.getFileSystemManager ? uni.getFileSystemManager() : null,
+		// #endif
+		Parser = require('./libs/MpHtmlParser.js');
+	var dom;
+	// 计算 cache 的 key
+	function hash(str) {
+		for (var i = str.length, val = 5381; i--;)
+			val += (val << 5) + str.charCodeAt(i);
+		return val;
+	}
+	// #endif
+	// #ifdef H5 || APP-PLUS-NVUE || MP-360
+	var {
+		windowWidth,
+		platform
+	} = uni.getSystemInfoSync(),
+		cfg = require('./libs/config.js');
+	// #endif
+	// #ifdef APP-PLUS-NVUE
+	var weexDom = weex.requireModule('dom');
+	// #endif
+	/**
+	 * Parser 富文本组件
+	 * @tutorial https://github.com/jin-yufeng/Parser
+	 * @property {String} html 富文本数据
+	 * @property {Boolean} autopause 是否在播放一个视频时自动暂停其他视频
+	 * @property {Boolean} autoscroll 是否自动给所有表格添加一个滚动层
+	 * @property {Boolean} autosetTitle 是否自动将 title 标签中的内容设置到页面标题
+	 * @property {Number} compress 压缩等级
+	 * @property {String} domain 图片、视频等链接的主域名
+	 * @property {Boolean} lazyLoad 是否开启图片懒加载
+	 * @property {String} loadingImg 图片加载完成前的占位图
+	 * @property {Boolean} selectable 是否开启长按复制
+	 * @property {Object} tagStyle 标签的默认样式
+	 * @property {Boolean} showWithAnimation 是否使用渐显动画
+	 * @property {Boolean} useAnchor 是否使用锚点
+	 * @property {Boolean} useCache 是否缓存解析结果
+	 * @event {Function} parse 解析完成事件
+	 * @event {Function} load dom 加载完成事件
+	 * @event {Function} ready 所有图片加载完毕事件
+	 * @event {Function} error 错误事件
+	 * @event {Function} imgtap 图片点击事件
+	 * @event {Function} linkpress 链接点击事件
+	 * @author JinYufeng
+	 * @version 20201029
+	 * @listens MIT
+	 */
+	export default {
+		name: 'parser',
+		data() {
+			return {
+				// #ifdef H5 || MP-360
+				uid: this._uid,
+				// #endif
+				// #ifdef APP-PLUS-NVUE
+				height: 1,
+				// #endif
+				// #ifndef APP-PLUS-NVUE
+				showAm: '',
+				// #endif
+				nodes: []
+			}
+		},
+		// #ifndef H5 || APP-PLUS-NVUE || MP-360
+		components: {
+			trees
+		},
+		// #endif
+		props: {
+			html: String,
+			autopause: {
+				type: Boolean,
+				default: true
+			},
+			autoscroll: Boolean,
+			autosetTitle: {
+				type: Boolean,
+				default: true
+			},
+			// #ifndef H5 || APP-PLUS-NVUE || MP-360
+			compress: Number,
+			loadingImg: String,
+			useCache: Boolean,
+			// #endif
+			domain: String,
+			lazyLoad: Boolean,
+			selectable: Boolean,
+			tagStyle: Object,
+			showWithAnimation: Boolean,
+			useAnchor: Boolean
+		},
+		watch: {
+			html(html) {
+				this.setContent(html);
+			}
+		},
+		created() {
+			// 图片数组
+			this.imgList = [];
+			this.imgList.each = function(f) {
+				for (var i = 0, len = this.length; i < len; i++)
+					this.setItem(i, f(this[i], i, this));
+			}
+			this.imgList.setItem = function(i, src) {
+				if (i == void 0 || !src) return;
+				// #ifndef MP-ALIPAY || APP-PLUS
+				// 去重
+				if (src.indexOf('http') == 0 && this.includes(src)) {
+					var newSrc = src.split('://')[0];
+					for (var j = newSrc.length, c; c = src[j]; j++) {
+						if (c == '/' && src[j - 1] != '/' && src[j + 1] != '/') break;
+						newSrc += Math.random() > 0.5 ? c.toUpperCase() : c;
+					}
+					newSrc += src.substr(j);
+					return this[i] = newSrc;
+				}
+				// #endif
+				this[i] = src;
+				// 暂存 data src
+				if (src.includes('data:image')) {
+					var filePath, info = src.match(/data:image\/(\S+?);(\S+?),(.+)/);
+					if (!info) return;
+					// #ifdef MP-WEIXIN || MP-TOUTIAO
+					filePath = `${wx.env.USER_DATA_PATH}/${Date.now()}.${info[1]}`;
+					fs && fs.writeFile({
+						filePath,
+						data: info[3],
+						encoding: info[2],
+						success: () => this[i] = filePath
+					})
+					// #endif
+					// #ifdef APP-PLUS
+					filePath = `_doc/parser_tmp/${Date.now()}.${info[1]}`;
+					var bitmap = new plus.nativeObj.Bitmap();
+					bitmap.loadBase64Data(src, () => {
+						bitmap.save(filePath, {}, () => {
+							bitmap.clear()
+							this[i] = filePath;
+						})
+					})
+					// #endif
+				}
+			}
+		},
+		mounted() {
+			// #ifdef H5 || MP-360
+			this.document = document.getElementById('rtf' + this._uid);
+			// #endif
+			// #ifndef H5 || APP-PLUS-NVUE || MP-360
+			if (dom) this.document = new dom(this);
+			// #endif
+			if (search) this.search = args => search(this, args);
+			// #ifdef APP-PLUS-NVUE
+			this.document = this.$refs.web;
+			setTimeout(() => {
+				// #endif
+				if (this.html) this.setContent(this.html);
+				// #ifdef APP-PLUS-NVUE
+			}, 30)
+			// #endif
+		},
+		beforeDestroy() {
+			// #ifdef H5 || MP-360
+			if (this._observer) this._observer.disconnect();
+			// #endif
+			this.imgList.each(src => {
+				// #ifdef APP-PLUS
+				if (src && src.includes('_doc')) {
+					plus.io.resolveLocalFileSystemURL(src, entry => {
+						entry.remove();
+					});
+				}
+				// #endif
+				// #ifdef MP-WEIXIN || MP-TOUTIAO
+				if (src && src.includes(uni.env.USER_DATA_PATH))
+					fs && fs.unlink({
+						filePath: src
+					})
+				// #endif
+			})
+			clearInterval(this._timer);
+		},
+		methods: {
+			// 设置富文本内容
+			setContent(html, append) {
+				// #ifdef APP-PLUS-NVUE
+				if (!html)
+					return this.height = 1;
+				if (append)
+					this.$refs.web.evalJs("var b=document.createElement('div');b.innerHTML='" + html.replace(/'/g, "\\'") +
+						"';document.getElementById('parser').appendChild(b)");
+				else {
+					html =
+						'<meta charset="utf-8" /><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><style>html,body{width:100%;height:100%;overflow:hidden}body{margin:0}</style><base href="' +
+						this.domain + '"><div id="parser"' + (this.selectable ? '>' : ' style="user-select:none">') + this._handleHtml(html).replace(/\n/g, '\\n') +
+						'</div><script>"use strict";function e(e){if(window.__dcloud_weex_postMessage||window.__dcloud_weex_){var t={data:[e]};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(t):window.__dcloud_weex_.postMessage(JSON.stringify(t))}}document.body.onclick=function(){e({action:"click"})},' +
+						(this.showWithAnimation ? 'document.body.style.animation="_show .5s",' : '') +
+						'setTimeout(function(){e({action:"load",text:document.body.innerText,height:document.getElementById("parser").scrollHeight})},50);\x3c/script>';
+					if (platform == 'android') html = html.replace(/%/g, '%25');
+					this.$refs.web.evalJs("document.write('" + html.replace(/'/g, "\\'") + "');document.close()");
+				}
+				this.$refs.web.evalJs(
+					'var t=document.getElementsByTagName("title");t.length&&e({action:"getTitle",title:t[0].innerText});for(var o,n=document.getElementsByTagName("style"),r=1;o=n[r++];)o.innerHTML=o.innerHTML.replace(/body/g,"#parser");for(var a,c=document.getElementsByTagName("img"),s=[],i=0==c.length,d=0,l=0,g=0;a=c[l];l++)parseInt(a.style.width||a.getAttribute("width"))>' +
+					windowWidth + '&&(a.style.height="auto"),a.onload=function(){++d==c.length&&(i=!0)},a.onerror=function(){++d==c.length&&(i=!0),' + (cfg.errorImg ? 'this.src="' + cfg.errorImg + '",' : '') +
+					'e({action:"error",source:"img",target:this})},a.hasAttribute("ignore")||"A"==a.parentElement.nodeName||(a.i=g++,s.push(a.getAttribute("original-src")||a.src||a.getAttribute("data-src")),a.onclick=function(t){t.stopPropagation(),e({action:"preview",img:{i:this.i,src:this.src}})});e({action:"getImgList",imgList:s});for(var u,m=document.getElementsByTagName("a"),f=0;u=m[f];f++)u.onclick=function(m){m.stopPropagation();var t,o=this.getAttribute("href");if("#"==o[0]){var n=document.getElementById(o.substr(1));n&&(t=n.offsetTop)}return e({action:"linkpress",href:o,offset:t}),!1};for(var h,y=document.getElementsByTagName("video"),v=0;h=y[v];v++)h.style.maxWidth="100%",h.onerror=function(){e({action:"error",source:"video",target:this})}' +
+					(this.autopause ? ',h.onplay=function(){for(var e,t=0;e=y[t];t++)e!=this&&e.pause()}' : '') +
+					';for(var _,p=document.getElementsByTagName("audio"),w=0;_=p[w];w++)_.onerror=function(){e({action:"error",source:"audio",target:this})};' +
+					(this.autoscroll ? 'for(var T,E=document.getElementsByTagName("table"),B=0;T=E[B];B++){var N=document.createElement("div");N.style.overflow="scroll",T.parentNode.replaceChild(N,T),N.appendChild(T)}' : '') +
+					'var x=document.getElementById("parser");clearInterval(window.timer),window.timer=setInterval(function(){i&&clearInterval(window.timer),e({action:"ready",ready:i,height:x.scrollHeight})},350)'
+				)
+				this.nodes = [1];
+				// #endif
+				// #ifdef H5 || MP-360
+				if (!html) {
+					if (this.rtf && !append) this.rtf.parentNode.removeChild(this.rtf);
+					return;
+				}
+				var div = document.createElement('div');
+				if (!append) {
+					if (this.rtf) this.rtf.parentNode.removeChild(this.rtf);
+					this.rtf = div;
+				} else {
+					if (!this.rtf) this.rtf = div;
+					else this.rtf.appendChild(div);
+				}
+				div.innerHTML = this._handleHtml(html, append);
+				for (var styles = this.rtf.getElementsByTagName('style'), i = 0, style; style = styles[i++];) {
+					style.innerHTML = style.innerHTML.replace(/body/g, '#rtf' + this._uid);
+					style.setAttribute('scoped', 'true');
+				}
+				// 懒加载
+				if (!this._observer && this.lazyLoad && IntersectionObserver) {
+					this._observer = new IntersectionObserver(changes => {
+						for (let item, i = 0; item = changes[i++];) {
+							if (item.isIntersecting) {
+								item.target.src = item.target.getAttribute('data-src');
+								item.target.removeAttribute('data-src');
+								this._observer.unobserve(item.target);
+							}
+						}
+					}, {
+						rootMargin: '500px 0px 500px 0px'
+					})
+				}
+				var _ts = this;
+				// 获取标题
+				var title = this.rtf.getElementsByTagName('title');
+				if (title.length && this.autosetTitle)
+					uni.setNavigationBarTitle({
+						title: title[0].innerText
+					})
+				// 填充 domain
+				var fill = target => {
+					var src = target.getAttribute('src');
+					if (this.domain && src) {
+						if (src[0] == '/') {
+							if (src[1] == '/')
+								target.src = (this.domain.includes('://') ? this.domain.split('://')[0] : '') + ':' + src;
+							else target.src = this.domain + src;
+						} else if (!src.includes('://') && src.indexOf('data:') != 0) target.src = this.domain + '/' + src;
+					}
+				}
+				// 图片处理
+				this.imgList.length = 0;
+				var imgs = this.rtf.getElementsByTagName('img');
+				for (let i = 0, j = 0, img; img = imgs[i]; i++) {
+					if (parseInt(img.style.width || img.getAttribute('width')) > windowWidth)
+						img.style.height = 'auto';
+					fill(img);
+					if (!img.hasAttribute('ignore') && img.parentElement.nodeName != 'A') {
+						img.i = j++;
+						_ts.imgList.push(img.getAttribute('original-src') || img.src || img.getAttribute('data-src'));
+						img.onclick = function(e) {
+							e.stopPropagation();
+							var preview = true;
+							this.ignore = () => preview = false;
+							_ts.$emit('imgtap', this);
+							if (preview) {
+								uni.previewImage({
+									current: this.i,
+									urls: _ts.imgList
+								});
+							}
+						}
+					}
+					img.onerror = function() {
+						if (cfg.errorImg)
+							_ts.imgList[this.i] = this.src = cfg.errorImg;
+						_ts.$emit('error', {
+							source: 'img',
+							target: this
+						});
+					}
+					if (_ts.lazyLoad && this._observer && img.src && img.i != 0) {
+						img.setAttribute('data-src', img.src);
+						img.removeAttribute('src');
+						this._observer.observe(img);
+					}
+				}
+				// 链接处理
+				var links = this.rtf.getElementsByTagName('a');
+				for (var link of links) {
+					link.onclick = function(e) {
+						e.stopPropagation();
+						var jump = true,
+							href = this.getAttribute('href');
+						_ts.$emit('linkpress', {
+							href,
+							ignore: () => jump = false
+						});
+						if (jump && href) {
+							if (href[0] == '#') {
+								if (_ts.useAnchor) {
+									_ts.navigateTo({
+										id: href.substr(1)
+									})
+								}
+							} else if (href.indexOf('http') == 0 || href.indexOf('//') == 0)
+								return true;
+							else
+								uni.navigateTo({
+									url: href
+								})
+						}
+						return false;
+					}
+				}
+				// 视频处理
+				var videos = this.rtf.getElementsByTagName('video');
+				_ts.videoContexts = videos;
+				for (let video, i = 0; video = videos[i++];) {
+					fill(video);
+					video.style.maxWidth = '100%';
+					video.onerror = function() {
+						_ts.$emit('error', {
+							source: 'video',
+							target: this
+						});
+					}
+					video.onplay = function() {
+						if (_ts.autopause)
+							for (let item, i = 0; item = _ts.videoContexts[i++];)
+								if (item != this) item.pause();
+					}
+				}
+				// 音频处理
+				var audios = this.rtf.getElementsByTagName('audio');
+				for (var audio of audios) {
+					fill(audio);
+					audio.onerror = function() {
+						_ts.$emit('error', {
+							source: 'audio',
+							target: this
+						});
+					}
+				}
+				// 表格处理
+				if (this.autoscroll) {
+					var tables = this.rtf.getElementsByTagName('table');
+					for (var table of tables) {
+						let div = document.createElement('div');
+						div.style.overflow = 'scroll';
+						table.parentNode.replaceChild(div, table);
+						div.appendChild(table);
+					}
+				}
+				if (!append) this.document.appendChild(this.rtf);
+				this.$nextTick(() => {
+					this.nodes = [1];
+					this.$emit('load');
+				});
+				setTimeout(() => this.showAm = '', 500);
+				// #endif
+				// #ifndef APP-PLUS-NVUE
+				// #ifndef H5 || MP-360
+				var nodes;
+				if (!html) return this.nodes = [];
+				var parser = new Parser(html, this);
+				// 缓存读取
+				if (this.useCache) {
+					var hashVal = hash(html);
+					if (cache[hashVal])
+						nodes = cache[hashVal];
+					else {
+						nodes = parser.parse();
+						cache[hashVal] = nodes;
+					}
+				} else nodes = parser.parse();
+				this.$emit('parse', nodes);
+				if (append) this.nodes = this.nodes.concat(nodes);
+				else this.nodes = nodes;
+				if (nodes.length && nodes.title && this.autosetTitle)
+					uni.setNavigationBarTitle({
+						title: nodes.title
+					})
+				if (this.imgList) this.imgList.length = 0;
+				this.videoContexts = [];
+				this.$nextTick(() => {
+					(function f(cs) {
+						for (var i = cs.length; i--;) {
+							if (cs[i].top) {
+								cs[i].controls = [];
+								cs[i].init();
+								f(cs[i].$children);
+							}
+						}
+					})(this.$children)
+					this.$emit('load');
+				})
+				// #endif
+				var height;
+				clearInterval(this._timer);
+				this._timer = setInterval(() => {
+					// #ifdef H5 || MP-360
+					this.rect = this.rtf.getBoundingClientRect();
+					// #endif
+					// #ifndef H5 || MP-360
+					uni.createSelectorQuery().in(this)
+						.select('#_top').boundingClientRect().exec(res => {
+							if (!res) return;
+							this.rect = res[0];
+							// #endif
+							if (this.rect.height == height) {
+								this.$emit('ready', this.rect)
+								clearInterval(this._timer);
+							}
+							height = this.rect.height;
+							// #ifndef H5 || MP-360
+						});
+					// #endif
+				}, 350);
+				if (this.showWithAnimation && !append) this.showAm = 'animation:_show .5s';
+				// #endif
+			},
+			// 获取文本内容
+			getText(ns = this.nodes) {
+				var txt = '';
+				// #ifdef APP-PLUS-NVUE
+				txt = this._text;
+				// #endif
+				// #ifdef H5 || MP-360
+				txt = this.rtf.innerText;
+				// #endif
+				// #ifndef H5 || APP-PLUS-NVUE || MP-360
+				for (var i = 0, n; n = ns[i++];) {
+					if (n.type == 'text') txt += n.text.replace(/&nbsp;/g, '\u00A0').replace(/&lt;/g, '<').replace(/&gt;/g, '>')
+						.replace(/&amp;/g, '&');
+					else if (n.type == 'br') txt += '\n';
+					else {
+						// 块级标签前后加换行
+						var block = n.name == 'p' || n.name == 'div' || n.name == 'tr' || n.name == 'li' || (n.name[0] == 'h' && n.name[1] >
+							'0' && n.name[1] < '7');
+						if (block && txt && txt[txt.length - 1] != '\n') txt += '\n';
+						if (n.children) txt += this.getText(n.children);
+						if (block && txt[txt.length - 1] != '\n') txt += '\n';
+						else if (n.name == 'td' || n.name == 'th') txt += '\t';
+					}
+				}
+				// #endif
+				return txt;
+			},
+			// 锚点跳转
+			in (obj) {
+				if (obj.page && obj.selector && obj.scrollTop) this._in = obj;
+			},
+			navigateTo(obj) {
+				if (!this.useAnchor) return obj.fail && obj.fail('Anchor is disabled');
+				// #ifdef APP-PLUS-NVUE
+				if (!obj.id)
+					weexDom.scrollToElement(this.$refs.web);
+				else
+					this.$refs.web.evalJs('var pos=document.getElementById("' + obj.id +
+						'");if(pos)post({action:"linkpress",href:"#",offset:pos.offsetTop+' + (obj.offset || 0) + '})');
+				obj.success && obj.success();
+				// #endif
+				// #ifndef APP-PLUS-NVUE
+				var d = ' ';
+				// #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+				d = '>>>';
+				// #endif
+				var selector = uni.createSelectorQuery().in(this._in ? this._in.page : this).select((this._in ? this._in.selector :
+					'#_top') + (obj.id ? `${d}#${obj.id},${this._in?this._in.selector:'#_top'}${d}.${obj.id}` : '')).boundingClientRect();
+				if (this._in) selector.select(this._in.selector).scrollOffset().select(this._in.selector).boundingClientRect();
+				else selector.selectViewport().scrollOffset();
+				selector.exec(res => {
+					if (!res[0]) return obj.fail && obj.fail('Label not found')
+					var scrollTop = res[1].scrollTop + res[0].top - (res[2] ? res[2].top : 0) + (obj.offset || 0);
+					if (this._in) this._in.page[this._in.scrollTop] = scrollTop;
+					else uni.pageScrollTo({
+						scrollTop,
+						duration: 300
+					})
+					obj.success && obj.success();
+				})
+				// #endif
+			},
+			// 获取视频对象
+			getVideoContext(id) {
+				// #ifndef APP-PLUS-NVUE
+				if (!id) return this.videoContexts;
+				else
+					for (var i = this.videoContexts.length; i--;)
+						if (this.videoContexts[i].id == id) return this.videoContexts[i];
+				// #endif
+			},
+			// #ifdef H5 || APP-PLUS-NVUE || MP-360
+			_handleHtml(html, append) {
+				if (!append) {
+					// 处理 tag-style 和 userAgentStyles
+					var style = '<style>@keyframes _show{0%{opacity:0}100%{opacity:1}}img{max-width:100%}';
+					for (var item in cfg.userAgentStyles)
+						style += `${item}{${cfg.userAgentStyles[item]}}`;
+					for (item in this.tagStyle)
+						style += `${item}{${this.tagStyle[item]}}`;
+					style += '</style>';
+					html = style + html;
+				}
+				// 处理 rpx
+				if (html.includes('rpx'))
+					html = html.replace(/[0-9.]+\s*rpx/g, $ => (parseFloat($) * windowWidth / 750) + 'px');
+				return html;
+			},
+			// #endif
+			// #ifdef APP-PLUS-NVUE
+			_message(e) {
+				// 接收 web-view 消息
+				var d = e.detail.data[0];
+				switch (d.action) {
+					case 'load':
+						this.$emit('load');
+						this.height = d.height;
+						this._text = d.text;
+						break;
+					case 'getTitle':
+						if (this.autosetTitle)
+							uni.setNavigationBarTitle({
+								title: d.title
+							})
+						break;
+					case 'getImgList':
+						this.imgList.length = 0;
+						for (var i = d.imgList.length; i--;)
+							this.imgList.setItem(i, d.imgList[i]);
+						break;
+					case 'preview':
+						var preview = true;
+						d.img.ignore = () => preview = false;
+						this.$emit('imgtap', d.img);
+						if (preview)
+							uni.previewImage({
+								current: d.img.i,
+								urls: this.imgList
+							})
+						break;
+					case 'linkpress':
+						var jump = true,
+							href = d.href;
+						this.$emit('linkpress', {
+							href,
+							ignore: () => jump = false
+						})
+						if (jump && href) {
+							if (href[0] == '#') {
+								if (this.useAnchor)
+									weexDom.scrollToElement(this.$refs.web, {
+										offset: d.offset
+									})
+							} else if (href.includes('://'))
+								plus.runtime.openWeb(href);
+							else
+								uni.navigateTo({
+									url: href
+								})
+						}
+						break;
+					case 'error':
+						if (d.source == 'img' && cfg.errorImg)
+							this.imgList.setItem(d.target.i, cfg.errorImg);
+						this.$emit('error', {
+							source: d.source,
+							target: d.target
+						})
+						break;
+					case 'ready':
+						this.height = d.height;
+						if (d.ready) uni.createSelectorQuery().in(this).select('#_top').boundingClientRect().exec(res => {
+							this.rect = res[0];
+							this.$emit('ready', res[0]);
+						})
+						break;
+					case 'click':
+						this.$emit('click');
+						this.$emit('tap');
+				}
+			},
+			// #endif
+		}
+	}
+</script>
+
+<style>
+	@keyframes _show {
+		0% {
+			opacity: 0;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+
+	/* #ifdef MP-WEIXIN */
+	:host {
+		display: block;
+		overflow: auto;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	/* #endif */
+</style>
diff --git a/uview-ui/components/u-picker/u-picker.vue b/uview-ui/components/u-picker/u-picker.vue
new file mode 100644
index 0000000..68212a4
--- /dev/null
+++ b/uview-ui/components/u-picker/u-picker.vue
@@ -0,0 +1,676 @@
+<template>
+	<u-popup :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
+		<view class="u-datetime-picker">
+			<view class="u-picker-header" @touchmove.stop.prevent="">
+				<view class="u-btn-picker u-btn-picker--tips" 
+					:style="{ color: cancelColor }" 
+					hover-class="u-opacity" 
+					:hover-stay-time="150" 
+					@tap="getResult('cancel')"
+				>{{cancelText}}</view>
+				<view class="u-picker__title">{{ title }}</view>
+				<view
+					class="u-btn-picker u-btn-picker--primary"
+					:style="{ color: moving ? cancelColor : confirmColor }"
+					hover-class="u-opacity"
+					:hover-stay-time="150"
+					@touchmove.stop=""
+					@tap.stop="getResult('confirm')"
+				>
+					{{confirmText}}
+				</view>
+			</view>
+			<view class="u-picker-body">
+				<picker-view v-if="mode == 'region'" :value="valueArr" @change="change" class="u-picker-view" @pickstart="pickstart" @pickend="pickend">
+					<picker-view-column v-if="!reset && params.province">
+						<view class="u-column-item" v-for="(item, index) in provinces" :key="index">
+							<view class="u-line-1">{{ item.label }}</view>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.city">
+						<view class="u-column-item" v-for="(item, index) in citys" :key="index">
+							<view class="u-line-1">{{ item.label }}</view>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.area">
+						<view class="u-column-item" v-for="(item, index) in areas" :key="index">
+							<view class="u-line-1">{{ item.label }}</view>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<picker-view v-else-if="mode == 'time'" :value="valueArr" @change="change" class="u-picker-view" @pickstart="pickstart" @pickend="pickend">
+					<picker-view-column v-if="!reset && params.year">
+						<view class="u-column-item" v-for="(item, index) in years" :key="index">
+							{{ item }}
+							<text class="u-text" v-if="showTimeTag">年</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.month">
+						<view class="u-column-item" v-for="(item, index) in months" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">月</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.day">
+						<view class="u-column-item" v-for="(item, index) in days" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">日</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.hour">
+						<view class="u-column-item" v-for="(item, index) in hours" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">时</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.minute">
+						<view class="u-column-item" v-for="(item, index) in minutes" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">分</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!reset && params.second">
+						<view class="u-column-item" v-for="(item, index) in seconds" :key="index">
+							{{ formatNumber(item) }}
+							<text class="u-text" v-if="showTimeTag">秒</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<picker-view v-else-if="mode == 'selector'" :value="valueArr" @change="change" class="u-picker-view" @pickstart="pickstart" @pickend="pickend">
+					<picker-view-column v-if="!reset">
+						<view class="u-column-item" v-for="(item, index) in range" :key="index">
+							<view class="u-line-1">{{ getItemValue(item, 'selector') }}</view>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<picker-view v-else-if="mode == 'multiSelector'" :value="valueArr" @change="change" class="u-picker-view" @pickstart="pickstart" @pickend="pickend">
+					<picker-view-column v-if="!reset" v-for="(item, index) in range" :key="index">
+						<view class="u-column-item" v-for="(item1, index1) in item" :key="index1">
+							<view class="u-line-1">{{ getItemValue(item1, 'multiSelector') }}</view>
+						</view>
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+import provinces from '../../libs/util/province.js';
+import citys from '../../libs/util/city.js';
+import areas from '../../libs/util/area.js';
+
+/**
+ * picker picker弹出选择器
+ * @description 此选择器有两种弹出模式：一是时间模式，可以配置年，日，月，时，分，秒参数 二是地区模式，可以配置省，市，区参数
+ * @tutorial https://www.uviewui.com/components/picker.html
+ * @property {Object} params 需要显示的参数，见官网说明
+ * @property {String} mode 模式选择，region-地区类型，time-时间类型（默认time）
+ * @property {String Number} start-year 可选的开始年份，mode=time时有效（默认1950）
+ * @property {String Number} end-year 可选的结束年份，mode=time时有效（默认2050）
+ * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+ * @property {Boolean} show-time-tag 时间模式时，是否显示后面的年月日中文提示
+ * @property {String} cancel-color 取消按钮的颜色（默认#606266）
+ * @property {String} confirm-color 确认按钮的颜色（默认#2979ff）
+ * @property {String} default-time 默认选中的时间，mode=time时有效
+ * @property {String} confirm-text 确认按钮的文字
+ * @property {String} cancel-text 取消按钮的文字
+ * @property {String} default-region 默认选中的地区，中文形式，mode=region时有效
+ * @property {String} default-code 默认选中的地区，编号形式，mode=region时有效
+ * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker（默认true）
+ * @property {String Number} z-index 弹出时的z-index值（默认1075）
+ * @property {Array} default-selector 数组形式，其中每一项表示选择了range对应项中的第几个
+ * @property {Array} range 自定义选择的数据，mode=selector或mode=multiSelector时有效
+ * @property {String} range-key 当range参数的元素为对象时，指定Object中的哪个key的值作为选择器显示内容
+ * @event {Function} confirm 点击确定按钮，返回当前选择的值
+ * @event {Function} cancel 点击取消按钮，返回当前选择的值
+ * @example <u-picker v-model="show" mode="time"></u-picker>
+ */
+export default {
+	name: 'u-picker',
+	props: {
+		// 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,
+				};
+			}
+		},
+		// 当mode=selector或者mode=multiSelector时，提供的数组
+		range: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 当mode=selector或者mode=multiSelector时，提供的默认选中的下标
+		defaultSelector: {
+			type: Array,
+			default() {
+				return [0];
+			}
+		},
+		// 当 range 是一个 Array＜Object＞ 时，通过 range-key 来指定 Object 中 key 的值作为选择器显示内容
+		rangeKey: {
+			type: String,
+			default: ''
+		},
+		// 模式选择，region-地区类型，time-时间类型，selector-单列模式，multiSelector-多列模式
+		mode: {
+			type: String,
+			default: 'time'
+		},
+		// 年份开始时间
+		startYear: {
+			type: [String, Number],
+			default: 1950
+		},
+		// 年份结束时间
+		endYear: {
+			type: [String, Number],
+			default: 2050
+		},
+		// "取消"按钮的颜色
+		cancelColor: {
+			type: String,
+			default: '#606266'
+		},
+		// "确定"按钮的颜色
+		confirmColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 默认显示的时间，2025-07-02 || 2025-07-02 13:01:00 || 2025/07/02
+		defaultTime: {
+			type: String,
+			default: ''
+		},
+		// 默认显示的地区，可传类似["河北省", "秦皇岛市", "北戴河区"]
+		defaultRegion: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 时间模式时，是否显示后面的年月日中文提示
+		showTimeTag: {
+			type: Boolean,
+			default: true
+		},
+		// 默认显示地区的编码，defaultRegion和areaCode同时存在，areaCode优先，可传类似["13", "1303", "130304"]
+		areaCode: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许通过点击遮罩关闭Picker
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 通过双向绑定控制组件的弹出与收起
+		value: {
+			type: Boolean,
+			default: false
+		},
+		// 弹出的z-index值
+		zIndex: {
+			type: [String, Number],
+			default: 0
+		},
+		// 顶部标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: '确认'
+		}
+	},
+	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 // 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+		};
+	},
+	mounted() {
+		this.init();
+	},
+	computed: {
+		propsChange() {
+			// 引用这几个变量，是为了监听其变化
+			return `${this.mode}-${this.defaultTime}-${this.startYear}-${this.endYear}-${this.defaultRegion}-${this.areaCode}`;
+		},
+		regionChange() {
+			// 引用这几个变量，是为了监听其变化
+			return `${this.province}-${this.city}`;
+		},
+		yearAndMonth() {
+			return `${this.year}-${this.month}`;
+		},
+		uZIndex() {
+			// 如果用户有传递z-index值，优先使用
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	watch: {
+		propsChange() {
+			this.reset = true;
+			setTimeout(() => this.init(), 10);
+		},
+		// 如果地区发生变化，为了让picker联动起来，必须重置this.citys和this.areas
+		regionChange(val) {
+			this.citys = citys[this.province];
+			this.areas = areas[this.province][this.city];
+		},
+		// watch监听月份的变化，实时变更日的天数，因为不同月份，天数不一样
+		// 一个月可能有30，31天，甚至闰年2月的29天，平年2月28天
+		yearAndMonth(val) {
+			if (this.params.year) this.setDays();
+		},
+		// 微信和QQ小程序由于一些奇怪的原因(故同时对所有平台均初始化一遍)，需要重新初始化才能显示正确的值
+		value(n) {
+			if (n) {
+				this.reset = true;
+				setTimeout(() => this.init(), 10);
+			}
+		}
+	},
+	methods: {
+		// 标识滑动开始，只有微信小程序才有这样的事件
+		pickstart() {
+			// #ifdef MP-WEIXIN
+			this.moving = true;
+			// #endif
+		},
+		// 标识滑动结束
+		pickend() {
+			// #ifdef MP-WEIXIN
+			this.moving = false;
+			// #endif
+		},
+		// 对单列和多列形式的判断是否有传入变量的情况
+		getItemValue(item, mode) {
+			// 目前(2020-05-25)uni-app对微信小程序编译有错误，导致v-if为false中的内容也执行，错误导致
+			// 单列模式或者多列模式中的getItemValue同时被执行，故在这里再加一层判断
+			if (this.mode == mode) {
+				return typeof item == 'object' ? item[this.rangeKey] : item;
+			}
+		},
+		// 小于10前面补0，用于月份，日期，时分秒等
+		formatNumber(num) {
+			return +num < 10 ? '0' + num : String(num);
+		},
+		// 生成递进的数组
+		generateArray: function(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: function(arr, val) {
+			let index = arr.indexOf(val);
+			// 如果index为-1(即找不到index值)，~(-1)=-(-1)-1=0，导致条件不成立
+			return ~index ? index : 0;
+		},
+		//日期时间处理
+		initTimeValue() {
+			// 格式化时间，在IE浏览器(uni不存在此情况)，无法识别日期间的"-"间隔符号
+			let fdate = this.defaultTime.replace(/\-/g, '/');
+			fdate = fdate && fdate.indexOf('/') == -1 ? `2020/01/01 ${fdate}` : fdate;
+			let time = null;
+			if (fdate) time = new Date(fdate);
+			else time = new Date();
+			// 获取年日月时分秒
+			this.year = time.getFullYear();
+			this.month = Number(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;
+			// 这里不能使用类似setMonths()中的this.valueArr.splice(this.valueArr.length - 1, xxx)做法
+			// 因为this.month和this.year变化时，会触发watch中的this.setDays()，导致this.valueArr.length计算有误
+			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() {
+			// 判断是否需要province参数
+			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.defaultRegion.length) tmp = this.defaultRegion[0];
+			else tmp = 0;
+			// 历遍省份数组匹配
+			provinces.map((v, k) => {
+				if (useCode ? v.value == tmp : v.label == tmp) {
+					tmp = k;
+				}
+			});
+			this.province = tmp;
+			this.provinces = provinces;
+			// 设置默认省份的值
+			this.valueArr.splice(0, 1, this.province);
+		},
+		setCitys() {
+			if (!this.params.city) return;
+			let tmp = '';
+			let useCode = false;
+			if (this.areaCode.length) {
+				tmp = this.areaCode[1];
+				useCode = true;
+			} else if (this.defaultRegion.length) tmp = this.defaultRegion[1];
+			else tmp = 0;
+			citys[this.province].map((v, k) => {
+				if (useCode ? v.value == tmp : v.label == tmp) {
+					tmp = k;
+				}
+			});
+			this.city = tmp;
+			this.citys = citys[this.province];
+			this.valueArr.splice(1, 1, this.city);
+		},
+		setAreas() {
+			if (!this.params.area) return;
+			let tmp = '';
+			let useCode = false;
+			if (this.areaCode.length) {
+				tmp = this.areaCode[2];
+				useCode = true;
+			} else if (this.defaultRegion.length) tmp = this.defaultRegion[2];
+			else tmp = 0;
+			areas[this.province][this.city].map((v, k) => {
+				if (useCode ? v.value == tmp : v.label == tmp) {
+					tmp = k;
+				}
+			});
+			this.area = tmp;
+			this.areas = areas[this.province][this.city];
+			this.valueArr.splice(2, 1, this.area);
+		},
+		close() {
+			this.$emit('input', false);
+		},
+		// 用户更改picker的列选项
+		change(e) {
+			this.valueArr = e.detail.value;
+			let i = 0;
+			if (this.mode == 'time') {
+				// 这里使用i++，是因为this.valueArr数组的长度是不确定长度的，它根据this.params的值来配置长度
+				// 进入if规则，i会加1，保证了能获取准确的值
+				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') {
+				if (this.params.province) this.province = this.valueArr[i++];
+				if (this.params.city) this.city = this.valueArr[i++];
+				if (this.params.area) this.area = this.valueArr[i++];
+			} else if (this.mode == 'multiSelector') {
+				let index = null;
+				// 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
+				this.defaultSelector.map((val, idx) => {
+					if (val != e.detail.value[idx]) index = idx;
+				});
+				// 为了让用户对多列变化时，对动态设置其他列的变更
+				if (index != null) {
+					this.$emit('columnchange', {
+						column: index,
+						index: e.detail.value[index]
+					});
+				}
+			}
+		},
+		// 用户点击确定按钮
+		getResult(event = null) {
+			// #ifdef MP-WEIXIN
+			if (this.moving) return;
+			// #endif
+			let result = {};
+			// 只返回用户在this.params中配置了为true的字段
+			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 == 'selector') {
+				result = this.valueArr;
+			} else if (this.mode == 'multiSelector') {
+				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>
+@import '../../libs/css/style.components.scss';
+
+.u-datetime-picker {
+	position: relative;
+	z-index: 999;
+}
+
+.u-picker-view {
+	height: 100%;
+	box-sizing: border-box;
+}
+
+.u-picker-header {
+	width: 100%;
+	height: 90rpx;
+	padding: 0 40rpx;
+	@include vue-flex;
+	justify-content: space-between;
+	align-items: center;
+	box-sizing: border-box;
+	font-size: 30rpx;
+	background: #fff;
+	position: relative;
+}
+
+.u-picker-header::after {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+
+.u-picker__title {
+	color: $u-content-color;
+}
+
+.u-picker-body {
+	width: 100%;
+	height: 500rpx;
+	overflow: hidden;
+	background-color: #fff;
+}
+
+.u-column-item {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 32rpx;
+	color: $u-main-color;
+	padding: 0 8rpx;
+}
+
+.u-text {
+	font-size: 24rpx;
+	padding-left: 8rpx;
+}
+
+.u-btn-picker {
+	padding: 16rpx;
+	box-sizing: border-box;
+	text-align: center;
+	text-decoration: none;
+}
+
+.u-opacity {
+	opacity: 0.5;
+}
+
+.u-btn-picker--primary {
+	color: $u-type-primary;
+}
+
+.u-btn-picker--tips {
+	color: $u-tips-color;
+}
+</style>
diff --git a/uview-ui/components/u-popup/u-popup.vue b/uview-ui/components/u-popup/u-popup.vue
new file mode 100644
index 0000000..69c0ec8
--- /dev/null
+++ b/uview-ui/components/u-popup/u-popup.vue
@@ -0,0 +1,456 @@
+<template>
+	<view v-if="visibleSync" :style="[customStyle, {
+		zIndex: uZindex - 1
+	}]" class="u-drawer" hover-stop-propagation>
+		<u-mask :duration="duration" :custom-style="maskCustomStyle" :maskClickAble="maskCloseAble" :z-index="uZindex - 2" :show="showDrawer && mask" @click="maskClick"></u-mask>
+		<view
+			class="u-drawer-content"
+			@tap="modeCenterClose(mode)"
+			:class="[
+				safeAreaInsetBottom ? 'safe-area-inset-bottom' : '',
+				'u-drawer-' + mode,
+				showDrawer ? 'u-drawer-content-visible' : '',
+				zoom && mode == 'center' ? 'u-animation-zoom' : ''
+			]"
+			@touchmove.stop.prevent
+			@tap.stop.prevent
+			:style="[style]"
+		>
+			<view class="u-mode-center-box" @tap.stop.prevent @touchmove.stop.prevent v-if="mode == 'center'" :style="[centerStyle]">
+				<u-icon
+					@click="close"
+					v-if="closeable"
+					class="u-close"
+					:class="['u-close--' + closeIconPos]"
+					:name="closeIcon"
+					:color="closeIconColor"
+					:size="closeIconSize"
+				></u-icon>
+				<scroll-view class="u-drawer__scroll-view" scroll-y="true">
+					<slot />
+				</scroll-view>
+			</view>
+			<scroll-view class="u-drawer__scroll-view" scroll-y="true" v-else>
+				<slot />
+			</scroll-view>
+			<view @tap="close" class="u-close" :class="['u-close--' + closeIconPos]">
+				<u-icon
+					v-if="mode != 'center' && closeable"
+					:name="closeIcon"
+					:color="closeIconColor"
+					:size="closeIconSize"
+				></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * popup 弹窗
+ * @description 弹出层容器，用于展示弹窗、信息提示等内容，支持上、下、左、右和中部弹出。组件只提供容器，内部内容由用户自定义
+ * @tutorial https://www.uviewui.com/components/popup.html
+ * @property {String} mode 弹出方向（默认left）
+ * @property {Boolean} mask 是否显示遮罩（默认true）
+ * @property {Stringr | Number} length mode=left | 见官网说明（默认auto）
+ * @property {Boolean} zoom 是否开启缩放动画，只在mode为center时有效（默认true）
+ * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+ * @property {Boolean} mask-close-able 点击遮罩是否可以关闭弹出层（默认true）
+ * @property {Object} custom-style 用户自定义样式
+ * @property {Stringr | Number} negative-top 中部弹出时，往上偏移的值
+ * @property {Numberr | String} border-radius 弹窗圆角值（默认0）
+ * @property {Numberr | String} z-index 弹出内容的z-index值（默认1075）
+ * @property {Boolean} closeable 是否显示关闭图标（默认false）
+ * @property {String} close-icon 关闭图标的名称，只能uView的内置图标
+ * @property {String} close-icon-pos 自定义关闭图标位置（默认top-right）
+ * @property {String} close-icon-color 关闭图标的颜色（默认#909399）
+ * @property {Number | String} close-icon-size 关闭图标的大小，单位rpx（默认30）
+ * @event {Function} open 弹出层打开
+ * @event {Function} close 弹出层收起
+ * @example <u-popup v-model="show"><view>出淤泥而不染，濯清涟而不妖</view></u-popup>
+ */
+export default {
+	name: 'u-popup',
+	props: {
+		/**
+		 * 显示状态
+		 */
+		show: {
+			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)，单位rpx，或者"auto"
+		// 或者百分比"50%"，表示由内容撑开高度或者宽度
+		length: {
+			type: [Number, String],
+			default: 'auto'
+		},
+		// 是否开启缩放动画，只在mode=center时有效
+		zoom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否可以通过点击遮罩进行关闭
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 用户自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		value: {
+			type: Boolean,
+			default: false
+		},
+		// 此为内部参数，不在文档对外使用，为了解决Picker和keyboard等融合了弹窗的组件
+		// 对v-model双向绑定多层调用造成报错不能修改props值的问题
+		popup: {
+			type: Boolean,
+			default: true
+		},
+		// 显示显示弹窗的圆角，单位rpx
+		borderRadius: {
+			type: [Number, String],
+			default: 0
+		},
+		zIndex: {
+			type: [Number, String],
+			default: ''
+		},
+		// 是否显示关闭图标
+		closeable: {
+			type: Boolean,
+			default: false
+		},
+		// 关闭图标的名称，只能uView的内置图标
+		closeIcon: {
+			type: String,
+			default: 'close'
+		},
+		// 自定义关闭图标位置，top-left为左上角，top-right为右上角，bottom-left为左下角，bottom-right为右下角
+		closeIconPos: {
+			type: String,
+			default: 'top-right'
+		},
+		// 关闭图标的颜色
+		closeIconColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 关闭图标的大小，单位rpx
+		closeIconSize: {
+			type: [String, Number],
+			default: '30'
+		},
+		// 宽度，只对左，右，中部弹出时起作用，单位rpx，或者"auto"
+		// 或者百分比"50%"，表示由内容撑开高度或者宽度，优先级高于length参数
+		width: {
+			type: String,
+			default: ''
+		},
+		// 高度，只对上，下，中部弹出时起作用，单位rpx，或者"auto"
+		// 或者百分比"50%"，表示由内容撑开高度或者宽度，优先级高于length参数
+		height: {
+			type: String,
+			default: ''
+		},
+		// 给一个负的margin-top，往上偏移，避免和键盘重合的情况，仅在mode=center时有效
+		negativeTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 遮罩的样式，一般用于修改遮罩的透明度
+		maskCustomStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 遮罩打开或收起的动画过渡时间，单位ms
+		duration: {
+			type: [String, Number],
+			default: 250
+		}
+	},
+	data() {
+		return {
+			visibleSync: false,
+			showDrawer: false,
+			timer: null,
+			closeFromInner: false, // value的值改变，是发生在内部还是外部
+		};
+	},
+	computed: {
+		// 根据mode的位置，设定其弹窗的宽度(mode = left|right)，或者高度(mode = top|bottom)
+		style() {
+			let style = {};
+			// 如果是左边或者上边弹出时，需要给translate设置为负值，用于隐藏
+			if (this.mode == 'left' || this.mode == 'right') {
+				style = {
+					width: this.width ? this.getUnitValue(this.width) : this.getUnitValue(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.getUnitValue(this.height) : this.getUnitValue(this.length),
+					transform: `translate3D(0px,${this.mode == 'top' ? '-100%' : '100%'},0px)`
+				};
+			}
+			style.zIndex = this.uZindex;
+			// 如果用户设置了borderRadius值，添加弹窗的圆角
+			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;
+					default:
+				}
+				// 不加可能圆角无效
+				style.overflow = 'hidden';
+			}
+			if(this.duration) style.transition = `all ${this.duration / 1000}s linear`;
+			return style;
+		},
+		// 中部弹窗的特有样式
+		centerStyle() {
+			let style = {};
+			style.width = this.width ? this.getUnitValue(this.width) : this.getUnitValue(this.length);
+			// 中部弹出的模式，如果没有设置高度，就用auto值，由内容撑开高度
+			style.height = this.height ? this.getUnitValue(this.height) : 'auto';
+			style.zIndex = this.uZindex;
+			style.marginTop = `-${this.$u.addUnit(this.negativeTop)}`;
+			if (this.borderRadius) {
+				style.borderRadius = `${this.borderRadius}rpx`;
+				// 不加可能圆角无效
+				style.overflow = 'hidden';
+			}
+			return style;
+		},
+		// 计算整理后的z-index值
+		uZindex() {
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	watch: {
+		value(val) {
+			if (val) {
+				this.open();
+			} else if(!this.closeFromInner) {
+				this.close();
+			}
+			this.closeFromInner = false;
+		}
+	},
+	mounted() {
+		// 组件渲染完成时，检查value是否为true，如果是，弹出popup
+		this.value && this.open();
+	},
+    methods: {
+		// 判断传入的值，是否带有单位，如果没有，就默认用rpx单位
+		getUnitValue(val) {
+			if(/(%|px|rpx|auto)$/.test(val)) return val;
+			else return val + 'rpx'
+		},
+		// 遮罩被点击
+		maskClick() {
+			this.close();
+		},
+		close() {
+			// 标记关闭是内部发生的，否则修改了value值，导致watch中对value检测，导致再执行一遍close
+			// 造成@close事件触发两次
+			this.closeFromInner = true;
+			this.change('showDrawer', 'visibleSync', false);
+		},
+		// 中部弹出时，需要.u-drawer-content将居中内容，此元素会铺满屏幕，点击需要关闭弹窗
+		// 让其只在mode=center时起作用
+		modeCenterClose(mode) {
+			if (mode != 'center' || !this.maskCloseAble) return;
+			this.close();
+		},
+		open() {
+			this.change('visibleSync', 'showDrawer', true);
+		},
+		// 此处的原理是，关闭时先通过动画隐藏弹窗和遮罩，再移除整个组件
+		// 打开时，先渲染组件，延时一定时间再让遮罩和弹窗的动画起作用
+		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');
+				}, 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.duration);
+			}
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-drawer {
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	overflow: hidden;
+}
+
+.u-drawer-content {
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	position: absolute;
+	z-index: 1003;
+	transition: all 0.25s linear;
+}
+
+.u-drawer__scroll-view {
+	width: 100%;
+	height: 100%;
+}
+
+.u-drawer-left {
+	top: 0;
+	bottom: 0;
+	left: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-right {
+	right: 0;
+	top: 0;
+	bottom: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-top {
+	top: 0;
+	left: 0;
+	right: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-bottom {
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: #ffffff;
+}
+
+.u-drawer-center {
+	@include vue-flex;
+	flex-direction: column;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	top: 0;
+	justify-content: center;
+	align-items: center;
+	opacity: 0;
+	z-index: 99999;
+}
+
+.u-mode-center-box {
+	min-width: 100rpx;
+	min-height: 100rpx;
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	position: relative;
+	background-color: #ffffff;
+}
+
+.u-drawer-content-visible.u-drawer-center {
+	transform: scale(1);
+	opacity: 1;
+}
+
+.u-animation-zoom {
+	transform: scale(1.15);
+}
+
+.u-drawer-content-visible {
+	transform: translate3D(0px, 0px, 0px) !important;
+}
+
+.u-close {
+	position: absolute;
+	z-index: 3;
+}
+
+.u-close--top-left {
+	top: 30rpx;
+	left: 30rpx;
+}
+
+.u-close--top-right {
+	top: 30rpx;
+	right: 30rpx;
+}
+
+.u-close--bottom-left {
+	bottom: 30rpx;
+	left: 30rpx;
+}
+
+.u-close--bottom-right {
+	right: 30rpx;
+	bottom: 30rpx;
+}
+</style>
diff --git a/uview-ui/components/u-radio-group/u-radio-group.vue b/uview-ui/components/u-radio-group/u-radio-group.vue
new file mode 100644
index 0000000..2172eb2
--- /dev/null
+++ b/uview-ui/components/u-radio-group/u-radio-group.vue
@@ -0,0 +1,128 @@
+<template>
+	<view class="u-radio-group u-clearfix">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	import Emitter from '../../libs/util/emitter.js';
+	/**
+	 * radioRroup 单选框父组件
+	 * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio使用
+	 * @tutorial https://www.uviewui.com/components/radio.html
+	 * @property {Boolean} disabled 是否禁用所有radio（默认false）
+	 * @property {String Number} size 组件整体的大小，单位rpx（默认40）
+	 * @property {String} active-color 选中时的颜色，应用到所有子Radio组件（默认#2979ff）
+	 * @property {String Number} icon-size 图标大小，单位rpx（默认20）
+	 * @property {String} shape 外观形状，shape-方形，circle-圆形(默认circle)
+	 * @property {Boolean} label-disabled 是否禁止点击文本操作checkbox(默认false)
+	 * @property {String} width 宽度，需带单位
+	 * @property {Boolean} wrap 是否每个radio都换行（默认false）
+	 * @event {Function} change 任一个radio状态发生变化时触发
+	 * @example <u-radio-group v-model="value"></u-radio-group>
+	 */
+	export default {
+		name: "u-radio-group",
+		mixins: [Emitter],
+		props: {
+			// 是否禁用所有单选框
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 匹配某一个radio组件，如果某个radio的name值等于此值，那么这个radio就被会选中
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// 选中状态下的颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 组件的整体大小
+			size: {
+				type: [String, Number],
+				default: 34
+			},
+			// 是否禁止点击提示语选中复选框
+			labelDisabled: {
+				type: Boolean,
+				default: false
+			},
+			// 形状，square为方形，circle为原型
+			shape: {
+				type: String,
+				default: 'circle'
+			},
+			// 图标的大小，单位rpx
+			iconSize: {
+				type: [String, Number],
+				default: 20
+			},
+			// 每个checkbox占u-checkbox-group的宽度
+			width: {
+				type: [String, Number],
+				default: 'auto'
+			},
+			// 是否每个checkbox都换行
+			wrap: {
+				type: Boolean,
+				default: false
+			}
+		},
+		created() {
+			// 如果将children定义在data中，在微信小程序会造成循环引用而报错
+			this.children = [];
+		},
+		watch: {
+			// 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
+			parentData() {
+				if(this.children.length) {
+					this.children.map(child => {
+						// 判断子组件(u-radio)如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
+						typeof(child.updateParentData) == 'function' && child.updateParentData();
+					})
+				}
+			},
+		},
+		computed: {
+			// 这里computed的变量，都是子组件u-radio需要用到的，由于头条小程序的兼容性差异，子组件无法实时监听父组件参数的变化
+			// 所以需要手动通知子组件，这里返回一个parentData变量，供watch监听，在其中去通知每一个子组件重新从父组件(u-radio-group)
+			// 拉取父组件新的变化后的参数
+			parentData() {
+				return [this.value, this.disabled, this.activeColor, this.size, this.labelDisabled, this.shape, this.iconSize, this.width, this.wrap];
+			}
+		},
+		methods: {
+			// 该方法有子组件radio调用，当一个radio被选中的时候，给父组件设置value值(props传递的value)
+			setValue(val) {
+				// 通过子组件传递过来的val值(此被选中的子组件内部已将parentValue设置等于val的值)，将其他
+				// u-radio设置未选中的状态
+				this.children.map(child => {
+					if(child.parentData.value != val) child.parentData.value = '';
+				})
+				// 通过emit事件，设置父组件通过v-model双向绑定的值
+				this.$emit('input', val);
+				this.$emit('change', val);
+				// 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
+				// 由于头条小程序执行迟钝，故需要用几十毫秒的延时
+				setTimeout(() => {
+					// 将当前的值发送到 u-form-item 进行校验
+					this.dispatch('u-form-item', 'on-form-change', val);
+				}, 60)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-radio-group {
+		/* #ifndef MP || APP-NVUE */
+		display: inline-flex;
+		flex-wrap: wrap;
+		/* #endif */
+	}
+</style>
diff --git a/uview-ui/components/u-radio/u-radio.vue b/uview-ui/components/u-radio/u-radio.vue
new file mode 100644
index 0000000..1d9a439
--- /dev/null
+++ b/uview-ui/components/u-radio/u-radio.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="u-radio" :style="[radioStyle]">
+		<view class="u-radio__icon-wrap" @tap="toggle" :class="[iconClass]" :style="[iconStyle]">
+			<u-icon
+				class="u-radio__icon-wrap__icon"
+			    name="checkbox-mark"
+			    :size="elIconSize" 
+				:color="iconColor"/>
+		</view>
+		<view class="u-radio__label" @tap="onClickLabel" :style="{
+			fontSize: $u.addUnit(labelSize)
+		}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * radio 单选框
+	 * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio-group使用
+	 * @tutorial https://www.uviewui.com/components/radio.html
+	 * @property {String Number} icon-size 图标大小，单位rpx（默认24）
+	 * @property {String Number} label-size label字体大小，单位rpx（默认28）
+	 * @property {String Number} name radio组件的标示符
+	 * @property {String} shape 形状，见上方说明（默认circle）
+	 * @property {Boolean} disabled 是否禁用（默认false）
+	 * @property {Boolean} label-disabled 点击文本是否可以操作radio（默认true）
+	 * @property {String} active-color 选中时的颜色，如设置parent的active-color将失效
+	 * @event {Function} change 某个radio状态发生变化时触发(选中状态)
+	 * @example <u-radio :label-disabled="false">门掩黄昏，无计留春住</u-radio>
+	 */
+	export default {
+		name: "u-radio",
+		props: {
+			// radio的名称
+			name: {
+				type: [String, Number],
+				default: ''
+			},
+			// 形状，square为方形，circle为原型
+			shape: {
+				type: String,
+				default: ''
+			},
+			// 是否禁用
+			disabled: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// 是否禁止点击提示语选中复选框
+			labelDisabled: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值
+			activeColor: {
+				type: String,
+				default: ''
+			},
+			// 图标的大小，单位rpx
+			iconSize: {
+				type: [String, Number],
+				default: ''
+			},
+			// label的字体大小，rpx单位
+			labelSize: {
+				type: [String, Number],
+				default: ''
+			},
+		},
+		data() {
+			return {
+				// 父组件的默认值，因为头条小程序不支持在computed中使用this.parent.shape的形式
+				// 故只能使用如此方法
+				parentData: {
+					iconSize: null,
+					labelDisabled: null,
+					disabled: null,
+					shape: null,
+					activeColor: null,
+					size: null,
+					width: null,
+					height: null,
+					value: null,
+					wrap: null
+				}
+			};
+		},
+		created() {
+			this.parent = false;
+			// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
+			this.updateParentData();
+			this.parent.children.push(this);
+		},
+		computed: {
+			// 是否禁用，如果父组件u-raios-group禁用的话，将会忽略子组件的配置
+			elDisabled() {
+				return this.disabled !== '' ? this.disabled : this.parentData.disabled !== null ? this.parentData.disabled : false;
+			},
+			// 是否禁用label点击
+			elLabelDisabled() {
+				return this.labelDisabled !== '' ? this.labelDisabled : this.parentData.labelDisabled !== null ? this.parentData.labelDisabled : false;
+			},
+			// 组件尺寸，对应size的值，默认值为34rpx
+			elSize() {
+				return this.size ? this.size : (this.parentData.size ? this.parentData.size : 34);
+			},
+			// 组件的勾选图标的尺寸，默认20
+			elIconSize() {
+				return this.iconSize ? this.iconSize : (this.parentData.iconSize ? this.parentData.iconSize : 20);
+			},
+			// 组件选中激活时的颜色
+			elActiveColor() {
+				return this.activeColor ? this.activeColor : (this.parentData.activeColor ? this.parentData.activeColor : 'primary');
+			},
+			// 组件的形状
+			elShape() {
+				return this.shape ? this.shape : (this.parentData.shape ? this.parentData.shape : 'circle');
+			},
+			// 设置radio的状态，要求radio的name等于parent的value时才为选中状态
+			iconStyle() {
+				let style = {};
+				if (this.elActiveColor && this.parentData.value == this.name && !this.elDisabled) {
+					style.borderColor = this.elActiveColor;
+					style.backgroundColor = this.elActiveColor;
+				}
+				style.width = this.$u.addUnit(this.elSize);
+				style.height = this.$u.addUnit(this.elSize);
+				return style;
+			},
+			iconColor() {
+				return this.name ==  this.parentData.value ? '#ffffff' : 'transparent';
+			},
+			iconClass() {
+				let classes = [];
+				classes.push('u-radio__icon-wrap--' + this.elShape);
+				if (this.name == this.parentData.value) classes.push('u-radio__icon-wrap--checked');
+				if (this.elDisabled) classes.push('u-radio__icon-wrap--disabled');
+				if (this.name == this.parentData.value && this.elDisabled) classes.push(
+					'u-radio__icon-wrap--disabled--checked');
+				// 支付宝小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+				return classes.join(' ');
+			},
+			radioStyle() {
+				let style = {};
+				if (this.parentData.width) {
+					style.width = this.$u.addUnit(this.parentData.width);
+					// #ifdef MP
+					// 各家小程序因为它们特殊的编译结构，使用float布局
+					style.float = 'left';
+					// #endif
+					// #ifndef MP
+					// H5和APP使用flex布局
+					style.flex = `0 0 ${this.$u.addUnit(this.parentData.width)}`;
+					// #endif
+				}
+				if (this.parentData.wrap) {
+					style.width = '100%';
+					// #ifndef MP
+					// H5和APP使用flex布局，将宽度设置100%，即可自动换行
+					style.flex = '0 0 100%';
+					// #endif
+				}
+				return style;
+			}
+		},
+		methods: {
+			updateParentData() {
+				this.getParentData('u-radio-group');
+			},
+			onClickLabel() {
+				if (!this.elLabelDisabled && !this.elDisabled) {
+					this.setRadioCheckedStatus();
+				}
+			},
+			toggle() {
+				if (!this.elDisabled) {
+					this.setRadioCheckedStatus();
+				}
+			},
+			emitEvent() {
+				// u-radio的name不等于父组件的v-model的值时(意味着未选中)，才发出事件，避免多次点击触发事件
+				if(this.parentData.value != this.name) this.$emit('change', this.name);
+			},
+			// 改变组件选中状态
+			// 这里的改变的依据是，更改本组件的parentData.value值为本组件的name值，同时通过父组件遍历所有u-radio实例
+			// 将本组件外的其他u-radio的parentData.value都设置为空(由computed计算后，都被取消选中状态)，因而只剩下一个为选中状态
+			setRadioCheckedStatus() {
+				this.emitEvent();
+				if(this.parent) {
+					this.parent.setValue(this.name);
+					this.parentData.value = this.name;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-radio {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+		overflow: hidden;
+		user-select: none;
+		line-height: 1.8;
+		
+		&__icon-wrap {
+			color: $u-content-color;
+			@include vue-flex;
+			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: 20px;
+			border: 1px solid #c8c9cc;
+			transition-duration: 0.2s;
+			
+			/* #ifdef MP-TOUTIAO */
+			// 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
+			&__icon {
+				line-height: 0;
+			}
+			/* #endif */
+			
+			&--circle {
+				border-radius: 100%;
+			}
+			
+			&--square {
+				border-radius: 3px;
+			}
+			
+			&--checked {
+				color: #fff;
+				background-color: #2979ff;
+				border-color: #2979ff;
+			}
+			
+			&--disabled {
+				background-color: #ebedf0;
+				border-color: #c8c9cc;
+			}
+			
+			&--disabled--checked {
+				color: #c8c9cc !important;
+			}
+		}
+		
+		&__label {
+			word-wrap: break-word;
+			margin-left: 10rpx;
+			margin-right: 24rpx;
+			color: $u-content-color;
+			font-size: 30rpx;
+			
+			&--disabled {
+				color: #c8c9cc;
+			}
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-rate/u-rate.vue b/uview-ui/components/u-rate/u-rate.vue
new file mode 100644
index 0000000..17eb3a8
--- /dev/null
+++ b/uview-ui/components/u-rate/u-rate.vue
@@ -0,0 +1,275 @@
+<template>
+	<view class="u-rate" :id="elId" @touchmove.stop.prevent="touchMove">
+		<view class="u-star-wrap" v-for="(item, index) in count" :key="index" :class="[elClass]">
+			<u-icon
+				:name="activeIndex > index ? elActiveIcon : inactiveIcon"
+				@click="click(index + 1, $event)"
+				:color="activeIndex > index ? elActiveColor : inactiveColor"
+				:custom-style="{
+					fontSize: size + 'rpx',
+					padding: `0 ${gutter / 2 + 'rpx'}`
+				}"
+				:custom-prefix="customPrefix"
+				:show-decimal-icon="showDecimalIcon(index)"
+				:percent="decimal"
+				:inactive-color="inactiveColor"
+			></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>/**
+ * rate 评分
+ * @description 该组件一般用于满意度调查，星型评分的场景
+ * @tutorial https://www.uviewui.com/components/rate.html
+ * @property {String Number} count 最多可选的星星数量（默认5）
+ * @property {String Number} current 默认选中的星星数量（默认0）
+ * @property {Boolean} disabled 是否禁止用户操作（默认false）
+ * @property {String Number} size 星星的大小，单位rpx（默认32）
+ * @property {String} inactive-color 未选中星星的颜色（默认#b2b2b2）
+ * @property {String} active-color 选中的星星颜色（默认#FA3534）
+ * @property {String} active-icon 选中时的图标名，只能为uView的内置图标（默认star-fill）
+ * @property {String} inactive-icon 未选中时的图标名，只能为uView的内置图标（默认star）
+ * @property {String} gutter 星星之间的距离（默认10）
+ * @property {String Number} min-count 最少选中星星的个数（默认0）
+ * @property {Boolean} allow-half 是否允许半星选择（默认false）
+ * @event {Function} change 选中的星星发生变化时触发
+ * @example <u-rate :count="count" :current="2"></u-rate>
+ */
+
+export default {
+	name: 'u-rate',
+	props: {
+		// 用于v-model双向绑定选中的星星数量
+		// 1.4.5版新增
+		value: {
+			type: [Number, String],
+			default: -1
+		},
+		// 要显示的星星数量
+		count: {
+			type: [Number, String],
+			default: 5
+		},
+		// 当前需要默认选中的星星(选中的个数)
+		// 1.4.5后通过value双向绑定，不再建议使用此参数
+		current: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否不可选中
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 星星的大小，单位rpx
+		size: {
+			type: [Number, String],
+			default: 32
+		},
+		// 未选中时的颜色
+		inactiveColor: {
+			type: String,
+			default: '#b2b2b2'
+		},
+		// 选中的颜色
+		activeColor: {
+			type: String,
+			default: '#FA3534'
+		},
+		// 星星之间的间距，单位rpx
+		gutter: {
+			type: [Number, String],
+			default: 10
+		},
+		// 最少能选择的星星个数
+		minCount: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否允许半星(功能尚未实现)
+		allowHalf: {
+			type: Boolean,
+			default: false
+		},
+		// 选中时的图标(星星)
+		activeIcon: {
+			type: String,
+			default: 'star-fill'
+		},
+		// 未选中时的图标(星星)
+		inactiveIcon: {
+			type: String,
+			default: 'star'
+		},
+		// 自定义扩展前缀，方便用户扩展自己的图标库
+		customPrefix: {
+			type: String,
+			default: 'uicon'
+		},
+		colors: {
+			type: Array,
+			default() {
+				return []
+			}
+		},
+		icons: {
+			type: Array,
+			default() {
+				return []
+			}
+		}
+	},
+	data() {
+		return {
+			// 生成一个唯一id，否则一个页面多个评分组件，会造成冲突
+			elId: this.$u.guid(),
+			elClass: this.$u.guid(),
+			starBoxLeft: 0, // 评分盒子左边到屏幕左边的距离，用于滑动选择时计算距离
+			// 当前激活的星星的index，如果存在value，优先使用value，因为它可以双向绑定(1.4.5新增)
+			activeIndex: this.value != -1 ? this.value : this.current,
+			starWidth: 0, // 每个星星的宽度
+			starWidthArr: [] //每个星星最右边到组件盒子最左边的距离
+		}
+	},
+	watch: {
+		current(val) {
+			this.activeIndex = val
+		},
+		value(val) {
+			this.activeIndex = val
+		}
+	},
+	computed: {
+		decimal() {
+			if (this.disabled) {
+				return this.activeIndex * 100 % 100
+			} else if (this.allowHalf) {
+				return 50
+			}
+		},
+		elActiveIcon() {
+			const len = this.icons.length
+			// 此处规则类似于下方的elActiveColor参数，都是根据一定的规则，显示不同的图标
+			// 结果可能如此：icons参数传递了3个图标，当选中两个时，用第一个图标，4个时，用第二个图标
+			// 第三个时，用第三个图标作为激活的图标
+			if (len && len <= this.count) {
+				const step = Math.round(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
+		},
+		elActiveColor() {
+			const len = this.colors.length
+			// 如果有设置colors参数(此参数用于将图标分段，比如一共5颗星，colors传3个颜色值，那么根据一定的规则，2颗星可能为第一个颜色
+			// 4颗星为第二个颜色值，5颗星为第三个颜色值)
+			if (len && len <= this.count) {
+				const step = Math.round(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
+		}
+	},
+	methods: {
+		// 获取评分组件盒子的布局信息
+		getElRectById() {
+			// uView封装的获取节点的方法，详见文档
+			this.$uGetRect('#' + this.elId).then(res => {
+				this.starBoxLeft = res.left
+			})
+		},
+		// 获取单个星星的尺寸
+		getElRectByClass() {
+			// uView封装的获取节点的方法，详见文档
+			this.$uGetRect('.' + 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)
+			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) {
+			}
+			// 对第一个星星特殊处理，只有一个的时候，点击可以取消，否则无法作0星评价
+			if (index == 1) {
+				if (this.activeIndex == 1) {
+					this.activeIndex = 0
+				} else {
+					this.activeIndex = 1
+				}
+			} else {
+				this.activeIndex = index
+			}
+			// 对最少颗星星的限制
+			if (this.activeIndex < this.minCount) this.activeIndex = this.minCount
+			this.emitEvent()
+		},
+		// 发出事件
+		emitEvent() {
+			// 发出change事件
+			this.$emit('change', this.activeIndex)
+			// 同时修改双向绑定的value的值
+			if (this.value != -1) {
+				this.$emit('input', this.activeIndex)
+			}
+		},
+		showDecimalIcon(index) {
+			return this.disabled && parseInt(this.activeIndex) === index
+		}
+	},
+	mounted() {
+		this.getElRectById()
+		this.getElRectByClass()
+	}
+}
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-rate {
+	display: -webkit-inline-flex;
+	display: inline-flex;
+	align-items: center;
+	margin: 0;
+	padding: 0;
+}
+
+.u-icon {
+	box-sizing: border-box;
+}
+</style>
diff --git a/uview-ui/components/u-read-more/u-read-more.vue b/uview-ui/components/u-read-more/u-read-more.vue
new file mode 100644
index 0000000..a77a44f
--- /dev/null
+++ b/uview-ui/components/u-read-more/u-read-more.vue
@@ -0,0 +1,179 @@
+<template>
+	<view class="">
+		<view class="u-content" :class="[elId]" :style="{ 
+			height: isLongContent && !showMore ? showHeight + 'rpx' : 'auto',
+			textIndent: textIndent
+		}">
+			<slot></slot>
+		</view>
+		<view @tap="toggleReadMore" v-if="isLongContent" class="u-content__showmore-wrap"
+		    :class="{ 'u-content__show-more': showMore }"
+		    :style="[innerShadowStyle]">
+			<text class="u-content__showmore-wrap__readmore-btn" :style="{
+				fontSize: fontSize + 'rpx',
+				color: color
+			}">
+				{{ showMore ? openText : closeText }}
+			</text>
+			<view class="u-content__showmore-wrap__readmore-btn__icon u-flex">
+				<u-icon :color="color" :size="fontSize" :name="showMore ? 'arrow-up' : 'arrow-down'"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * readMore 阅读更多
+	 * @description 该组件一般用于内容较长，预先收起一部分，点击展开全部内容的场景。
+	 * @tutorial https://www.uviewui.com/components/readMore.html
+	 * @property {String Number} show-height 内容超出此高度才会显示展开全文按钮，单位rpx（默认400）
+	 * @property {Boolean} toggle 展开后是否显示收起按钮（默认false）
+	 * @property {String} close-text 关闭时的提示文字（默认“展开阅读全文”）
+	 * @property {String Number} font-size 提示文字的大小，单位rpx（默认28）
+	 * @property {String} text-indent 段落首行缩进的字符个数（默认2em）
+	 * @property {String} open-text 展开时的提示文字（默认“收起”）
+	 * @property {String} color 提示文字的颜色（默认#2979ff）
+	 * @example <u-read-more><rich-text :nodes="content"></rich-text></u-read-more>
+	 */
+	export default {
+		name: "u-read-more",
+		props: {
+			// 默认的显示占位高度，单位为rpx
+			showHeight: {
+				type: [Number, String],
+				default: 400
+			},
+			// 展开后是否显示"收起"按钮
+			toggle: {
+				type: Boolean,
+				default: false
+			},
+			// 关闭时的提示文字
+			closeText: {
+				type: String,
+				default: '展开阅读全文'
+			},
+			// 展开时的提示文字
+			openText: {
+				type: String,
+				default: '收起'
+			},
+			// 提示的文字颜色
+			color: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 提示文字的大小
+			fontSize: {
+				type: [String, Number],
+				default: 28
+			},
+			// 是否显示阴影
+			shadowStyle: {
+				type: Object,
+				default () {
+					return {
+						backgroundImage: "linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 80%)",
+						paddingTop: "300rpx",
+						marginTop: "-300rpx"
+					}
+				}
+			},
+			// 段落首行缩进的字符个数
+			textIndent: {
+				type: String,
+				default: '2em'
+			},
+			// open和close事件时，将此参数返回在回调参数中
+			index: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		watch: {
+			paramsChange(val) {
+				this.init();
+			}
+		},
+		computed: {
+			paramsChange() {
+				return `${this.toggle}-${this.showHeight}`;
+			},
+			// 展开后无需阴影，收起时才需要阴影样式
+			innerShadowStyle() {
+				if (this.showMore) return {};
+				else return this.shadowStyle
+			}
+		},
+		data() {
+			return {
+				isLongContent: false, // 是否需要隐藏一部分内容
+				showMore: false, // 当前隐藏与显示的状态，true-显示，false-收起
+				elId: this.$u.guid(), // 生成唯一class
+			};
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.init();
+			})
+		},
+		methods: {
+			init() {
+				this.$uGetRect('.' + this.elId).then(res => {
+					// 判断高度，如果真实内容高度大于占位高度，则显示收起与展开的控制按钮
+					if (res.height > uni.upx2px(this.showHeight)) {
+						this.isLongContent = true;
+						this.showMore = false;
+					}
+				})
+			},
+			// 展开或者收起
+			toggleReadMore() {
+				this.showMore = !this.showMore;
+				// 如果toggle为false，隐藏"收起"部分的内容
+				if (this.toggle == false) this.isLongContent = false;
+				// 发出打开或者收齐的事件
+				this.$emit(this.showMore ? 'open' : 'close', this.index);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-content {
+		font-size: 30rpx;
+		color: $u-content-color;
+		line-height: 1.8;
+		text-align: left;
+		overflow: hidden;
+
+		&__show-more {
+			padding-top: 0;
+			background: none;
+			margin-top: 20rpx;
+		}
+
+		&__showmore-wrap {
+			position: relative;
+			width: 100%;
+			padding-bottom: 26rpx;
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+
+			&__readmore-btn {
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				line-height: 1;
+
+				&__icon {
+					margin-left: 14rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-row-notice/u-row-notice.vue b/uview-ui/components/u-row-notice/u-row-notice.vue
new file mode 100644
index 0000000..f4683f1
--- /dev/null
+++ b/uview-ui/components/u-row-notice/u-row-notice.vue
@@ -0,0 +1,269 @@
+<template>
+	<view
+		v-if="show"
+		class="u-notice-bar"
+		:style="{
+			background: computeBgColor,
+			padding: padding
+		}"
+		:class="[
+			type ? `u-type-${type}-light-bg` : ''
+		]"
+	>
+		<view class="u-direction-row">
+			<view class="u-icon-wrap">
+				<u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor"></u-icon>
+			</view>
+			<view class="u-notice-box" id="u-notice-box">
+				<view
+					class="u-notice-content"
+					id="u-notice-content"
+					:style="{
+						animationDuration: animationDuration,
+						animationPlayState: animationPlayState,
+					}"
+				>
+					<text class="u-notice-text" @tap="click" :style="[textStyle]"
+					:class="['u-type-' + type]">{{showText}}</text>
+				</view>
+			</view>
+			<view class="u-icon-wrap">
+				<u-icon @click="getMore" class="u-right-icon" v-if="moreIcon" name="arrow-right" :size="26" :color="computeColor"></u-icon>
+				<u-icon @click="close" class="u-right-icon" v-if="closeIcon" name="close" :size="24" :color="computeColor"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	props: {
+		// 显示的内容，数组
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 显示的主题，success|error|primary|info|warning|none
+		// none主题默认为透明背景，黑色(contentColor)字体
+		type: {
+			type: String,
+			default: 'warning'
+		},
+		// 是否显示左侧的音量图标
+		volumeIcon: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示右侧的右箭头图标
+		moreIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示右侧的关闭图标
+		closeIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动播放
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 文字颜色，各图标也会使用文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: ''
+		},
+		// 是否显示
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 26
+		},
+		// 音量喇叭的大小
+		volumeSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+		speed: {
+			type: [Number, String],
+			default: 160
+		},
+		// 播放状态，play-播放，paused-暂停
+		playState: {
+			type: String,
+			default: 'play'
+		},
+		// 通知的边距
+		padding: {
+			type: [Number, String],
+			default: '18rpx 24rpx'
+		}
+	},
+	data() {
+		return {
+			textWidth: 0, // 滚动的文字宽度
+			boxWidth: 0, // 供文字滚动的父盒子的宽度，和前者一起为了计算滚动速度
+			animationDuration: '10s', // 动画执行时间
+			animationPlayState: 'paused', // 动画的开始和结束执行
+			showText: '' // 显示的文本
+		};
+	},
+	watch: {
+		list: {
+			immediate: true,
+			handler(val) {
+				this.showText = val.join('，');
+				this.$nextTick(() => {
+					this.initSize();
+				});
+			}
+		},
+		playState(val) {
+			if(val == 'play') this.animationPlayState = 'running';
+			else this.animationPlayState = 'paused';
+		},
+		speed(val) {
+			this.initSize();
+		}
+	},
+	computed: {
+		// 计算字体颜色，如果没有自定义的，就用uview主题颜色
+		computeColor() {
+			if (this.color) return this.color;
+			// 如果是无主题，就默认使用content-color
+			else if(this.type == 'none') return '#606266';
+			else return this.type;
+		},
+		// 文字内容的样式
+		textStyle() {
+			let style = {};
+			if (this.color) style.color = this.color;
+			else if(this.type == 'none') style.color = '#606266';
+			style.fontSize = this.fontSize + 'rpx';
+			return style;
+		},
+		// 计算背景颜色
+		computeBgColor() {
+			if (this.bgColor) return this.bgColor;
+			else if(this.type == 'none') return 'transparent';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.initSize();
+		});
+	},
+	methods: {
+		initSize() {
+			let query = [],
+				boxWidth = 0,
+				textWidth = 0;
+			let textQuery = new Promise((resolve, reject) => {
+				uni.createSelectorQuery()
+					.in(this)
+					.select(`#u-notice-content`)
+					.boundingClientRect()
+					.exec(ret => {
+						this.textWidth = ret[0].width;
+						resolve();
+					});
+			});
+			query.push(textQuery);
+			Promise.all(query).then(() => {
+				// 根据t=s/v(时间=路程/速度)，这里为何不需要加上#u-notice-box的宽度，因为中设置了.u-notice-content样式中设置了padding-left: 100%
+				// 恰巧计算出来的结果中已经包含了#u-notice-box的宽度
+				this.animationDuration = `${this.textWidth / uni.upx2px(this.speed)}s`;
+				// 这里必须这样开始动画，否则在APP上动画速度不会改变(HX版本2.4.6，IOS13)
+				this.animationPlayState = 'paused';
+				setTimeout(() => {
+					if(this.playState == 'play' && this.autoplay) this.animationPlayState = 'running';
+				}, 10);
+			});
+		},
+		// 点击通告栏
+		click(index) {
+			this.$emit('click');
+		},
+		// 点击关闭按钮
+		close() {
+			this.$emit('close');
+		},
+		// 点击更多箭头按钮
+		getMore() {
+			this.$emit('getMore');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+	
+.u-notice-bar {
+	padding: 18rpx 24rpx;
+	overflow: hidden;
+}
+
+.u-direction-row {
+	@include vue-flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.u-left-icon {
+	/* #ifndef APP-NVUE */
+	display: inline-flex;
+	/* #endif */
+	align-items: center;
+}
+
+.u-notice-box {
+	flex: 1;
+	@include vue-flex;
+	overflow: hidden;
+	margin-left: 12rpx;
+}
+
+.u-right-icon {
+	margin-left: 12rpx;
+	display: inline-flex;
+	align-items: center;
+}
+
+.u-notice-content {
+	animation: u-loop-animation 10s linear infinite both;
+	text-align: right;
+	// 这一句很重要，为了能让滚动左右连接起来
+	padding-left: 100%;
+	@include vue-flex;
+	flex-wrap: nowrap;
+}
+
+.u-notice-text {
+	font-size: 26rpx;
+	word-break: keep-all;
+	white-space: nowrap
+}
+
+@keyframes u-loop-animation {
+	0% {
+		transform: translate3d(0, 0, 0);
+	}
+
+	100% {
+		transform: translate3d(-100%, 0, 0);
+	}
+}
+</style>
diff --git a/uview-ui/components/u-row/u-row.vue b/uview-ui/components/u-row/u-row.vue
new file mode 100644
index 0000000..915dfa6
--- /dev/null
+++ b/uview-ui/components/u-row/u-row.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="u-row" :style="{
+			alignItems: uAlignItem,
+			justifyContent: uJustify
+		}"
+		@tap="click"
+	>
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * row 行布局
+	 * @description 通过基础的 12 分栏，迅速简便地创建布局。
+	 * @tutorial https://www.uviewui.com/components/layout.html#row-props
+	 * @property {String Number} gutter 栅格间隔，左右各为此值的一半，单位rpx（默认0）
+	 * @property {String} justify 水平排列方式(微信小程序暂不支持)默认（start(或flex-start)）
+	 * @property {String} align 垂直排列方式（默认center）
+	 * @example <u-row gutter="16"></u-row>
+	 */
+	export default {
+		name: "u-row",
+		props: {
+			// 给col添加间距，左右边距各占一半
+			gutter: {
+				type: [String, Number],
+				default: 20
+			},
+			// 水平排列方式，可选值为`start`(或`flex-start`)、`end`(或`flex-end`)、`center`、`around`(或`space-around`)、`between`(或`space-between`)
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			// 垂直对齐方式，可选值为top、center、bottom
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// 是否阻止事件传播
+			stop: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			uJustify() {
+				if (this.justify == 'end' || this.justify == 'start') return 'flex-' + this.justify;
+				else if (this.justify == 'around' || this.justify == 'between') return 'space-' + this.justify;
+				else return this.justify;
+			},
+			uAlignItem() {
+				if (this.align == 'top') return 'flex-start';
+				if (this.align == 'bottom') return 'flex-end';
+				else return this.align;
+			}
+		},
+		methods: {
+			click(e) {
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-row {
+		// 由于微信小程序编译后奇怪的页面结构，只能使用float布局实现，flex无法实现
+		/* #ifndef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
+		@include vue-flex;
+		/* #endif */
+		flex-wrap: wrap;
+	}
+
+	.u-row:after {
+		/* #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO */
+		display: table;
+		clear: both;
+		content: "";
+		/* #endif */
+	}
+</style>
diff --git a/uview-ui/components/u-search/u-search.vue b/uview-ui/components/u-search/u-search.vue
new file mode 100644
index 0000000..206f661
--- /dev/null
+++ b/uview-ui/components/u-search/u-search.vue
@@ -0,0 +1,342 @@
+<template>
+	<view class="u-search" @tap="clickHandler" :style="{
+		margin: margin,
+	}">
+		<view
+			class="u-content"
+			:style="{
+				backgroundColor: bgColor,
+				borderRadius: shape == 'round' ? '100rpx' : '10rpx',
+				border: borderStyle,
+				height: height + 'rpx'
+			}"
+		>
+			<view class="u-icon-wrap">
+				<u-icon class="u-clear-icon" :size="30" :name="searchIcon" :color="searchIconColor ? searchIconColor : color"></u-icon>
+			</view>
+			<input
+				confirm-type="search"
+				@blur="blur"
+				:value="value"
+				@confirm="search"
+				@input="inputChange"
+				:disabled="disabled"
+				@focus="getFocus"
+				:focus="focus"
+				:maxlength="maxlength"
+				placeholder-class="u-placeholder-class"
+				:placeholder="placeholder"
+				:placeholder-style="`color: ${placeholderColor}`"
+				class="u-input"
+				type="text"
+				:style="[{
+					textAlign: inputAlign,
+					color: color,
+					backgroundColor: bgColor,
+				}, inputStyle]"
+			/>
+			<view class="u-close-wrap" v-if="keyword && clearabled && focused" @tap="clear">
+				<u-icon class="u-clear-icon" name="close-circle-fill" size="34" color="#c0c4cc"></u-icon>
+			</view>
+		</view>
+		<view :style="[actionStyle]" class="u-action" 
+			:class="[showActionBtn || show ? 'u-action-active' : '']" 
+			@tap.stop.prevent="custom"
+		>{{ actionText }}</view>
+	</view>
+</template>
+
+<script>
+/**
+ * search 搜索框
+ * @description 搜索组件，集成了常见搜索框所需功能，用户可以一键引入，开箱即用。
+ * @tutorial https://www.uviewui.com/components/search.html
+ * @property {String} shape 搜索框形状，round-圆形，square-方形（默认round）
+ * @property {String} bg-color 搜索框背景颜色（默认#f2f2f2）
+ * @property {String} border-color 边框颜色，配置了颜色，才会有边框
+ * @property {String} placeholder 占位文字内容（默认“请输入关键字”）
+ * @property {Boolean} clearabled 是否启用清除控件（默认true）
+ * @property {Boolean} focus 是否自动获得焦点（默认false）
+ * @property {Boolean} show-action 是否显示右侧控件（默认true）
+ * @property {String} action-text 右侧控件文字（默认“搜索”）
+ * @property {Object} action-style 右侧控件的样式，对象形式
+ * @property {String} input-align 输入框内容水平对齐方式（默认left）
+ * @property {Object} input-style 自定义输入框样式，对象形式
+ * @property {Boolean} disabled 是否启用输入框（默认false）
+ * @property {String} search-icon-color 搜索图标的颜色，默认同输入框字体颜色
+ * @property {String} color 输入框字体颜色（默认#606266）
+ * @property {String} placeholder-color placeholder的颜色（默认#909399）
+ * @property {String} search-icon 输入框左边的图标，可以为uView图标名称或图片路径
+ * @property {String} margin 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"
+ * @property {Boolean} animation 是否开启动画，见上方说明（默认false）
+ * @property {String} value 输入框初始值
+ * @property {String | Number} maxlength 输入框最大能输入的长度，-1为不限制长度
+ * @property {Boolean} input-style input输入框的样式，可以定义文字颜色，大小等，对象形式
+ * @property {String | Number} height 输入框高度，单位rpx（默认64）
+ * @event {Function} change 输入框内容发生变化时触发
+ * @event {Function} search 用户确定搜索时触发，用户按回车键，或者手机键盘右下角的"搜索"键时触发
+ * @event {Function} custom 用户点击右侧控件时触发
+ * @event {Function} clear 用户点击清除按钮时触发
+ * @example <u-search placeholder="日照香炉生紫烟" v-model="keyword"></u-search>
+ */
+export default {
+	name: "u-search",
+	props: {
+		// 搜索框形状，round-圆形，square-方形
+		shape: {
+			type: String,
+			default: 'round'
+		},
+		// 搜索框背景色，默认值#f2f2f2
+		bgColor: {
+			type: String,
+			default: '#f2f2f2'
+		},
+		// 占位提示文字
+		placeholder: {
+			type: String,
+			default: '请输入关键字'
+		},
+		// 是否启用清除控件
+		clearabled: {
+			type: Boolean,
+			default: true
+		},
+		// 是否自动聚焦
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		// 是否在搜索框右侧显示取消按钮
+		showAction: {
+			type: Boolean,
+			default: true
+		},
+		// 右边控件的样式
+		actionStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 取消按钮文字
+		actionText: {
+			type: String,
+			default: '搜索'
+		},
+		// 输入框内容对齐方式，可选值为 left|center|right
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		// 是否启用输入框
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 开启showAction时，是否在input获取焦点时才显示
+		animation: {
+			type: Boolean,
+			default: false
+		},
+		// 边框颜色，只要配置了颜色，才会有边框
+		borderColor: {
+			type: String,
+			default: 'none'
+		},
+		// 输入框的初始化内容
+		value: {
+			type: String,
+			default: ''
+		},
+		// 搜索框高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: 64
+		},
+		// input输入框的样式，可以定义文字颜色，大小等，对象形式
+		inputStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 输入框最大能输入的长度，-1为不限制长度(来自uniapp文档)
+		maxlength: {
+			type: [Number, String],
+			default: '-1'
+		},
+		// 搜索图标的颜色，默认同输入框字体颜色
+		searchIconColor: {
+			type: String,
+			default: ''
+		},
+		// 输入框字体颜色
+		color: {
+			type: String,
+			default: '#606266'
+		},
+		// placeholder的颜色
+		placeholderColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"、"30rpx 20rpx"等写法
+		margin: {
+			type: String,
+			default: '0'
+		},
+		// 左边输入框的图标，可以为uView图标名称或图片路径
+		searchIcon: {
+			type: String,
+			default: 'search'
+		}
+	},
+	data() {
+		return {
+			keyword: '',
+			showClear: false, // 是否显示右边的清除图标
+			show: false,
+			// 标记input当前状态是否处于聚焦中，如果是，才会显示右侧的清除控件
+			focused: this.focus
+			// 绑定输入框的值
+			// inputValue: this.value
+		};
+	},
+	watch: {
+		keyword(nVal) {
+			// 双向绑定值，让v-model绑定的值双向变化
+			this.$emit('input', nVal);
+			// 触发change事件，事件效果和v-model双向绑定的效果一样，让用户多一个选择
+			this.$emit('change', nVal);
+		},
+		value: {
+			immediate: true,
+			handler(nVal) {
+				this.keyword = nVal;
+			}
+		}
+	},
+	computed: {
+		showActionBtn() {
+			if (!this.animation && this.showAction) return true;
+			else return false;
+		},
+		// 样式，根据用户传入的颜色值生成，如果不传入，默认为none
+		borderStyle() {
+			if (this.borderColor) return `1px solid ${this.borderColor}`;
+			else return 'none';
+		},
+	},
+	methods: {
+		// 目前HX2.6.9 v-model双向绑定无效，故监听input事件获取输入框内容的变化
+		inputChange(e) {
+			this.keyword = e.detail.value;
+		},
+		// 清空输入
+		// 也可以作为用户通过this.$refs形式调用清空输入框内容
+		clear() {
+			this.keyword = '';
+			// 延后发出事件，避免在父组件监听clear事件时，value为更新前的值(不为空)
+			this.$nextTick(() => {
+				this.$emit('clear');
+			})
+		},
+		// 确定搜索
+		search(e) {
+			this.$emit('search', e.detail.value);
+			try{
+				// 收起键盘
+				uni.hideKeyboard();
+			}catch(e){}
+		},
+		// 点击右边自定义按钮的事件
+		custom() {
+			this.$emit('custom', this.keyword);
+			try{
+				// 收起键盘
+				uni.hideKeyboard();
+			}catch(e){}
+		},
+		// 获取焦点
+		getFocus() {
+			this.focused = true;
+			// 开启右侧搜索按钮展开的动画效果
+			if (this.animation && this.showAction) this.show = true;
+			this.$emit('focus', this.keyword);
+		},
+		// 失去焦点
+		blur() {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100)
+			this.show = false;
+			this.$emit('blur', this.keyword);
+		},
+		// 点击搜索框，只有disabled=true时才发出事件，因为禁止了输入，意味着是想跳转真正的搜索页
+		clickHandler() {
+			if(this.disabled) this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-search {
+	@include vue-flex;
+	align-items: center;
+	flex: 1;
+}
+
+.u-content {
+	@include vue-flex;
+	align-items: center;
+	padding: 0 18rpx;
+	flex: 1;
+}
+
+.u-clear-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-input {
+	flex: 1;
+	font-size: 28rpx;
+	line-height: 1;
+	margin: 0 10rpx;
+	color: $u-tips-color;
+}
+
+.u-close-wrap {
+	width: 40rpx;
+	height: 100%;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 50%;
+}
+
+.u-placeholder-class {
+	color: $u-tips-color;
+}
+
+.u-action {
+	font-size: 28rpx;
+	color: $u-main-color;
+	width: 0;
+	overflow: hidden;
+	transition: all 0.3s;
+	white-space: nowrap;
+	text-align: center;
+}
+
+.u-action-active {
+	width: 80rpx;
+	margin-left: 10rpx;
+}
+</style>
diff --git a/uview-ui/components/u-section/u-section.vue b/uview-ui/components/u-section/u-section.vue
new file mode 100644
index 0000000..02293ce
--- /dev/null
+++ b/uview-ui/components/u-section/u-section.vue
@@ -0,0 +1,154 @@
+<template>
+	<view class="u-section">
+		<view class="u-section__title" :style="{
+			fontWeight: bold ? 'bold' : 'normal',
+			color: color,
+			fontSize: fontSize + 'rpx',
+			paddingLeft: showLine ? (fontSize * 0.7) + 'rpx' : 0
+		}" :class="{
+			'u-section--line': showLine
+		}">
+			<view class="u-section__title__icon-wrap u-flex" :style="[lineStyle]" v-if="showLine">
+				<u-icon top="0" name="column-line" :size="fontSize * 1.25" bold :color="lineColor ? lineColor : color"></u-icon>
+			</view>
+			<text class="u-flex u-section__title__text">{{title}}</text>
+		</view>
+		<view class="u-section__right-info" v-if="right || $slots.right" :style="{
+			color: subColor
+		}" @tap="rightClick"> 
+			<slot name="right" v-if="$slots.right" />
+			<block v-else>
+				{{subTitle}}
+				<view class="u-section__right-info__icon-arrow u-flex" v-if="arrow">
+					<u-icon name="arrow-right" size="24" :color="subColor"></u-icon>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * section 查看更多
+	 * @description 该组件一般用于分类信息有很多，但是限于篇幅只能列出一部分，让用户通过"查看更多"获得更多信息的场景，实际效果见演示。
+	 * @tutorial https://www.uviewui.com/components/section.html
+	 * @property {String} title 左边主标题
+	 * @property {String} sub-title 右边副标题（默认更多）
+	 * @property {Boolean} right 是否显示右边的内容（默认true）
+	 * @property {Boolean} showLine 是否显示左边的竖条（默认true）
+	 * @property {Boolean} arrow 是否显示右边箭头（默认true）
+	 * @property {String Number} font-size 主标题的字体大小（默认28）
+	 * @property {Boolean} bold 主标题是否加粗（默认true）
+	 * @property {String} color 主标题颜色（默认#303133）
+	 * @event {Function} click 组件右侧的内容被点击时触发，用于跳转"更多"
+	 * @example <u-section title="今日热门" :right="false"></u-section>
+	 */
+	export default {
+		name: "u-section",
+		props: {
+			// 标题信息
+			title: {
+				type: String,
+				default: ''
+			},
+			// 右边副标题内容
+			subTitle: {
+				type: String,
+				default: '更多'
+			},
+			// 是否显示右边的内容
+			right: {
+				type: Boolean,
+				default: true
+			},
+			fontSize: {
+				type: [Number, String],
+				default: 28
+			},
+			// 主标题是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 主标题的颜色
+			color: {
+				type: String,
+				default: '#303133'
+			},
+			// 右边副标题的颜色
+			subColor: {
+				type: String,
+				default: '#909399'
+			},
+			// 是否显示左边的竖条
+			showLine: {
+				type: Boolean,
+				default: true
+			},
+			// 左边竖线的颜色
+			lineColor: {
+				type: String,
+				default: ''
+			},
+			// 是否显示右边箭头
+			arrow: {
+				type: Boolean,
+				default: true
+			},
+		},
+		computed: {
+			// 左边竖条的样式
+			lineStyle() {
+				// 由于安卓和iOS的，需要稍微调整绝对定位的top值，才能让左边的竖线和右边的文字垂直居中
+				return {
+					// 由于竖线为字体图标，具有比实际线宽更宽的宽度，所以也需要根据字体打下动态调整
+					left: -(Number(this.fontSize) * 0.9) + 'rpx',
+					top: -(Number(this.fontSize) * (this.$u.os() == 'ios' ? 0.14 : 0.15)) + 'rpx',
+				}
+			}
+		},
+		methods: {
+			rightClick() {
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-section {
+		@include vue-flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 100%;
+		
+		&__title {
+			position: relative;
+			font-size: 28rpx;
+			padding-left: 20rpx;
+			@include vue-flex;
+			align-items: center;
+			
+			&__icon-wrap {
+				position: absolute;
+			}
+			
+			&__text {
+				line-height: 1;
+			}
+		}
+		
+		&__right-info {
+			color: $u-tips-color;
+			font-size: 26rpx;
+			@include vue-flex;
+			align-items: center;
+			
+			&__icon-arrow {
+				margin-left: 6rpx;
+			}
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-select/u-select.vue b/uview-ui/components/u-select/u-select.vue
new file mode 100644
index 0000000..1285845
--- /dev/null
+++ b/uview-ui/components/u-select/u-select.vue
@@ -0,0 +1,417 @@
+<template>
+	<view class="u-select">
+		<!-- <view class="u-select__action" :class="{
+			'u-select--border': border
+		}" @tap.stop="selectHandler">
+			<view class="u-select__action__icon" :class="{
+				'u-select__action__icon--reverse': value == true
+			}">
+				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
+			</view>
+		</view> -->
+		<u-popup :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
+			<view class="u-select">
+				<view class="u-select__header" @touchmove.stop.prevent="">
+					<view
+						class="u-select__header__cancel u-select__header__btn"
+						:style="{ color: cancelColor }"
+						hover-class="u-hover-class"
+						:hover-stay-time="150"
+						@tap="getResult('cancel')"
+					>
+						{{cancelText}}
+					</view>
+					<view class="u-select__header__title">
+						{{title}}
+					</view>
+					<view
+						class="u-select__header__confirm u-select__header__btn"
+						:style="{ color: moving ? cancelColor : confirmColor }"
+						hover-class="u-hover-class"
+						:hover-stay-time="150"
+						@touchmove.stop=""
+						@tap.stop="getResult('confirm')"
+					>
+						{{confirmText}}
+					</view>
+				</view>
+				<view class="u-select__body">
+					<picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector" @pickstart="pickstart" @pickend="pickend">
+						<picker-view-column v-for="(item, index) in columnData" :key="index">
+							<view class="u-select__body__picker-view__item" v-for="(item1, index1) in item" :key="index1">
+								<view class="u-line-1">{{ item1[labelName] }}</view>
+							</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	/**
+	 * select 列选择器
+	 * @description 此选择器用于单列，多列，多列联动的选择场景。(从1.3.0版本起，不建议使用Picker组件的单列和多列模式，Select组件是专门为列选择而构造的组件，更简单易用。)
+	 * @tutorial http://uviewui.com/components/select.html
+	 * @property {String} mode 模式选择，"single-column"-单列模式，"mutil-column"-多列模式，"mutil-column-auto"-多列联动模式
+	 * @property {Array} list 列数据，数组形式，见官网说明
+	 * @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+	 * @property {String} cancel-color 取消按钮的颜色（默认#606266）
+	 * @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
+	 * @property {String} confirm-text 确认按钮的文字
+	 * @property {String} cancel-text 取消按钮的文字
+	 * @property {String} default-value 提供的默认选中的下标，见官网说明
+	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker(默认true)
+	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
+	 * @property {String} value-name 自定义list数据的value属性名 1.3.6
+	 * @property {String} label-name 自定义list数据的label属性名 1.3.6
+	 * @property {String} child-name 自定义list数据的children属性名，只对多列联动模式有效 1.3.7
+	 * @event {Function} confirm 点击确定按钮，返回当前选择的值
+	 * @example <u-select v-model="show" :list="list"></u-select>
+	 */
+
+export default {
+	props: {
+		// 列数据
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 是否显示边框
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// 通过双向绑定控制组件的弹出与收起
+		value: {
+			type: Boolean,
+			default: false
+		},
+		// "取消"按钮的颜色
+		cancelColor: {
+			type: String,
+			default: '#606266'
+		},
+		// "确定"按钮的颜色
+		confirmColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 弹出的z-index值
+		zIndex: {
+			type: [String, Number],
+			default: 0
+		},
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许通过点击遮罩关闭Picker
+		maskCloseAble: {
+			type: Boolean,
+			default: true
+		},
+		// 提供的默认选中的下标
+		defaultValue: {
+			type: Array,
+			default() {
+				return [0];
+			}
+		},
+		// 模式选择，single-column-单列，mutil-column-多列，mutil-column-auto-多列联动
+		mode: {
+			type: String,
+			default: 'single-column'
+		},
+		// 自定义value属性名
+		valueName: {
+			type: String,
+			default: 'value'
+		},
+		// 自定义label属性名
+		labelName: {
+			type: String,
+			default: 'label'
+		},
+		// 自定义多列联动模式的children属性名
+		childName: {
+			type: String,
+			default: 'children'
+		},
+		// 顶部标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: '确认'
+		}
+	},
+	data() {
+		return {
+			// 用于列改变时，保存当前的索引，下一次变化时比较得出是哪一列发生了变化
+			defaultSelector: [0],
+			// picker-view的数据
+			columnData: [],
+			// 每次队列发生变化时，保存选择的结果
+			selectValue: [],
+			// 上一次列变化时的index
+			lastSelectIndex: [],
+			// 列数
+			columnNum: 0,
+			// 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+			moving: false
+		};
+	},
+	watch: {
+		// 在select弹起的时候，重新初始化所有数据
+		value: {
+			immediate: true,
+			handler(val) {
+				if(val) setTimeout(() => this.init(), 10);
+			}
+		},
+	},
+	computed: {
+		uZIndex() {
+			// 如果用户有传递z-index值，优先使用
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		},
+	},
+	methods: {
+		// 标识滑动开始，只有微信小程序才有这样的事件
+		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() {
+			// 如果没有传入默认选中的值，生成长度为columnNum，用0填充的数组
+			this.defaultSelector = this.defaultValue.length == this.columnNum ? this.defaultValue : Array(this.columnNum).fill(0);
+			this.lastSelectIndex = this.$u.deepClone(this.defaultSelector);
+		},
+		// 计算列数
+		setColumnNum() {
+			// 单列的列数为1
+			if(this.mode == 'single-column') this.columnNum = 1;
+			// 多列时，this.list数组长度就是列数
+			else if(this.mode == 'mutil-column') this.columnNum = this.list.length;
+			// 多列联动时，通过历遍this.list的第一个元素，得出有多少列
+			else if(this.mode == 'mutil-column-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 == 'mutil-column-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-column') {
+				data[0] = this.list;
+			} else {
+				data = this.list;
+			}
+			this.columnData = data;
+		},
+		// 获取默认选中的值，如果没有设置defaultValue，就默认选中每列的第一个
+		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)
+			}
+		},
+		// 列选项
+		columnChange(e) {
+			let index = null;
+			let columnIndex = e.detail.value;
+			// 由于后面是需要push进数组的，所以需要先清空数组
+			this.selectValue = [];
+			if(this.mode == 'mutil-column-auto') {
+				// 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
+				this.lastSelectIndex.map((val, idx) => {
+					if (val != columnIndex[idx]) index = idx;
+				});
+				this.defaultSelector = columnIndex;
+				for (let i = index + 1; i < this.columnNum; i++) {
+					// 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
+					// 默认是队列的第一个为默认选项
+					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-column') {
+				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 == 'mutil-column') {
+				// 初始默认选中值
+				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();
+		},
+		selectHandler() {
+			this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+
+.u-select {
+
+	&__action {
+		position: relative;
+		line-height: $u-form-item-height;
+		height: $u-form-item-height;
+
+		&__icon {
+			position: absolute;
+			right: 20rpx;
+			top: 50%;
+			transition: transform .4s;
+			transform: translateY(-50%);
+			z-index: 1;
+
+			&--reverse {
+				transform: rotate(-180deg) translateY(50%);
+			}
+		}
+	}
+
+	&__hader {
+		&__title {
+			color: $u-content-color;
+		}
+	}
+
+	&--border {
+		border-radius: 6rpx;
+		border-radius: 4px;
+		border: 1px solid $u-form-item-border-color;
+	}
+
+	&__header {
+		@include vue-flex;
+		align-items: center;
+		justify-content: space-between;
+		height: 80rpx;
+		padding: 0 40rpx;
+	}
+
+	&__body {
+		width: 100%;
+		height: 500rpx;
+		overflow: hidden;
+		background-color: #fff;
+
+		&__picker-view {
+			height: 100%;
+			box-sizing: border-box;
+
+			&__item {
+				@include vue-flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 32rpx;
+				color: $u-main-color;
+				padding: 0 8rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/uview-ui/components/u-skeleton/u-skeleton.vue b/uview-ui/components/u-skeleton/u-skeleton.vue
new file mode 100644
index 0000000..c8cb19e
--- /dev/null
+++ b/uview-ui/components/u-skeleton/u-skeleton.vue
@@ -0,0 +1,199 @@
+<template>
+	<view v-if="loading" :style="{
+		width: windowWinth + 'px', 
+		height: windowHeight + 'px', 
+		backgroundColor: bgColor, 
+		position: 'absolute', 
+		left: left + 'px', 
+		top: top + 'px', 
+		zIndex: 9998, 
+		overflow: 'hidden'
+	}"
+	 @touchmove.stop.prevent>
+		<view v-for="(item, index) in RectNodes" :key="$u.guid()" :class="[animation ? 'skeleton-fade' : '']" :style="{
+			width: item.width + 'px', 
+			height: item.height + 'px', 
+			backgroundColor: elColor, 
+			position: 'absolute', 
+			left: (item.left - left) + 'px', 
+			top: (item.top - top) + 'px'
+		}"></view>
+		<view v-for="(item, index) in circleNodes" :key="$u.guid()" :class="animation ? 'skeleton-fade' : ''" :style="{
+			width: item.width + 'px', 
+			height: item.height + 'px', 
+			backgroundColor: elColor, 
+			borderRadius: item.width/2 + 'px', 
+			position: 'absolute', 
+			left: (item.left - left) + 'px',
+			top: (item.top - top) + 'px'
+		}"></view>
+		<view v-for="(item, index) in filletNodes" :key="$u.guid()" :class="animation ? 'skeleton-fade' : ''" :style="{
+			width: item.width + 'px', 
+			height: item.height + 'px', 
+			backgroundColor: elColor, 
+			borderRadius: borderRadius + 'rpx', 
+			position: 'absolute', 
+			left: (item.left - left) + 'px',
+			top: (item.top - top) + 'px'
+		}"></view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * skeleton 骨架屏
+	 * @description 骨架屏一般用于页面在请求远程数据尚未完成时，页面用灰色块预显示本来的页面结构，给用户更好的体验。
+	 * @tutorial https://www.uviewui.com/components/skeleton.html
+	 * @property {String} el-color 骨架块状元素的背景颜色（默认#e5e5e5）
+	 * @property {String} bg-color 骨架组件背景颜色（默认#ffffff）
+	 * @property {Boolean} animation 骨架块是否显示动画效果（默认false）
+	 * @property {String Number} border-radius u-skeleton-fillet类名元素，对应的骨架块的圆角大小，单位rpx（默认10）
+	 * @property {Boolean} loading 是否显示骨架组件，请求完成后，将此值设置为false（默认true）
+	 * @example <u-skeleton :loading="true" :animation="true"></u-skeleton>
+	 */
+	export default {
+		name: "u-skeleton",
+		props: {
+			// 需要渲染的元素背景颜色，十六进制或者rgb等都可以
+			elColor: {
+				type: String,
+				default: '#e5e5e5'
+			},
+			// 整个骨架屏页面的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 是否显示加载动画
+			animation: {
+				type: Boolean,
+				default: false
+			},
+			// 圆角值，只对类名为u-skeleton-fillet的元素生效，为数值，不带单位
+			borderRadius: {
+				type: [String, Number],
+				default: "10"
+			},
+			// 是否显示骨架，true-显示，false-隐藏
+			loading: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				windowWinth: 750, // 骨架屏宽度
+				windowHeight: 1500, // 骨架屏高度
+				filletNodes: [], // 圆角元素
+				circleNodes: [], // 圆形元素
+				RectNodes: [], // 矩形元素
+				top: 0,
+				left: 0,
+			}
+		},
+		methods: {
+			// 查询各节点的信息
+			selecterQueryInfo() {
+				// 获取整个父组件容器的高度，当做骨架屏的高度 
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				let query = '';
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton').boundingClientRect().exec((res) => {
+					this.windowHeight = res[0][0].height;
+					this.windowWinth = res[0][0].width;
+					this.top = res[0][0].bottom - res[0][0].height;
+					this.left = res[0][0].left;
+				});
+				// 矩形骨架元素
+				this.getRectEls();
+				// 圆形骨架元素
+				this.getCircleEls();
+				// 圆角骨架元素
+				this.getFilletEls();
+			},
+			// 矩形元素列表
+			getRectEls() {
+				let query = '';
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton-rect').boundingClientRect().exec((res) => {
+					this.RectNodes = res[0];
+				});
+			},
+			// 圆角元素列表
+			getFilletEls() {
+				let query = '';
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton-fillet').boundingClientRect().exec((res) => {
+					this.filletNodes = res[0];
+				});
+			},
+			// 圆形元素列表
+			getCircleEls() {
+				let query = '';
+				// 在微信小程序中，如果把骨架屏放入组件中使用的话，需要调in(this)上下文为父组件才有效
+				// #ifdef MP-WEIXIN
+				query = uni.createSelectorQuery().in(this.$parent);
+				// #endif
+				// #ifndef MP-WEIXIN
+				query = uni.createSelectorQuery()
+				// #endif
+				query.selectAll('.u-skeleton-circle').boundingClientRect().exec((res) => {
+					this.circleNodes = res[0];
+				});
+			}
+		},
+		// 组件被挂载
+		mounted() {
+			// 获取系统信息
+			let systemInfo = uni.getSystemInfoSync();
+			this.windowHeight = systemInfo.windowHeight;
+			this.windowWinth = systemInfo.windowWidth;
+			this.selecterQueryInfo();
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.skeleton-fade {
+		width: 100%;
+		height: 100%;
+		background: rgb(194, 207, 214);
+		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/uview-ui/components/u-slider/u-slider.vue b/uview-ui/components/u-slider/u-slider.vue
new file mode 100644
index 0000000..6d21b92
--- /dev/null
+++ b/uview-ui/components/u-slider/u-slider.vue
@@ -0,0 +1,257 @@
+<template>
+	<view class="u-slider" @tap="onClick" :class="[disabled ? 'u-slider--disabled' : '']" :style="{
+		backgroundColor: inactiveColor
+	}">
+		<view
+			class="u-slider__gap"
+			:style="[
+				barStyle,
+				{
+					height: height + 'rpx',
+					backgroundColor: activeColor
+				}
+			]"
+		>
+			<view class="u-slider__button-wrap" @touchstart="onTouchStart" 
+				@touchmove="onTouchMove" @touchend="onTouchEnd" 
+				@touchcancel="onTouchEnd">
+				<slot v-if="$slots.default  || $slots.$default"/>
+				<view v-else class="u-slider__button" :style="[blockStyle, {
+					height: blockWidth + 'rpx',
+					width: blockWidth + 'rpx',
+					backgroundColor: blockColor
+				}]"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * slider 滑块选择器
+ * @tutorial https://uviewui.com/components/slider.html
+ * @property {Number | String} value 滑块默认值（默认0）
+ * @property {Number | String} min 最小值（默认0）
+ * @property {Number | String} max 最大值（默认100）
+ * @property {Number | String} step 步长（默认1）
+ * @property {Number | String} blockWidth 滑块宽度，高等于宽（30）
+ * @property {Number | String} height 滑块条高度，单位rpx（默认6）
+ * @property {String} inactiveColor 底部条背景颜色（默认#c0c4cc）
+ * @property {String} activeColor 底部选择部分的背景颜色（默认#2979ff）
+ * @property {String} blockColor 滑块颜色（默认#ffffff）
+ * @property {Object} blockStyle 给滑块自定义样式，对象形式
+ * @property {Boolean} disabled 是否禁用滑块(默认为false)
+ * @event {Function} start 滑动触发
+ * @event {Function} moving 正在滑动中
+ * @event {Function} end 滑动结束
+ * @example <u-slider v-model="value" />
+ */
+export default {
+	name: 'u-slider',
+	props: {
+		// 当前进度百分比值，范围0-100
+		value: {
+			type: [Number, String],
+			default: 0
+		},
+		// 是否禁用滑块
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 滑块宽度，高等于宽，单位rpx
+		blockWidth: {
+			type: [Number, String],
+			default: 30
+		},
+		// 最小值
+		min: {
+			type: [Number, String],
+			default: 0
+		},
+		// 最大值
+		max: {
+			type: [Number, String],
+			default: 100
+		},
+		// 步进值
+		step: {
+			type: [Number, String],
+			default: 1
+		},
+		// 滑块条高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: 6
+		},
+		// 进度条的激活部分颜色
+		activeColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 进度条的背景颜色
+		inactiveColor: {
+			type: String,
+			default: '#c0c4cc'
+		},
+		// 滑块的背景颜色
+		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(n) {
+			// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
+			if(this.status == 'end') this.updateValue(this.value, false);
+		}
+	},
+	created() {
+		this.updateValue(this.value, false);
+	},
+	mounted() {
+		// 获取滑块条的尺寸信息
+		this.$uGetRect('.u-slider').then(rect => {
+			this.sliderRect = rect;
+		});
+	},
+	methods: {
+		onTouchStart(event) {
+			if (this.disabled) return;
+			this.startX = 0;
+			// 触摸点集
+			let touches = event.touches[0];
+			// 触摸点到屏幕左边的距离
+			this.startX = touches.clientX;
+			// 此处的this.value虽为props值，但是通过$emit('input')进行了修改
+			this.startValue = this.format(this.value);
+			// 标示当前的状态为开始触摸滑动
+			this.status = 'start';
+		},
+		onTouchMove(event) {
+			if (this.disabled) return;
+			// 连续触摸的过程会一直触发本方法，但只有手指触发且移动了才被认为是拖动了，才发出事件
+			// 触摸后第一次移动已经将status设置为moving状态，故触摸第二次移动不会触发本事件
+			if (this.status == 'start') this.$emit('start');
+			let touches = event.touches[0];
+			// 滑块的左边不一定跟屏幕左边接壤，所以需要减去最外层父元素的左边值
+			this.distanceX = touches.clientX - this.sliderRect.left;
+			// 获得移动距离对整个滑块的百分比值，此为带有多位小数的值，不能用此更新视图
+			// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+			this.newValue = (this.distanceX / this.sliderRect.width) * 100;
+			this.status = 'moving';
+			// 发出moving事件
+			this.$emit('moving');
+			this.updateValue(this.newValue, true);
+		},
+		onTouchEnd() {
+			if (this.disabled) return;
+			if (this.status === 'moving') {
+				this.updateValue(this.newValue, false);
+				this.$emit('end');
+			}
+			this.status = 'end';
+		},
+		updateValue(value, drag) {
+			// 去掉小数部分，同时也是对step步进的处理
+			const width = this.format(value);
+			// 不允许滑动的值超过max最大值，百分比也不能超过100
+			if(width > this.max || width > 100) return;
+			// 设置移动的百分比值
+			let barStyle = {
+				width: width + '%'
+			};
+			// 移动期间无需过渡动画
+			if (drag == true) {
+				barStyle.transition = 'none';
+			} else {
+				// 非移动期间，删掉对过渡为空的声明，让css中的声明起效
+				delete barStyle.transition;
+			}
+			// 修改value值
+			this.$emit('input', width);
+			this.barStyle = barStyle;
+		},
+		format(value) {
+			// 将小数变成整数，为了减少对视图的更新，造成视图层与逻辑层的阻塞
+			return Math.round(Math.max(this.min, Math.min(value, this.max)) / this.step) * this.step;
+		},
+		onClick(event) {
+			if (this.disabled) return;
+			// 直接点击滑块的情况，计算方式与onTouchMove方法相同
+			const value = ((event.detail.x - this.sliderRect.left) / this.sliderRect.width) * 100;
+			this.updateValue(value, false);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-slider {
+	position: relative;
+	border-radius: 999px;
+	border-radius: 999px;
+	background-color: #ebedf0;
+}
+
+.u-slider:before {
+	position: absolute;
+	right: 0;
+	left: 0;
+	content: '';
+	top: -8px;
+	bottom: -8px;
+	z-index: -1;
+}
+
+.u-slider__gap {
+	position: relative;
+	border-radius: inherit;
+	transition: width 0.2s;
+	transition: width 0.2s;
+	background-color: #1989fa;
+}
+
+.u-slider__button {
+	width: 24px;
+	height: 24px;
+	border-radius: 50%;
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
+	background-color: #fff;
+	cursor: pointer;
+}
+
+.u-slider__button-wrap {
+	position: absolute;
+	top: 50%;
+	right: 0;
+	transform: translate3d(50%, -50%, 0);
+}
+
+.u-slider--disabled {
+	opacity: 0.5;
+}
+</style>
diff --git a/uview-ui/components/u-steps/u-steps.vue b/uview-ui/components/u-steps/u-steps.vue
new file mode 100644
index 0000000..a72cfcf
--- /dev/null
+++ b/uview-ui/components/u-steps/u-steps.vue
@@ -0,0 +1,200 @@
+<template>
+	<view class="">
+		<view
+			class="u-steps"
+			:style="{
+				flexDirection: direction
+			}"
+		>
+			<view class="u-steps__item" 
+				:class="['u-steps__item--' + direction]" 
+				v-for="(item, index) in list" :key="index"
+			>
+				<view
+					class="u-steps__item__num"
+					v-if="mode == 'number'"
+					:style="{
+						backgroundColor: current < index ? 'transparent' : activeColor,
+						borderColor: current < index ? unActiveColor : activeColor
+					}"
+				>
+					<text v-if="current < index" :style="{
+						color: current < index ? unActiveColor : activeColor,
+					}">
+						{{ index + 1 }}
+					</text>
+					<u-icon v-else size="22" color="#ffffff" :name="icon"></u-icon>
+				</view>
+				<view class="u-steps__item__dot" v-if="mode == 'dot'" :style="{ 
+					backgroundColor: index <= current ? activeColor : unActiveColor 
+				}"></view>
+				<text class="u-line-1" :style="{ 
+					color: index <= current ? activeColor : unActiveColor,
+				}" :class="['u-steps__item__text--' + direction]">
+					{{ item.name }}
+				</text>
+				<view class="u-steps__item__line" :class="['u-steps__item__line--' + mode]" v-if="index < list.length - 1">
+					<u-line :direction="direction" length="100%" :hair-line="false" :color="unActiveColor"></u-line>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * steps 步骤条
+ * @description 该组件一般用于完成一个任务要分几个步骤，标识目前处于第几步的场景。
+ * @tutorial https://www.uviewui.com/components/steps.html
+ * @property {String} mode 设置模式（默认dot）
+ * @property {Array} list 数轴条数据，数组。具体见上方示例
+ * @property {String} type type主题（默认primary）
+ * @property {String} direction row-横向，column-竖向（默认row）
+ * @property {Number String} current 设置当前处于第几步
+ * @property {String} active-color 已完成步骤的激活颜色，如设置，type值会失效
+ * @property {String} un-active-color 未激活的颜色，用于表示未完成步骤的颜色（默认#606266）
+ * @example <u-steps :list="numList" active-color="#fa3534"></u-steps>
+ */
+export default {
+	name: 'u-steps',
+	props: {
+		// 步骤条的类型，dot|number
+		mode: {
+			type: String,
+			default: 'dot'
+		},
+		// 步骤条的数据
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 主题类型, primary|success|info|warning|error
+		type: {
+			type: String,
+			default: 'primary'
+		},
+		// 当前哪一步是激活的
+		current: {
+			type: [Number, String],
+			default: 0
+		},
+		// 激活步骤的颜色
+		activeColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		// 未激活的颜色
+		unActiveColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 自定义图标
+		icon: {
+			type: String,
+			default: 'checkmark'
+		},
+		// step的排列方向，row-横向，column-竖向
+		direction: {
+			type: String,
+			default: 'row'
+		}
+	},
+	data() {
+		return {};
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../libs/css/style.components.scss';
+
+$u-steps-item-number-width: 44rpx;
+$u-steps-item-dot-width: 20rpx;
+
+.u-steps {
+	@include vue-flex;
+	
+	.u-steps__item {
+		flex: 1;
+		text-align: center;
+		position: relative;
+		min-width: 100rpx;
+		font-size: 26rpx;
+		color: #8799a3;
+		@include vue-flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+		
+		&--row {
+			@include vue-flex;
+			flex-direction: column;
+			
+			.u-steps__item__line {
+				position: absolute;
+				z-index: 0;
+				left: 75%;
+				width: 50%;
+				
+				&--dot {
+					top: calc(#{$u-steps-item-dot-width} / 2);
+				}
+				
+				&--number {
+					top: calc(#{$u-steps-item-number-width} / 2);
+				}
+			}
+		}
+		
+		&--column {
+			@include vue-flex;
+			flex-direction: row;
+			justify-content: flex-start;
+			min-height: 120rpx;
+			
+			.u-steps__item__line {
+				position: absolute;
+				z-index: 0;
+				height: 50%;
+				top: 75%;
+				
+				&--dot {
+					left: calc(#{$u-steps-item-dot-width} / 2);
+				}
+				
+				&--number {
+					left: calc(#{$u-steps-item-number-width} / 2);
+				}
+			}
+		}
+		
+		&__num {
+			@include vue-flex;
+			align-items: center;
+			justify-content: center;
+			width: $u-steps-item-number-width;
+			height: $u-steps-item-number-width;
+			border: 1px solid #8799a3;
+			border-radius: 50%;
+			overflow: hidden;
+		}
+		
+		&__dot {
+			width: $u-steps-item-dot-width;
+			height: $u-steps-item-dot-width;
+			@include vue-flex;
+			border-radius: 50%;
+		}
+		
+		&__text--row {
+			margin-top: 14rpx;
+		}
+		
+		&__text--column {
+			margin-left: 14rpx;
+		}
+	}
+}
+</style>
diff --git a/uview-ui/components/u-sticky/u-sticky.vue b/uview-ui/components/u-sticky/u-sticky.vue
new file mode 100644
index 0000000..d9bc34c
--- /dev/null
+++ b/uview-ui/components/u-sticky/u-sticky.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="">
+		<view class="u-sticky-wrap" :class="[elClass]" :style="{
+			height: fixed ? height + 'px' : 'auto',
+			backgroundColor: bgColor
+		}">
+			<view class="u-sticky" :style="{
+				position: fixed ? 'fixed' : 'static',
+				top: stickyTop + 'px',
+				left: left + 'px',
+				width: width == 'auto' ? 'auto' : width + 'px',
+				zIndex: uZIndex
+			}">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * sticky 吸顶
+	 * @description 该组件与CSS中position: sticky属性实现的效果一致，当组件达到预设的到顶部距离时， 就会固定在指定位置，组件位置大于预设的顶部距离时，会重新按照正常的布局排列。
+	 * @tutorial https://www.uviewui.com/components/sticky.html
+	 * @property {String Number} offset-top 吸顶时与顶部的距离，单位rpx（默认0）
+	 * @property {String Number} index 自定义标识，用于区分是哪一个组件
+	 * @property {Boolean} enable 是否开启吸顶功能（默认true）
+	 * @property {String} bg-color 组件背景颜色（默认#ffffff）
+	 * @property {String Number} z-index 吸顶时的z-index值（默认970）
+	 * @property {String Number} h5-nav-height 导航栏高度，自定义导航栏时(无导航栏时需设置为0)，需要传入此值，单位px（默认44）
+	 * @event {Function} fixed 组件吸顶时触发
+	 * @event {Function} unfixed 组件取消吸顶时触发
+	 * @example <u-sticky offset-top="200"><view>塞下秋来风景异，衡阳雁去无留意</view></u-sticky>
+	 */
+	export default {
+		name: "u-sticky",
+		props: {
+			// 吸顶容器到顶部某个距离的时候，进行吸顶，在H5平台，NavigationBar为44px
+			offsetTop: {
+				type: [Number, String],
+				default: 0
+			},
+			//列表中的索引值
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否开启吸顶功能
+			enable: {
+				type: Boolean,
+				default: true
+			},
+			// h5顶部导航栏的高度
+			h5NavHeight: {
+				type: [Number, String],
+				default: 44
+			},
+			// 吸顶区域的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				fixed: false,
+				height: 'auto',
+				stickyTop: 0,
+				elClass: this.$u.guid(),
+				left: 0,
+				width: 'auto',
+			};
+		},
+		watch: {
+			offsetTop(val) {
+				this.initObserver();
+			},
+			enable(val) {
+				if (val == false) {
+					this.fixed = false;
+					this.disconnectObserver('contentObserver');
+				} else {
+					this.initObserver();
+				}
+			}
+		},
+		computed: {
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.sticky;
+			}
+		},
+		mounted() {
+			this.initObserver();
+		},
+		methods: {
+			initObserver() {
+				if (!this.enable) 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) : 0;
+				// #endif
+
+				this.disconnectObserver('contentObserver');
+				this.$uGetRect('.' + this.elClass).then((res) => {
+					this.height = res.height;
+					this.left = res.left;
+					this.width = res.width;
+					this.$nextTick(() => {
+						this.observeContent();
+					});
+				});
+			},
+			observeContent() {
+				this.disconnectObserver('contentObserver');
+				const contentObserver = this.createIntersectionObserver({
+					thresholds: [0.95, 0.98, 1]
+				});
+				contentObserver.relativeToViewport({
+					top: -this.stickyTop
+				});
+				contentObserver.observe('.' + this.elClass, res => {
+					if (!this.enable) return;
+					this.setFixed(res.boundingClientRect.top);
+				});
+				this.contentObserver = 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();
+			},
+		},
+		beforeDestroy() {
+			this.disconnectObserver('contentObserver');
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-sticky {
+		z-index: 9999999999;
+	}
+</style>
diff --git a/uview-ui/components/u-subsection/u-subsection.vue b/uview-ui/components/u-subsection/u-subsection.vue
new file mode 100644
index 0000000..b8fbd79
--- /dev/null
+++ b/uview-ui/components/u-subsection/u-subsection.vue
@@ -0,0 +1,355 @@
+<template>
+	<view class="u-subsection" :style="[subsectionStyle]">
+		<view class="u-item u-line-1" :style="[itemStyle(index)]" @tap="click(index)" :class="[noBorderRight(index), 'u-item-' + index]"
+		 v-for="(item, index) in listInfo" :key="index">
+			<view :style="[textStyle(index)]" class="u-item-text u-line-1">{{ item.name }}</view>
+		</view>
+		<view class="u-item-bg" :style="[itemBarStyle]"></view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * subsection 分段器
+	 * @description 该分段器一般用于用户从几个选项中选择某一个的场景
+	 * @tutorial https://www.uviewui.com/components/subsection.html
+	 * @property {Array} list 选项的数组，形式见上方"基本使用"
+	 * @property {String Number} current 初始化时默认选中的选项索引值（默认0）
+	 * @property {String} active-color 激活时的颜色，mode为subsection时固定为白色（默认#303133）
+	 * @property {String} inactive-color 未激活时字体的颜色，mode为subsection时无效（默认#606266）
+	 * @property {String} mode 模式选择，见官网"模式选择"说明（默认button）
+	 * @property {String Number} font-size 字体大小，单位rpx（默认28）
+	 * @property {String Number} height 组件高度，单位rpx（默认70）
+	 * @property {Boolean} animation 是否开启动画效果，见上方说明（默认true）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @property {String} bg-color 组件背景颜色，mode为button时有效（默认#eeeeef）
+	 * @property {String} button-color 按钮背景颜色，mode为button时有效（默认#ffffff）
+	 * @event {Function} change 分段器选项发生改变时触发
+	 * @example <u-subsection active-color="#ff9900"></u-subsection>
+	 */
+	export default {
+		name: "u-subsection",
+		props: {
+			// tab的数据
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 当前活动的tab的index
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 激活的颜色
+			activeColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 未激活的颜色
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 模式选择，mode=button为按钮形式，mode=subsection时为分段模式
+			mode: {
+				type: String,
+				default: 'button'
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [Number, String],
+				default: 28
+			},
+			// 是否开启动画效果
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 组件的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 70
+			},
+			// 激活tab的字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// mode=button时，组件背景颜色
+			bgColor: {
+				type: String,
+				default: '#eeeeef'
+			},
+			// mode = button时，滑块背景颜色
+			buttonColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 在切换分段器的时候，是否让设备震一下
+			vibrateShort: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				listInfo: [],
+				itemBgStyle: {
+					width: 0,
+					left: 0,
+					backgroundColor: '#ffffff',
+					height: '100%',
+					transition: ''
+				},
+				currentIndex: this.current,
+				buttonPadding: 3, // mode = button 时，组件的内边距
+				borderRadius: 5, // 圆角值
+				firstTimeVibrateShort: true // 组件初始化时，会触发current变化，此时不应震动
+			};
+		},
+		watch: {
+			current: {
+				immediate: true,
+				handler(nVal) {
+					this.currentIndex = nVal;
+					this.changeSectionStatus(nVal);
+				}
+			}
+		},
+		created() {
+			// 将list的数据，传入listInfo数组，因为不能修改props传递的list值
+			// 可以接受直接数组形式，或者数组元素为对象的形式，如：['简介', '评论'],或者[{name: '简介'}, {name: '评论'}]
+			this.listInfo = this.list.map((val, index) => {
+				if (typeof val != 'object') {
+					let obj = {
+						width: 0,
+						name: val
+					};
+					return obj;
+				} else {
+					val.width = 0;
+					return val;
+				}
+			});
+		},
+		computed: {
+			// 设置mode=subsection时，滑块特有的样式
+			noBorderRight() {
+				return index => {
+					if (this.mode != 'subsection') return;
+					let classs = '';
+					// 不显示右边的边框
+					if (index < this.list.length - 1) classs += ' u-none-border-right';
+					// 显示整个组件的左右边圆角
+					if (index == 0) classs += ' u-item-first';
+					if (index == this.list.length - 1) classs += ' u-item-last';
+					return classs;
+				};
+			},
+			// 文字的样式
+			textStyle() {
+				return index => {
+					let style = {};
+					// 设置字体颜色
+					if (this.mode == 'subsection') {
+						if (index == this.currentIndex) {
+							style.color = '#ffffff';
+						} else {
+							style.color = this.activeColor;
+						}
+					} else {
+						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 + 'rpx';
+					return style;
+				};
+			},
+			// 每个分段器item的样式
+			itemStyle() {
+				return index => {
+					let style = {};
+					if (this.mode == 'subsection') {
+						// 设置border的样式
+						style.borderColor = this.activeColor;
+						style.borderWidth = '1px';
+						style.borderStyle = 'solid';
+					}
+					return style;
+				};
+			},
+			// mode=button时，外层view的样式
+			subsectionStyle() {
+				let style = {};
+				style.height = uni.upx2px(this.height) + 'px';
+				if (this.mode == 'button') {
+					style.backgroundColor = this.bgColor;
+					style.padding = `${this.buttonPadding}px`;
+					style.borderRadius = `${this.borderRadius}px`;
+				}
+				return style;
+			},
+			// 滑块的样式
+			itemBarStyle() {
+				let style = {};
+				style.backgroundColor = this.activeColor;
+				style.zIndex = 1;
+				if (this.mode == 'button') {
+					style.backgroundColor = this.buttonColor;
+					style.borderRadius = `${this.borderRadius}px`;
+					style.bottom = `${this.buttonPadding}px`;
+					style.height = uni.upx2px(this.height) - this.buttonPadding * 2 + 'px';
+					style.zIndex = 0;
+				}
+				return Object.assign(this.itemBgStyle, style);
+			}
+		},
+		mounted() {
+			setTimeout(() => {
+				this.getTabsInfo();
+			}, 10);
+		},
+		methods: {
+			// 改变滑块的样式
+			changeSectionStatus(nVal) {
+				if (this.mode == 'subsection') {
+					// 根据滑块在最左边和最右边时，显示左边和右边的圆角
+					if (nVal == this.list.length - 1) {
+						this.itemBgStyle.borderRadius = `0 ${this.buttonPadding}px ${this.buttonPadding}px 0`;
+					}
+					if (nVal == 0) {
+						this.itemBgStyle.borderRadius = `${this.buttonPadding}px 0 0 ${this.buttonPadding}px`;
+					}
+					if (nVal > 0 && nVal < this.list.length - 1) {
+						this.itemBgStyle.borderRadius = '0';
+					}
+				}
+				// 更新滑块的位置
+				setTimeout(() => {
+					this.itemBgLeft();
+				}, 10);
+				if (this.vibrateShort && !this.firstTimeVibrateShort) {
+					// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
+					// #ifndef H5
+					uni.vibrateShort();
+					// #endif
+				}
+				// 第一次过后，设置firstTimeVibrateShort为false，让其下一次可以震动(如果允许震动的话)
+				this.firstTimeVibrateShort = false;
+			},
+			click(index) {
+				// 不允许点击当前激活选项
+				if (index == this.currentIndex) return;
+				this.currentIndex = index;
+				this.changeSectionStatus(index);
+				this.$emit('change', Number(index));
+			},
+			// 获取各个tab的节点信息
+			getTabsInfo() {
+				let view = uni.createSelectorQuery().in(this);
+				for (let i = 0; i < this.list.length; i++) {
+					view.select('.u-item-' + i).boundingClientRect();
+				}
+				view.exec(res => {
+					if (!res.length) {
+						setTimeout(() => {
+							this.getTabsInfo();
+							return;
+						}, 10);
+					}
+					// 将分段器每个item的宽度，放入listInfo数组
+					res.map((val, index) => {
+						this.listInfo[index].width = val.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() {
+				// 根据是否开启动画效果，
+				if (this.animation) {
+					this.itemBgStyle.transition = 'all 0.35s';
+				} else {
+					this.itemBgStyle.transition = 'all 0s';
+				}
+				let left = 0;
+				// 计算当前活跃item到组件左边的距离
+				this.listInfo.map((val, index) => {
+					if (index < this.currentIndex) left += val.width;
+				});
+				// 根据mode不同模式，计算滑块需要移动的距离
+				if (this.mode == 'subsection') {
+					this.itemBgStyle.left = left + 'px';
+				} else if (this.mode == 'button') {
+					this.itemBgStyle.left = left + this.buttonPadding + 'px';
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-subsection {
+		@include vue-flex;
+		align-items: center;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.u-item {
+		flex: 1;
+		text-align: center;
+		font-size: 26rpx;
+		height: 100%;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		color: $u-main-color;
+		padding: 0 6rpx;
+	}
+
+	.u-item-bg {
+		background-color: $u-type-primary;
+		position: absolute;
+		z-index: -1;
+	}
+
+	.u-none-border-right {
+		border-right: none !important;
+	}
+
+	.u-item-first {
+		border-top-left-radius: 8rpx;
+		border-bottom-left-radius: 8rpx;
+	}
+
+	.u-item-last {
+		border-top-right-radius: 8rpx;
+		border-bottom-right-radius: 8rpx;
+	}
+
+	.u-item-text {
+		transition: all 0.35s;
+		color: $u-main-color;
+		@include vue-flex;
+		align-items: center;
+		position: relative;
+		z-index: 3;
+	}
+</style>
diff --git a/uview-ui/components/u-swipe-action/u-swipe-action.vue b/uview-ui/components/u-swipe-action/u-swipe-action.vue
new file mode 100644
index 0000000..13fb33c
--- /dev/null
+++ b/uview-ui/components/u-swipe-action/u-swipe-action.vue
@@ -0,0 +1,255 @@
+<template>
+	<view class="">
+		<movable-area class="u-swipe-action" :style="{ backgroundColor: bgColor }">
+			<movable-view
+				class="u-swipe-view"
+				@change="change"
+				@touchend="touchend"
+				@touchstart="touchstart"
+				direction="horizontal"
+				:disabled="disabled"
+				:x="moveX"
+				:style="{
+					width: movableViewWidth ? movableViewWidth : '100%'
+				}"
+			>
+				<view
+					class="u-swipe-content"
+					@tap.stop="contentClick"
+				>
+					<slot></slot>
+				</view>
+				<view class="u-swipe-del" v-if="showBtn" @tap.stop="btnClick(index)" :style="[btnStyle(item.style)]" v-for="(item, index) in options" :key="index">
+					<view class="u-btn-text">{{ item.text }}</view>
+				</view>
+			</movable-view>
+		</movable-area>
+	</view>
+</template>
+
+<script>
+/**
+ * swipeAction 左滑单元格
+ * @description 该组件一般用于左滑唤出操作菜单的场景，用的最多的是左滑删除操作。
+ * @tutorial https://www.uviewui.com/components/swipeAction.html
+ * @property {String} bg-color 整个组件背景颜色（默认#ffffff）
+ * @property {Array} options 数组形式，可以配置背景颜色和文字
+ * @property {String Number} index 标识符，点击时候用于区分点击了哪一个，用v-for循环时的index即可
+ * @property {String Number} btn-width 按钮宽度，单位rpx（默认180）
+ * @property {Boolean} disabled 是否禁止某个swipeAction滑动（默认false）
+ * @property {Boolean} show 打开或者关闭某个组件（默认false）
+ * @event {Function} click 点击组件时触发
+ * @event {Function} close 组件触发关闭状态时
+ * @event {Function} content-click 点击内容时触发
+ * @event {Function} open 组件触发打开状态时
+ * @example <u-swipe-action btn-text="收藏">...</u-swipe-action>
+ */
+export default {
+	name: 'u-swipe-action',
+	props: {
+		// index值，用于得知点击删除的是哪个按钮
+		index: {
+			type: [Number, String],
+			default: ''
+		},
+		// 滑动按钮的宽度，单位为rpx
+		btnWidth: {
+			type: [String, Number],
+			default: 180
+		},
+		// 是否禁止某个action滑动
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 打开或者关闭组件
+		show: {
+			type: Boolean,
+			default: false
+		},
+		// 组件背景颜色
+		bgColor: {
+			type: String,
+			default: '#ffffff'
+		},
+		// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
+		vibrateShort: {
+			type: Boolean,
+			default: false
+		},
+		// 按钮操作参数
+		options: {
+			type: Array,
+			default() {
+				return [];
+			}
+		}
+	},
+	watch: {
+		show: {
+			immediate: true,
+			handler(nVal, oVal) {
+				if (nVal) {
+					this.open();
+				} else {
+					this.close();
+				}
+			}
+		}
+	},
+	data() {
+		return {
+			moveX: 0, // movable-view元素在x轴上需要移动的目标移动距离，用于展开或收起滑动的按钮
+			scrollX: 0, // movable-view移动过程中产生的change事件中的x轴移动值
+			status: false, // 滑动的状态，表示当前是展开还是关闭按钮的状态
+			movableAreaWidth: 0, // 滑动区域
+			elId: this.$u.guid(), // id，用于通知另外组件关闭时的识别
+			showBtn: false, // 刚开始渲染视图时不显示右边的按钮，避免视图闪动
+		};
+	},
+	computed: {
+		movableViewWidth() {
+			return this.movableAreaWidth + this.allBtnWidth + 'px';
+		},
+		innerBtnWidth() {
+			return uni.upx2px(this.btnWidth);
+		},
+		allBtnWidth() {
+			return uni.upx2px(this.btnWidth) * this.options.length;
+		},
+		btnStyle() {
+			return style => {
+				let css = {};
+				style.width = this.btnWidth + 'rpx';
+				return style;
+			};
+		}
+	},
+	mounted() {
+		this.getActionRect();
+	},
+	methods: {
+		// 点击按钮
+		btnClick(index) {
+			this.status = false;
+			// this.index为点击的几个组件，index为点击某个组件的第几个按钮(options数组的索引)
+			this.$emit('click', this.index, index);
+		},
+		// movable-view元素移动事件
+		change(e) {
+			this.scrollX = e.detail.x;
+		},
+		// 关闭按钮状态
+		close() {
+			this.moveX = 0;
+			this.status = false;
+		},
+		// 打开按钮的状态
+		open() {
+			if (this.disabled) return;
+			this.moveX = -this.allBtnWidth;
+			this.status = true;
+		},
+		// 用户手指离开movable-view元素，停止触摸
+		touchend() {
+			this.moveX = this.scrollX;
+			// 停止触摸时候，判断当前是展开还是关闭状态
+			// 关闭状态
+			// 这一步很重要，需要先给this.moveX一个变化的随机值，否则因为前后设置的为同一个值
+			// props单向数据流的原因，导致movable-view元素不会发生变化，切记，详见文档：
+			// https://uniapp.dcloud.io/use?id=%e5%b8%b8%e8%a7%81%e9%97%ae%e9%a2%98
+			this.$nextTick(function() {
+				if (this.status == false) {
+					// 关闭状态左滑，产生的x轴位移为负值，也就是说滑动的距离大于按钮的四分之一宽度，自动展开按钮
+					if (this.scrollX <= -this.allBtnWidth / 4) {
+						this.moveX = -this.allBtnWidth; // 按钮宽度的负值，即为展开状态movable-view元素左滑的距离
+						this.status = true; // 标志当前为展开状态
+						this.emitOpenEvent();
+						// 产生震动效果
+						if (this.vibrateShort) uni.vibrateShort();
+					} else {
+						this.moveX = 0; // 如果距离没有按钮宽度的四分之一，自动收起
+						this.status = false;
+						this.emitCloseEvent();
+					}
+				} else {
+					// 如果在打开的状态下，右滑动的距离X轴偏移超过按钮的四分之一(负值反过来的四分之三)，自动收起按钮
+					if (this.scrollX > (-this.allBtnWidth * 3) / 4) {
+						this.moveX = 0;
+						this.$nextTick(() => {
+							this.moveX = 101;
+						});
+						this.status = false;
+						this.emitCloseEvent();
+					} else {
+						this.moveX = -this.allBtnWidth;
+						this.status = true;
+						this.emitOpenEvent();
+					}
+				}
+			});
+		},
+		emitOpenEvent() {
+			this.$emit('open', this.index);
+		},
+		emitCloseEvent() {
+			this.$emit('close', this.index);
+		},
+		// 开始触摸
+		touchstart() {},
+		getActionRect() {
+			this.$uGetRect('.u-swipe-action').then(res => {
+				this.movableAreaWidth = res.width;
+				// 等视图更新完后，再显示右边的可滑动按钮，防止这些按钮会"闪一下"
+				this.$nextTick(() => {
+					this.showBtn = true;
+				})
+			});
+		},
+		// 点击内容触发事件
+		contentClick() {
+			// 点击内容时，如果当前为打开状态，收起组件
+			if (this.status == true) {
+				this.status = 'close';
+				this.moveX = 0;
+			}
+			this.$emit('content-click', this.index);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+	
+.u-swipe-action {
+	width: auto;
+	height: initial;
+	position: relative;
+	overflow: hidden;
+}
+
+.u-swipe-view {
+	@include vue-flex;
+	height: initial;
+	position: relative;
+	/* 这一句很关键，覆盖默认的绝对定位 */
+}
+
+.u-swipe-content {
+	flex: 1;
+}
+
+.u-swipe-del {
+	position: relative;
+	font-size: 30rpx;
+	color: #ffffff;
+}
+
+.u-btn-text {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+</style>
diff --git a/uview-ui/components/u-swiper/u-swiper.vue b/uview-ui/components/u-swiper/u-swiper.vue
new file mode 100644
index 0000000..b6e7e81
--- /dev/null
+++ b/uview-ui/components/u-swiper/u-swiper.vue
@@ -0,0 +1,340 @@
+<template>
+	<view class="u-swiper-wrap" :style="{
+		borderRadius: `${borderRadius}rpx`
+	}">
+		<swiper :current="elCurrent" @change="change" @animationfinish="animationfinish" :interval="interval" :circular="circular" :duration="duration" :autoplay="autoplay"
+		 :previous-margin="effect3d ? effect3dPreviousMargin + 'rpx' : '0'" :next-margin="effect3d ? effect3dPreviousMargin + 'rpx' : '0'"
+		 :style="{
+				height: height + 'rpx',
+				backgroundColor: bgColor
+			}">
+			<swiper-item class="u-swiper-item" v-for="(item, index) in list" :key="index">
+				<view class="u-list-image-wrap" @tap.stop.prevent="listClick(index)" :class="[uCurrent != index ? 'u-list-scale' : '']" :style="{
+						borderRadius: `${borderRadius}rpx`,
+						transform: effect3d && uCurrent != index ? 'scaleY(0.9)' : 'scaleY(1)',
+						margin: effect3d && uCurrent != index ? '0 20rpx' : 0,
+					}">
+					<image class="u-swiper-image" :src="item[name] || item" :mode="imgMode"></image>
+					<view v-if="title && item.title" class="u-swiper-title u-line-1" :style="[{
+							'padding-bottom': titlePaddingBottom
+						}, titleStyle]">
+						{{ item.title }}
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="u-swiper-indicator" :style="{
+				top: indicatorPos == 'topLeft' || indicatorPos == 'topCenter' || indicatorPos == 'topRight' ? '12rpx' : 'auto',
+				bottom: indicatorPos == 'bottomLeft' || indicatorPos == 'bottomCenter' || indicatorPos == 'bottomRight' ? '12rpx' : 'auto',
+				justifyContent: justifyContent,
+				padding: `0 ${effect3d ? '74rpx' : '24rpx'}`
+			}">
+			<block v-if="mode == 'rect'">
+				<view class="u-indicator-item-rect" :class="{ 'u-indicator-item-rect-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'dot'">
+				<view class="u-indicator-item-dot" :class="{ 'u-indicator-item-dot-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'round'">
+				<view class="u-indicator-item-round" :class="{ 'u-indicator-item-round-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'number'">
+				<view class="u-indicator-item-number">{{ uCurrent + 1 }}/{{ list.length }}</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * swiper 轮播图
+	 * @description 该组件一般用于导航轮播，广告展示等场景,可开箱即用
+	 * @tutorial https://www.uviewui.com/components/swiper.html
+	 * @property {Array} list 轮播图数据，见官网"基本使用"说明
+	 * @property {Boolean} title 是否显示标题文字，需要配合list参数，见官网说明（默认false）
+	 * @property {String} mode 指示器模式，见官网说明（默认round）
+	 * @property {String Number} height 轮播图组件高度，单位rpx（默认250）
+	 * @property {String} indicator-pos 指示器的位置（默认bottomCenter）
+	 * @property {Boolean} effect3d 是否开启3D效果（默认false）
+	 * @property {Boolean} autoplay 是否自动播放（默认true）
+	 * @property {String Number} interval 自动轮播时间间隔，单位ms（默认2500）
+	 * @property {Boolean} circular 是否衔接播放，见官网说明（默认true）
+	 * @property {String} bg-color 背景颜色（默认#f3f4f6）
+	 * @property {String Number} border-radius 轮播图圆角值，单位rpx（默认8）
+	 * @property {Object} title-style 自定义标题样式
+	 * @property {String Number} effect3d-previous-margin mode = true模式的情况下，激活项与前后项之间的距离，单位rpx（默认50）
+	 * @property {String} img-mode 图片的裁剪模式，详见image组件裁剪模式（默认aspectFill）
+	 * @event {Function} click 点击轮播图时触发
+	 * @example <u-swiper :list="list" mode="dot" indicator-pos="bottomRight"></u-swiper>
+	 */
+	export default {
+		name: "u-swiper",
+		props: {
+			// 轮播图的数据,格式如：[{image: 'xxxx', title: 'xxxx'}，{image: 'yyyy', title: 'yyyy'}]，其中title字段可选
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 是否显示title标题
+			title: {
+				type: Boolean,
+				default: false
+			},
+			// 用户自定义的指示器的样式
+			indicator: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 8
+			},
+			// 隔多久自动切换
+			interval: {
+				type: [String, Number],
+				default: 3000
+			},
+			// 指示器的模式，rect|dot|number|round
+			mode: {
+				type: String,
+				default: 'round'
+			},
+			// list的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 250
+			},
+			// 指示器的位置，topLeft|topCenter|topRight|bottomLeft|bottomCenter|bottomRight
+			indicatorPos: {
+				type: String,
+				default: 'bottomCenter'
+			},
+			// 是否开启缩放效果
+			effect3d: {
+				type: Boolean,
+				default: false
+			},
+			// 3D模式的情况下，激活item与前后item之间的距离，单位rpx
+			effect3dPreviousMargin: {
+				type: [Number, String],
+				default: 50
+			},
+			// 是否自动播放
+			autoplay: {
+				type: Boolean,
+				default: true
+			},
+			// 自动轮播时间间隔，单位ms
+			duration: {
+				type: [Number, String],
+				default: 500
+			},
+			// 是否衔接滑动，即到最后一张时接着滑动，是否自动切换到第一张
+			circular: {
+				type: Boolean,
+				default: true
+			},
+			// 图片的裁剪模式 
+			imgMode: {
+				type: String,
+				default: 'aspectFill'
+			},
+			// 从list数组中读取的图片的属性名
+			name: {
+				type: String,
+				default: 'image'
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#f3f4f6'
+			},
+			// 初始化时，默认显示第几项
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 标题的样式，对象形式
+			titleStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		watch: {
+			// 如果外部的list发生变化，判断长度是否被修改，如果前后长度不一致，重置uCurrent值，避免溢出
+			list(nVal, oVal) {
+				if(nVal.length !== oVal.length) this.uCurrent = 0;
+			},
+			// 监听外部current的变化，实时修改内部依赖于此测uCurrent值，如果更新了current，而不是更新uCurrent，
+			// 就会错乱，因为指示器是依赖于uCurrent的
+			current(n) {
+				this.uCurrent = n;
+			}
+		},
+		data() {
+			return {
+				uCurrent: this.current // 当前活跃的swiper-item的index
+			};
+		},
+		computed: {
+			justifyContent() {
+				if (this.indicatorPos == 'topLeft' || this.indicatorPos == 'bottomLeft') return 'flex-start';
+				if (this.indicatorPos == 'topCenter' || this.indicatorPos == 'bottomCenter') return 'center';
+				if (this.indicatorPos == 'topRight' || this.indicatorPos == 'bottomRight') return 'flex-end';
+			},
+			titlePaddingBottom() {
+				let tmp = 0;
+				if (this.mode == 'none') return '12rpx';
+				if (['bottomLeft', 'bottomCenter', 'bottomRight'].indexOf(this.indicatorPos) >= 0 && this.mode == 'number') {
+					tmp = '60rpx';
+				} else if (['bottomLeft', 'bottomCenter', 'bottomRight'].indexOf(this.indicatorPos) >= 0 && this.mode != 'number') {
+					tmp = '40rpx';
+				} else {
+					tmp = '12rpx';
+				}
+				return tmp;
+			},
+			// 因为uni的swiper组件的current参数只接受Number类型，这里做一个转换
+			elCurrent() {
+				return Number(this.current);
+			}
+		},
+		methods: {
+			listClick(index) {
+				this.$emit('click', index);
+			},
+			change(e) {
+				let current = e.detail.current;
+				this.uCurrent = current;
+				// 发出change事件，表示当前自动切换的index，从0开始
+				this.$emit('change', current);
+			},
+			// 头条小程序不支持animationfinish事件，改由change事件
+			// 暂不监听此事件，因为不再给swiper绑定uCurrent属性
+			animationfinish(e) {
+				// #ifndef MP-TOUTIAO
+				// this.uCurrent = e.detail.current;
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-swiper-wrap {
+		position: relative;
+		overflow: hidden;
+		transform: translateY(0);
+	}
+
+	.u-swiper-image {
+		width: 100%;
+		will-change: transform;
+		height: 100%;
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		/* #ifdef H5 */
+		pointer-events: none;
+		/* #endif */
+	}
+
+	.u-swiper-indicator {
+		padding: 0 24rpx;
+		position: absolute;
+		@include vue-flex;
+		width: 100%;
+		z-index: 1;
+	}
+
+	.u-indicator-item-rect {
+		width: 26rpx;
+		height: 8rpx;
+		margin: 0 6rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-rect-active {
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-dot {
+		width: 14rpx;
+		height: 14rpx;
+		margin: 0 6rpx;
+		border-radius: 20rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-dot-active {
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-round {
+		width: 14rpx;
+		height: 14rpx;
+		margin: 0 6rpx;
+		border-radius: 20rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-round-active {
+		width: 34rpx;
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-number {
+		padding: 6rpx 16rpx;
+		line-height: 1;
+		background-color: rgba(0, 0, 0, 0.3);
+		border-radius: 100rpx;
+		font-size: 26rpx;
+		color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-list-scale {
+		transform-origin: center center;
+	}
+
+	.u-list-image-wrap {
+		width: 100%;
+		height: 100%;
+		flex: 1;
+		transition: all 0.5s;
+		overflow: hidden;
+		box-sizing: content-box;
+		position: relative;
+	}
+
+	.u-swiper-title {
+		position: absolute;
+		background-color: rgba(0, 0, 0, 0.3);
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		font-size: 28rpx;
+		padding: 12rpx 24rpx;
+		color: rgba(255, 255, 255, 0.9);
+	}
+
+	.u-swiper-item {
+		@include vue-flex;
+		overflow: hidden;
+		align-items: center;
+	}
+</style>
diff --git a/uview-ui/components/u-switch/u-switch.vue b/uview-ui/components/u-switch/u-switch.vue
new file mode 100644
index 0000000..dd8e4bb
--- /dev/null
+++ b/uview-ui/components/u-switch/u-switch.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="u-switch" :class="[value == true ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']" @tap="onClick"
+	 :style="[switchStyle]">
+		<view class="u-switch__node node-class" :style="{
+			width: $u.addUnit(this.size),
+			height: $u.addUnit(this.size)
+		}">
+			<u-loading :show="loading" class="u-switch__loading" :size="size * 0.6" :color="loadingColor" />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * switch 开关选择器
+	 * @description 选择开关一般用于只有两个选择，且只能选其一的场景。
+	 * @tutorial https://www.uviewui.com/components/switch.html
+	 * @property {Boolean} loading 是否处于加载中（默认false）
+	 * @property {Boolean} disabled 是否禁用（默认false）
+	 * @property {String Number} size 开关尺寸，单位rpx（默认50）
+	 * @property {String} active-color 打开时的背景色（默认#2979ff）
+	 * @property {Boolean} inactive-color 关闭时的背景色（默认#ffffff）
+	 * @property {Boolean | Number | String} active-value 打开选择器时通过change事件发出的值（默认true）
+	 * @property {Boolean | Number | String} inactive-value 关闭选择器时通过change事件发出的值（默认false）
+	 * @event {Function} change 在switch打开或关闭时触发
+	 * @example <u-switch v-model="checked" active-color="red" inactive-color="#eee"></u-switch>
+	 */
+	export default {
+		name: "u-switch",
+		props: {
+			// 是否为加载中状态
+			loading: {
+				type: Boolean,
+				default: false
+			},
+			// 是否为禁用装填
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 开关尺寸，单位rpx
+			size: {
+				type: [Number, String],
+				default: 50
+			},
+			// 打开时的背景颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 关闭时的背景颜色
+			inactiveColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 通过v-model双向绑定的值
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
+			vibrateShort: {
+				type: Boolean,
+				default: false
+			},
+			// 打开选择器时的值
+			activeValue: {
+				type: [Number, String, Boolean],
+				default: true
+			},
+			// 关闭选择器时的值
+			inactiveValue: {
+				type: [Number, String, Boolean],
+				default: false
+			},
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			switchStyle() {
+				let style = {};
+				style.fontSize = this.size + 'rpx';
+				style.backgroundColor = this.value ? this.activeColor : this.inactiveColor;
+				return style;
+			},
+			loadingColor() {
+				return this.value ? this.activeColor : null;
+			}
+		},
+		methods: {
+			onClick() {
+				if (!this.disabled && !this.loading) {
+					// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
+					if(this.vibrateShort) uni.vibrateShort();
+					this.$emit('input', !this.value);
+					// 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
+					this.$nextTick(() => {
+						this.$emit('change', this.value ? this.activeValue : this.inactiveValue);
+					})
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-switch {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		box-sizing: initial;
+		width: 2em;
+		height: 1em;
+		background-color: #fff;
+		border: 1px solid rgba(0, 0, 0, 0.1);
+		border-radius: 1em;
+		transition: background-color 0.3s;
+		font-size: 50rpx;
+	}
+
+	.u-switch__node {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		border-radius: 100%;
+		z-index: 1;
+		background-color: #fff;
+		background-color: #fff;
+		box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
+		box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 3px 3px 0 rgba(0, 0, 0, 0.05);
+		transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+		transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05), -webkit-transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+		transition: transform cubic-bezier(0.3, 1.05, 0.4, 1.05);
+		transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05)
+	}
+
+	.u-switch__loading {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.u-switch--on {
+		background-color: #1989fa;
+	}
+
+	.u-switch--on .u-switch__node {
+		transform: translateX(100%);
+	}
+
+	.u-switch--disabled {
+		opacity: 0.4;
+	}
+</style>
diff --git a/uview-ui/components/u-tabbar/u-tabbar.vue b/uview-ui/components/u-tabbar/u-tabbar.vue
new file mode 100644
index 0000000..2e1b6a2
--- /dev/null
+++ b/uview-ui/components/u-tabbar/u-tabbar.vue
@@ -0,0 +1,330 @@
+<template>
+	<view v-if="show" class="u-tabbar" @touchmove.stop.prevent="() => {}">
+		<view class="u-tabbar__content safe-area-inset-bottom" :style="{
+			height: $u.addUnit(height),
+			backgroundColor: bgColor,
+		}" :class="{
+			'u-border-top': borderTop
+		}">
+			<view class="u-tabbar__content__item" v-for="(item, index) in list" :key="index" :class="{
+				'u-tabbar__content__circle': midButton &&item.midButton
+			}" @tap.stop="clickHandler(index)" :style="{
+				backgroundColor: bgColor
+			}">
+				<view :class="[
+					midButton && item.midButton ? 'u-tabbar__content__circle__button' : 'u-tabbar__content__item__button'
+				]">
+					<u-icon
+						:size="midButton && item.midButton ? midButtonSize : iconSize"
+						:name="elIconPath(index)"
+						img-mode="scaleToFill"
+						:color="elColor(index)"
+						:custom-prefix="item.customIcon ? 'custom-icon' : 'uicon'"
+					></u-icon>
+					<u-badge :count="item.count" :is-dot="item.isDot"
+						v-if="item.count || item.isDot"
+						:offset="[-2, getOffsetRight(item.count, item.isDot)]"
+					></u-badge>
+				</view>
+				<view class="u-tabbar__content__item__text" :style="{
+					color: elColor(index)
+				}">
+					<text class="u-line-1">{{item.text}}</text>
+				</view>
+			</view>
+			<view v-if="midButton" class="u-tabbar__content__circle__border" :class="{
+				'u-border': borderTop,
+			}" :style="{
+				backgroundColor: bgColor,
+				left: midButtonLeft
+			}">
+			</view>
+		</view>
+		<!-- 这里加上一个48rpx的高度,是为了增高有凸起按钮时的防塌陷高度(也即按钮凸出来部分的高度) -->
+		<view class="u-fixed-placeholder safe-area-inset-bottom" :style="{
+				height: `calc(${$u.addUnit(height)} + ${midButton ? 48 : 0}rpx)`,
+			}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			// 显示与否
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 通过v-model绑定current值
+			value: {
+				type: [String, Number],
+				default: 0
+			},
+			// 整个tabbar的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// tabbar的高度，默认50px，单位任意，如果为数值，则为rpx单位
+			height: {
+				type: [String, Number],
+				default: '50px'
+			},
+			// 非凸起图标的大小，单位任意，数值默认rpx
+			iconSize: {
+				type: [String, Number],
+				default: 40
+			},
+			// 凸起的图标的大小，单位任意，数值默认rpx
+			midButtonSize: {
+				type: [String, Number],
+				default: 90
+			},
+			// 激活时的演示，包括字体图标，提示文字等的演示
+			activeColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 未激活时的颜色
+			inactiveColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 是否显示中部的凸起按钮
+			midButton: {
+				type: Boolean,
+				default: false
+			},
+			// 配置参数
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 切换前的回调
+			beforeSwitch: {
+				type: Function,
+				default: null
+			},
+			// 是否显示顶部的横线
+			borderTop: {
+				type: Boolean,
+				default: true
+			},
+			// 是否隐藏原生tabbar
+			hideTabBar: {
+				type: Boolean,
+				default: true
+			},
+		},
+		data() {
+			return {
+				// 由于安卓太菜了，通过css居中凸起按钮的外层元素有误差，故通过js计算将其居中
+				midButtonLeft: '50%',
+				pageUrl: '', // 当前页面URL
+			}
+		},
+		created() {
+			// 是否隐藏原生tabbar
+			if(this.hideTabBar) uni.hideTabBar();
+			// 获取引入了u-tabbar页面的路由地址，该地址没有路径前面的"/"
+			let pages = getCurrentPages();
+			// 页面栈中的最后一个即为项为当前页面，route属性为页面路径
+			this.pageUrl = pages[pages.length - 1].route;
+		},
+		computed: {
+			elIconPath() {
+				return (index) => {
+					// 历遍u-tabbar的每一项item时，判断是否传入了pagePath参数，如果传入了
+					// 和data中的pageUrl参数对比，如果相等，即可判断当前的item对应当前的tabbar页面，设置高亮图标
+					// 采用这个方法，可以无需使用v-model绑定的value值
+					let pagePath = this.list[index].pagePath;
+					// 如果定义了pagePath属性，意味着使用系统自带tabbar方案，否则使用一个页面用几个组件模拟tabbar页面的方案
+					// 这两个方案对处理tabbar item的激活与否方式不一样
+					if(pagePath) {
+						if(pagePath == this.pageUrl || pagePath == '/' + this.pageUrl) {
+							return this.list[index].selectedIconPath;
+						} else {
+							return this.list[index].iconPath;
+						}
+					} else {
+						// 普通方案中，索引等于v-model值时，即为激活项
+						return index == this.value ? this.list[index].selectedIconPath : this.list[index].iconPath
+					}
+				}
+			},
+			elColor() {
+				return (index) => {
+					// 判断方法同理于elIconPath
+					let pagePath = this.list[index].pagePath;
+					if(pagePath) {
+						if(pagePath == this.pageUrl || pagePath == '/' + this.pageUrl) return this.activeColor;
+						else return this.inactiveColor;
+					} else {
+						return index == this.value ? this.activeColor : this.inactiveColor;
+					}
+				}
+			}
+		},
+		mounted() {
+			this.midButton && this.getMidButtonLeft();
+		},
+		methods: {
+			async clickHandler(index) {
+				if(this.beforeSwitch && typeof(this.beforeSwitch) === 'function') {
+					// 执行回调，同时传入索引当作参数
+					// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+					// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+					let beforeSwitch = this.beforeSwitch.bind(this.$u.$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) {
+						// 如果返回true
+						this.switchTab(index);
+					}
+				} else {
+					this.switchTab(index);
+				}
+			},
+			// 切换tab
+			switchTab(index) {
+				// 发出事件和修改v-model绑定的值
+				this.$emit('change', index);
+				// 如果有配置pagePath属性，使用uni.switchTab进行跳转
+				if(this.list[index].pagePath) {
+					uni.switchTab({
+						url: this.list[index].pagePath
+					})
+				} else {
+					// 如果配置了papgePath属性，将不会双向绑定v-model传入的value值
+					// 因为这个模式下，不再需要v-model绑定的value值了，而是通过getCurrentPages()适配
+					this.$emit('input', index);
+				}
+			},
+			// 计算角标的right值
+			getOffsetRight(count, isDot) {
+				// 点类型，count大于9(两位数)，分别设置不同的right值，避免位置太挤
+				if(isDot) {
+					return -20;
+				} else if(count > 9) {
+					return -40;
+				} else {
+					return -30;
+				}
+			},
+			// 获取凸起按钮外层元素的left值，让其水平居中
+			getMidButtonLeft() {
+				let windowWidth = this.$u.sys().windowWidth;
+				// 由于安卓中css计算left: 50%的结果不准确，故用js计算
+				this.midButtonLeft = (windowWidth / 2) + 'px';
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	.u-fixed-placeholder {
+		/* #ifndef APP-NVUE */
+		box-sizing: content-box;
+		/* #endif */
+	}
+
+	.u-tabbar {
+
+		&__content {
+			@include vue-flex;
+			align-items: center;
+			position: relative;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			z-index: 998;
+			/* #ifndef APP-NVUE */
+			box-sizing: content-box;
+			/* #endif */
+
+			&__circle__border {
+				border-radius: 100%;
+				width: 110rpx;
+				height: 110rpx;
+				top: -48rpx;
+				position: absolute;
+				z-index: 4;
+				background-color: #ffffff;
+				// 由于安卓的无能，导致只有3个tabbar item时，此css计算方式有误差
+				// 故使用js计算的形式来定位，此处不注释，是因为js计算有延后，避免出现位置闪动
+				left: 50%;
+				transform: translateX(-50%);
+
+				&:after {
+					border-radius: 100px;
+				}
+			}
+
+			&__item {
+				flex: 1;
+				justify-content: center;
+				height: 100%;
+				padding: 12rpx 0;
+				@include vue-flex;
+				flex-direction: column;
+				align-items: center;
+				position: relative;
+
+				&__button {
+					position: absolute;
+					top: 14rpx;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+
+				&__text {
+					color: $u-content-color;
+					font-size: 26rpx;
+					line-height: 28rpx;
+					position: absolute;
+					bottom: 14rpx;
+					left: 50%;
+					transform: translateX(-50%);
+					width: 100%;
+					text-align: center;
+				}
+			}
+
+			&__circle {
+				position: relative;
+				@include vue-flex;
+				flex-direction: column;
+				justify-content: space-between;
+				z-index: 10;
+				/* #ifndef APP-NVUE */
+				height: calc(100% - 1px);
+				/* #endif */
+
+				&__button {
+					width: 90rpx;
+					height: 90rpx;
+					border-radius: 100%;
+					@include vue-flex;
+					justify-content: center;
+					align-items: center;
+					position: absolute;
+					background-color: #ffffff;
+					top: -40rpx;
+					left: 50%;
+					z-index: 6;
+					transform: translateX(-50%);
+				}
+			}
+		}
+	}
+</style>
diff --git a/uview-ui/components/u-table/u-table.vue b/uview-ui/components/u-table/u-table.vue
new file mode 100644
index 0000000..79df16f
--- /dev/null
+++ b/uview-ui/components/u-table/u-table.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="u-table" :style="[tableStyle]">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * table 表格
+	 * @description 表格组件一般用于展示大量结构化数据的场景
+	 * @tutorial https://www.uviewui.com/components/table.html
+	 * @property {String} border-color 表格边框的颜色（默认#e4e7ed）
+	 * @property {String} bg-color 表格的背景颜色（默认#ffffff）
+	 * @property {String} align 单元格的内容对齐方式，作用类似css的text-align（默认center）
+	 * @property {String} padding 单元格的内边距，同css的padding写法（默认10rpx 0）
+	 * @property {String Number} font-size 单元格字体大小，单位rpx（默认28）
+	 * @property {String} color 单元格字体颜色（默认#606266）
+	 * @property {Object} th-style th单元格的样式，对象形式(将th所需参数放在table组件，是为了避免每一个th组件要写一遍）
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 * @example <u-table></u-table>
+	 */
+	export default {
+		name: "u-table",
+		props: {
+			borderColor: {
+				type: String,
+				default: '#e4e7ed'
+			},
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// td的内边距
+			padding: {
+				type: String,
+				default: '10rpx 6rpx'
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 28
+			},
+			// 字体颜色
+			color: {
+				type: String,
+				default: '#606266'
+			},
+			// th的自定义样式
+			thStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// table的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			}
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			tableStyle() {
+				let style = {};
+				style.borderLeft = `solid 1px ${this.borderColor}`;
+				style.borderTop = `solid 1px ${this.borderColor}`;
+				style.backgroundColor = this.bgColor;;
+				return style;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-table {
+		width: 100%;
+		box-sizing: border-box;
+	}
+</style>
diff --git a/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue b/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
new file mode 100644
index 0000000..a53e261
--- /dev/null
+++ b/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
@@ -0,0 +1,488 @@
+<template>
+	<view class="u-tabs" :style="{
+			zIndex: zIndex,
+			background: bgColor
+		}">
+		<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation :style="{ zIndex: zIndex + 1 }">
+			<view class="u-tabs-scroll-box" :class="{'u-tabs-scorll-flex': !isScroll}">
+				<view class="u-tabs-item" :style="[tabItemStyle(index)]"
+				 v-for="(item, index) in getTabs" :key="index" :class="[preId + index]" @tap="emit(index)">
+					<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
+					{{ item[name] || item['name']}}
+				</view>
+				<view v-if="showBar" class="u-scroll-bar" :style="[tabBarStyle]"></view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import colorGradient from '../../libs/function/colorGradient';
+	let color = colorGradient;
+	const { windowWidth } = uni.getSystemInfoSync();
+	const preId = 'UEl_';
+
+	/**
+	 * tabsSwiper 全屏选项卡
+	 * @description 该组件内部实现主要依托于uniapp的scroll-view和swiper组件，主要特色是切换过程中，tabsSwiper文字的颜色可以渐变，底部滑块可以 跟随式滑动，活动tab滚动居中等。应用场景可以用于需要左右切换页面，比如商城的订单中心(待收货-待付款-待评价-已退货)等应用场景。
+	 * @tutorial https://www.uviewui.com/components/tabsSwiper.html
+	 * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
+	 * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
+	 * @property {String Number} current 指定哪个tab为激活状态（默认0）
+	 * @property {String Number} height 导航栏的高度，单位rpx（默认80）
+	 * @property {String Number} font-size tab文字大小，单位rpx（默认30）
+	 * @property {String Number} swiper-width tabs组件外部swiper的宽度，默认为屏幕宽度，单位rpx（默认750）
+	 * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
+	 * @property {String} inactive-color tabs文字颜色（默认#303133）
+	 * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
+	 * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
+	 * @property {Object} bar-style 底部滑块的样式，对象形式
+	 * @property {Object} active-item-style 活动tabs item的样式，对象形式
+	 * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
+	 * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
+	 * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
+	 * @property {String} name 组件内部读取的list参数中的属性名，见官网说明（默认name）
+	 * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
+	 * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @event {Function} change 点击标签时触发
+	 * @example <u-tabs-swiper ref="tabs" :list="list" :is-scroll="false"></u-tabs-swiper>
+	 */
+	export default {
+		name: "u-tabs-swiper",
+		props: {
+			// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
+			isScroll: {
+				type: Boolean,
+				default: true
+			},
+			//需循环的标签列表
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 当前活动tab的索引
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 导航栏的高度和行高，单位rpx
+			height: {
+				type: [Number, String],
+				default: 80
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [Number, String],
+				default: 30
+			},
+			// 过渡动画时长, 单位s
+			// duration: {
+			// 	type: [Number, String],
+			// 	default: 0.5
+			// },
+			swiperWidth: {
+				//line3生效, 外部swiper的宽度, 单位rpx
+				type: [String, Number],
+				default: 750
+			},
+			// 选中项的主题颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 未选中项的颜色
+			inactiveColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 菜单底部移动的bar的宽度，单位rpx
+			barWidth: {
+				type: [Number, String],
+				default: 40
+			},
+			// 移动bar的高度
+			barHeight: {
+				type: [Number, String],
+				default: 6
+			},
+			// 单个tab的左或右内边距（各占一半），单位rpx
+			gutter: {
+				type: [Number, String],
+				default: 40
+			},
+			// 如果是绝对定位，添加z-index值
+			zIndex: {
+				type: [Number, String],
+				default: 1
+			},
+			// 导航栏的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			//滚动至中心目标类型
+			autoCenterMode: {
+				type: String,
+				default: 'window'
+			},
+			// 读取传入的数组对象的属性(tab名称)
+			name: {
+				type: String,
+				default: 'name'
+			},
+			// 读取传入的数组对象的属性(徽标数)
+			count: {
+				type: String,
+				default: 'count'
+			},
+			// 徽标数位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [5, 20]
+				}
+			},
+			// 活动tab字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 当前活动tab item的样式
+			activeItemStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 是否显示底部的滑块
+			showBar: {
+				type: Boolean,
+				default: true
+			},
+			// 底部滑块的自定义样式
+			barStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				scrollLeft: 0, // 滚动scroll-view的左边滚动距离
+				tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
+				windowWidth: 0, // 屏幕宽度，单位为px
+				//scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
+				animationFinishCurrent: this.current,
+				componentsWidth: 0,
+				line3AddDx: 0,
+				line3Dx: 0,
+				preId,
+				sW: 0,
+				tabsInfo: [],
+				colorGradientArr: [],
+				colorStep: 100 // 两个颜色之间的渐变等分
+			};
+		},
+		computed: {
+			// 获取当前活跃的current值
+			getCurrent() {
+				const current = Number(this.current);
+				// 判断是否超出边界
+				if (current > this.getTabs.length - 1) {
+					return this.getTabs.length - 1;
+				}
+				if (current < 0) return 0;
+				return current;
+			},
+			getTabs() {
+				return this.list;
+			},
+			// 滑块需要移动的距离
+			scrollBarLeft() {
+				return Number(this.line3Dx) + Number(this.line3AddDx);
+			},
+			// 滑块的宽度转为px单位
+			barWidthPx() {
+				return uni.upx2px(this.barWidth);
+			},
+			// tab的样式
+			tabItemStyle() {
+				return (index) => {
+					let style = {
+						height: this.height + 'rpx',
+						lineHeight: this.height + 'rpx',
+						padding: `0 ${this.gutter / 2}rpx`,
+						color: this.tabsInfo.length > 0 ? (this.tabsInfo[index] ? this.tabsInfo[index].color : this.activeColor) : this.inactiveColor,
+						fontSize: this.fontSize + 'rpx',
+						zIndex: this.zIndex + 2,
+						fontWeight: (index == this.getCurrent && this.bold) ? 'bold' : 'normal'
+					};
+					if(index == this.getCurrent) {
+						// 给选中的tab item添加外部自定义的样式
+						style = Object.assign(style, this.activeItemStyle);
+					}
+					return style;
+				}
+			},
+			// 底部滑块的样式
+			tabBarStyle() {
+				let style = {
+					width: this.barWidthPx + 'px',
+					height: this.barHeight + 'rpx',
+					borderRadius: '100px',
+					backgroundColor: this.activeColor,
+					left: this.scrollBarLeft + 'px'
+				};
+				return Object.assign(style, this.barStyle);
+			}
+		},
+		watch: {
+			current(n, o) {
+				this.change(n);
+				this.setFinishCurrent(n);
+			},
+			list() {
+				this.$nextTick(() => {
+					this.init();
+				})
+			}
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			async init() {
+				this.countPx();
+				await this.getTabsInfo();
+				this.countLine3Dx();
+				this.getQuery(() => {
+					this.setScrollViewToCenter();
+				});
+				// 颜色渐变过程数组
+				this.colorGradientArr = color.colorGradient(this.inactiveColor, this.activeColor, this.colorStep);
+			},
+			// 获取各个tab的节点信息
+			getTabsInfo() {
+				return new Promise((resolve, reject) => {
+					let view = uni.createSelectorQuery().in(this);
+					for (let i = 0; i < this.list.length; i++) {
+						view.select('.' + preId + i).boundingClientRect();
+					}
+					view.exec(res => {
+						const arr = [];
+						for (let i = 0; i < res.length; i++) {
+							// 给每个tab添加其文字颜色属性
+							res[i].color = this.inactiveColor;
+							// 当前tab直接赋予activeColor
+							if (i == this.getCurrent) res[i].color = this.activeColor;
+							arr.push(res[i]);
+						}
+						this.tabsInfo = arr;
+						resolve();
+					});
+				})
+			},
+			// 当swiper滑动结束，计算滑块最终要停留的位置
+			countLine3Dx() {
+				const tab = this.tabsInfo[this.animationFinishCurrent];
+				// 让滑块中心点和当前tab中心重合
+				if (tab) this.line3Dx = tab.left + tab.width / 2 - this.barWidthPx / 2 - this.tabsInfo[0].left;
+			},
+			countPx() {
+				// swiper宽度由rpx转为px单位，因为dx等，都是px单位
+				this.sW = uni.upx2px(Number(this.swiperWidth));
+			},
+			emit(index) {
+				this.$emit('change', index);
+			},
+			change() {
+				this.setScrollViewToCenter();
+			},
+			getQuery(cb) {
+				try {
+					let view = uni.createSelectorQuery().in(this).select('.u-tabs');
+					view.fields({
+							size: true
+						},
+						data => {
+							if (data) {
+								this.componentsWidth = data.width;
+								if (cb && typeof cb === 'function') cb(data);
+							} else {
+								this.getQuery(cb);
+							}
+						}
+					).exec();
+				} catch (e) {
+					this.componentsWidth = windowWidth;
+				}
+			},
+			// 把活动tab移动到屏幕中心点
+			setScrollViewToCenter() {
+				let tab;
+				tab = this.tabsInfo[this.animationFinishCurrent];
+				if (tab) {
+					let tabCenter = tab.left + tab.width / 2;
+					let fatherWidth;
+					// 活动tab移动到中心时，以屏幕还是tab组件为宽度为基准
+					if (this.autoCenterMode === 'window') {
+						fatherWidth = windowWidth;
+					} else {
+						fatherWidth = this.componentsWidth;
+					}
+					this.scrollLeft = tabCenter - fatherWidth / 2;
+				}
+			},
+			setDx(dx) {
+				let nextTabIndex = dx > 0 ? this.animationFinishCurrent + 1 : this.animationFinishCurrent - 1;
+				// 判断索引是否超出边界
+				nextTabIndex = nextTabIndex <= 0 ? 0 : nextTabIndex;
+				nextTabIndex = nextTabIndex >= this.list.length ? this.list.length - 1 : nextTabIndex;
+				const tab = this.tabsInfo[nextTabIndex];
+				// 当前tab中心点x轴坐标
+				let nowTab = this.tabsInfo[this.animationFinishCurrent];
+				let nowTabX = nowTab.left + nowTab.width / 2;
+				// 下一个tab
+				let nextTab = this.tabsInfo[nextTabIndex];
+				let nextTabX = nextTab.left + nextTab.width / 2;
+				// 两个tab之间的距离，因为下一个tab可能在当前tab的左边或者右边，取绝对值即可
+				let distanceX = Math.abs(nextTabX - nowTabX);
+				this.line3AddDx = (dx / this.sW) * distanceX;
+				this.setTabColor(this.animationFinishCurrent, nextTabIndex, dx);
+			},
+			// 设置tab的颜色
+			setTabColor(nowTabIndex, nextTabIndex, dx) {
+				let colorIndex = Math.abs(Math.ceil((dx / this.sW) * 100));
+				let colorLength = this.colorGradientArr.length;
+				// 处理超出索引边界的情况
+				colorIndex = colorIndex >= colorLength ? colorLength - 1 : colorIndex <= 0 ? 0 : colorIndex;
+				// 设置下一个tab的颜色
+				this.tabsInfo[nextTabIndex].color = this.colorGradientArr[colorIndex];
+				// 设置当前tab的颜色
+				this.tabsInfo[nowTabIndex].color = this.colorGradientArr[colorLength - 1 - colorIndex];
+			},
+			// swiper结束滑动
+			setFinishCurrent(current) {
+				// 如果滑动的索引不一致，修改tab颜色变化，因为可能会有直接点击tab的情况
+				this.tabsInfo.map((val, index) => {
+					if (current == index) val.color = this.activeColor;
+					else val.color = this.inactiveColor;
+					return val;
+				});
+				this.line3AddDx = 0;
+				this.animationFinishCurrent = current;
+				this.countLine3Dx();
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	view,
+	scroll-view {
+		box-sizing: border-box;
+	}
+
+	.u-tabs {
+		width: 100%;
+		transition-property: background-color, color;
+	}
+
+	/* #ifndef APP-NVUE */
+	::-webkit-scrollbar,
+	::-webkit-scrollbar,
+	::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	/* #ifdef H5 */
+	// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
+	scroll-view ::v-deep ::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+
+	/* #endif */
+
+	.u-scroll-view {
+		width: 100%;
+		white-space: nowrap;
+		position: relative;
+	}
+
+	.u-tabs-scroll-box {
+		position: relative;
+	}
+
+	.u-tabs-scorll-flex {
+		@include vue-flex;
+		justify-content: space-between;
+	}
+
+	.u-tabs-scorll-flex .u-tabs-item {
+		flex: 1;
+	}
+
+	.u-tabs-item {
+		position: relative;
+		display: inline-block;
+		text-align: center;
+		transition-property: background-color, color, font-weight;
+	}
+
+	.content {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.boxStyle {
+		pointer-events: none;
+		position: absolute;
+		transition-property: all;
+	}
+
+	.boxStyle2 {
+		pointer-events: none;
+		position: absolute;
+		bottom: 0;
+		transition-property: all;
+		transform: translateY(-100%);
+	}
+
+	.itemBackgroundBox {
+		pointer-events: none;
+		position: absolute;
+		top: 0;
+		transition-property: left, background-color;
+		@include vue-flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.itemBackground {
+		height: 100%;
+		width: 100%;
+		transition-property: all;
+	}
+
+	.u-scroll-bar {
+		position: absolute;
+		bottom: 4rpx;
+	}
+</style>
diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue
new file mode 100644
index 0000000..0c59658
--- /dev/null
+++ b/uview-ui/components/u-tabs/u-tabs.vue
@@ -0,0 +1,369 @@
+<template>
+	<view class="u-tabs" :style="{
+		background: bgColor
+	}">
+		<!-- $u.getRect()对组件根节点无效，因为写了.in(this)，故这里获取内层接点尺寸 -->
+		<view :id="id">
+			<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation>
+				<view class="u-scroll-box" :class="{'u-tabs-scorll-flex': !isScroll}">
+					<view class="u-tab-item u-line-1" :id="'u-tab-item-' + index" v-for="(item, index) in list" :key="index" @tap="clickTab(index)"
+					 :style="[tabItemStyle(index)]">
+						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
+						{{ item[name] || item['name']}}
+					</view>
+					<view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tabs 标签
+	 * @description 该组件，是一个tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
+	 * @tutorial https://www.uviewui.com/components/tabs.html
+	 * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
+	 * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
+	 * @property {String Number} current 指定哪个tab为激活状态（默认0）
+	 * @property {String Number} height 导航栏的高度，单位rpx（默认80）
+	 * @property {String Number} font-size tab文字大小，单位rpx（默认30）
+	 * @property {String Number} duration 滑块移动一次所需的时间，单位秒（默认0.5）
+	 * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
+	 * @property {String} inactive-color tabs文字颜色（默认#303133）
+	 * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
+	 * @property {Object} active-item-style 活动tabs item的样式，对象形式
+	 * @property {Object} bar-style 底部滑块的样式，对象形式
+	 * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
+	 * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
+	 * @property {String Number} item-width 标签的宽度（默认auto）
+	 * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
+	 * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
+	 * @property {String} name 组件内部读取的list参数中的属性名（tab名称），见官网说明（默认name）
+	 * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
+	 * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @event {Function} change 点击标签时触发
+	 * @example <u-tabs ref="tabs" :list="list" :is-scroll="false"></u-tabs>
+	 */
+	export default {
+		name: "u-tabs",
+		props: {
+			// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
+			isScroll: {
+				type: Boolean,
+				default: true
+			},
+			//需循环的标签列表
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 当前活动tab的索引
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 导航栏的高度和行高
+			height: {
+				type: [String, Number],
+				default: 80
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 30
+			},
+			// 过渡动画时长, 单位ms
+			duration: {
+				type: [String, Number],
+				default: 0.5
+			},
+			// 选中项的主题颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 未选中项的颜色
+			inactiveColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 菜单底部移动的bar的宽度，单位rpx
+			barWidth: {
+				type: [String, Number],
+				default: 40
+			},
+			// 移动bar的高度
+			barHeight: {
+				type: [String, Number],
+				default: 6
+			},
+			// 单个tab的左或有内边距（左右相同）
+			gutter: {
+				type: [String, Number],
+				default: 30
+			},
+			// 导航栏的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 读取传入的数组对象的属性(tab名称)
+			name: {
+				type: String,
+				default: 'name'
+			},
+			// 读取传入的数组对象的属性(徽标数)
+			count: {
+				type: String,
+				default: 'count'
+			},
+			// 徽标数位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [5, 20]
+				}
+			},
+			// 活动tab字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 当前活动tab item的样式
+			activeItemStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 是否显示底部的滑块
+			showBar: {
+				type: Boolean,
+				default: true
+			},
+			// 底部滑块的自定义样式
+			barStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 标签的宽度
+			itemWidth: {
+				type: [Number, String],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				scrollLeft: 0, // 滚动scroll-view的左边滚动距离
+				tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
+				componentWidth: 0, // 屏幕宽度，单位为px
+				scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
+				parentLeft: 0, // 父元素(tabs组件)到屏幕左边的距离
+				id: this.$u.guid(), // id值
+				currentIndex: this.current,
+				barFirstTimeMove: true, // 滑块第一次移动时(页面刚生成时)，无需动画，否则给人怪异的感觉
+			};
+		},
+		watch: {
+			// 监听tab的变化，重新计算tab菜单的布局信息，因为实际使用中菜单可能是通过
+			// 后台获取的（如新闻app顶部的菜单），获取返回需要一定时间，所以list变化时，重新获取布局信息
+			list(n, o) {
+				// list变动时，重制内部索引，否则可能导致超出数组边界的情况
+				if(n.length !== o.length) this.currentIndex = 0;
+				// 用$nextTick等待视图更新完毕后再计算tab的局部信息，否则可能因为tab还没生成就获取，就会有问题
+				this.$nextTick(() => {
+					this.init();
+				});
+			},
+			current: {
+				immediate: true,
+				handler(nVal, oVal) {
+					// 视图更新后再执行移动操作
+					this.$nextTick(() => {
+						this.currentIndex = nVal;
+						this.scrollByIndex();
+					});
+				}
+			},
+		},
+		computed: {
+			// 移动bar的样式
+			tabBarStyle() {
+				let style = {
+					width: this.barWidth + 'rpx',
+					transform: `translate(${this.scrollBarLeft}px, -100%)`,
+					// 滑块在页面渲染后第一次滑动时，无需动画效果
+					'transition-duration': `${this.barFirstTimeMove ? 0 : this.duration }s`,
+					'background-color': this.activeColor,
+					height: this.barHeight + 'rpx',
+					opacity: this.barFirstTimeMove ? 0 : 1,
+					// 设置一个很大的值，它会自动取能用的最大值，不用高度的一半，是因为高度可能是单数，会有小数出现
+					'border-radius': `${this.barHeight / 2}px`
+				};
+				Object.assign(style, this.barStyle);
+				return style;
+			},
+			// tab的样式
+			tabItemStyle() {
+				return (index) => {
+					let style = {
+						height: this.height + 'rpx',
+						'line-height': this.height + 'rpx',
+						'font-size': this.fontSize + 'rpx',
+						'transition-duration': `${this.duration}s`,
+						padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
+						flex: this.isScroll ? 'auto' : '1',
+						width: this.$u.addUnit(this.itemWidth)
+					};
+					// 字体加粗
+					if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
+					if (index == this.currentIndex) {
+						style.color = this.activeColor;
+						// 给选中的tab item添加外部自定义的样式
+						style = Object.assign(style, this.activeItemStyle);
+					} else {
+						style.color = this.inactiveColor;
+					}
+					return style;
+				}
+			}
+		},
+		methods: {
+			// 设置一个init方法，方便多处调用
+			async init() {
+				// 获取tabs组件的尺寸信息
+				let tabRect = await this.$uGetRect('#' + this.id);
+				// tabs组件距离屏幕左边的宽度
+				this.parentLeft = tabRect.left;
+				// tabs组件的宽度
+				this.componentWidth = tabRect.width;
+				this.getTabRect();
+			},
+			// 点击某一个tab菜单
+			clickTab(index) {
+				// 点击当前活动tab，不触发事件
+				if(index == this.currentIndex) return ;
+				// 发送事件给父组件
+				this.$emit('change', index);
+			},
+			// 查询tab的布局信息
+			getTabRect() {
+				// 创建节点查询
+				let query = uni.createSelectorQuery().in(this);
+				// 历遍所有tab，这里是执行了查询，最终使用exec()会一次性返回查询的数组结果
+				for (let i = 0; i < this.list.length; i++) {
+					// 只要size和rect两个参数
+					query.select(`#u-tab-item-${i}`).fields({
+						size: true,
+						rect: true
+					});
+				}
+				// 执行查询，一次性获取多个结果
+				query.exec(
+					function(res) {
+						this.tabQueryInfo = res;
+						// 初始化滚动条和移动bar的位置
+						this.scrollByIndex();
+					}.bind(this)
+				);
+			},
+			// 滚动scroll-view，让活动的tab处于屏幕的中间位置
+			scrollByIndex() {
+				// 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
+				let tabInfo = this.tabQueryInfo[this.currentIndex];
+				if (!tabInfo) return;
+				// 活动tab的宽度
+				let tabWidth = tabInfo.width;
+				// 活动item的左边到tabs组件左边的距离，用item的left减去tabs的left
+				let offsetLeft = tabInfo.left - this.parentLeft;
+				// 将活动的tabs-item移动到屏幕正中间，实际上是对scroll-view的移动
+				let scrollLeft = offsetLeft - (this.componentWidth - tabWidth) / 2;
+				this.scrollLeft = scrollLeft < 0 ? 0 : scrollLeft;
+				// 当前活动item的中点点到左边的距离减去滑块宽度的一半，即可得到滑块所需的移动距离
+				let left = tabInfo.left + tabInfo.width / 2 - this.parentLeft;
+				// 计算当前活跃item到组件左边的距离
+				this.scrollBarLeft = left - uni.upx2px(this.barWidth) / 2;
+				// 第一次移动滑块的时候，barFirstTimeMove为true，放到延时中将其设置false
+				// 延时是因为scrollBarLeft作用于computed计算时，需要一个过程需，否则导致出错
+				if(this.barFirstTimeMove == true) {
+					setTimeout(() => {
+						this.barFirstTimeMove = false;
+					}, 100)
+				}
+			}
+		},
+		mounted() {
+			this.init();
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	view,
+	scroll-view {
+		box-sizing: border-box;
+	}
+
+	/* #ifndef APP-NVUE */
+	::-webkit-scrollbar,
+	::-webkit-scrollbar,
+	::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	.u-scroll-box {
+		position: relative;
+		/* #ifdef MP-TOUTIAO */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
+	scroll-view ::v-deep ::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	.u-scroll-view {
+		width: 100%;
+		white-space: nowrap;
+		position: relative;
+	}
+
+	.u-tab-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		text-align: center;
+		transition-property: background-color, color;
+	}
+
+	.u-tab-bar {
+		position: absolute;
+		bottom: 0;
+	}
+
+	.u-tabs-scorll-flex {
+		@include vue-flex;
+		justify-content: space-between;
+	}
+</style>
diff --git a/uview-ui/components/u-tag/u-tag.vue b/uview-ui/components/u-tag/u-tag.vue
new file mode 100644
index 0000000..90ec3f4
--- /dev/null
+++ b/uview-ui/components/u-tag/u-tag.vue
@@ -0,0 +1,294 @@
+<template>
+	<view v-if="show" :class="[
+		disabled ? 'u-disabled' : '',
+		'u-size-' + size,
+		'u-shape-' + shape,
+		'u-mode-' + mode + '-' + type
+	]"
+	 class="u-tag" :style="[customStyle]" @tap="clickTag">
+		{{text}}
+		<view class="u-icon-wrap" @tap.stop>
+			<u-icon @click="close" size="22" v-if="closeable" :color="closeIconColor" 
+			name="close" class="u-close-icon" :style="[iconStyle]"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tag 提示
+	 * @description 该组件一般用于标记和选择
+	 * @tutorial https://www.uviewui.com/components/tag.html
+	 * @property {String} type 主题类型（默认primary）
+	 * @property {String} size 标签大小（默认default）
+	 * @property {String} shape 标签形状（默认square）
+	 * @property {String} text 标签的文字内容
+	 * @property {String} bg-color 自定义标签的背景颜色
+	 * @property {String} border-color 标签的边框颜色
+	 * @property {String} close-color 关闭按钮的颜色
+	 * @property {String Number} index 点击标签时，会通过click事件返回该值
+	 * @property {String} mode 模式选择，见官网说明（默认light）
+	 * @property {Boolean} closeable 是否可关闭，设置为true，文字右边会出现一个关闭图标（默认false）
+	 * @property {Boolean} show 标签显示与否（默认true）
+	 * @event {Function} click 点击标签触发
+	 * @event {Function} close closeable为true时，点击标签关闭按钮触发
+	 * @example <u-tag text="雪月夜" type="success" />
+	 */
+	export default {
+		name: 'u-tag',
+		// 是否禁用这个标签，禁用的话，会屏蔽点击事件
+		props: {
+			// 标签类型info、primary、success、warning、error
+			type: {
+				type: String,
+				default: 'primary'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			// 标签的大小，分为default（默认），mini（较小）
+			size: {
+				type: String,
+				default: 'default'
+			},
+			// tag的形状，circle（两边半圆形）, square（方形，带圆角），circleLeft（左边是半圆），circleRight（右边是半圆）
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			// 标签文字
+			text: {
+				type: [String, Number],
+				default: ''
+			},
+			// 背景颜色，默认为空字符串，即不处理
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 标签字体颜色，默认为空字符串，即不处理
+			color: {
+				type: String,
+				default: ''
+			},
+			// 镂空形式标签的边框颜色
+			borderColor: {
+				type: String,
+				default: ''
+			},
+			// 关闭按钮图标的颜色
+			closeColor: {
+				type: String,
+				default: ''
+			},
+			// 点击时返回的索引值，用于区分例遍的数组哪个元素被点击了
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 模式选择，dark|light|plain
+			mode: {
+				type: String,
+				default: 'light'
+			},
+			// 是否可关闭
+			closeable: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			customStyle() {
+				let style = {};
+				// 文字颜色（如果有此值，会覆盖type值的颜色）
+				if(this.color) style.color = this.color;
+				// tag的背景颜色（如果有此值，会覆盖type值的颜色）
+				if(this.bgColor) style.backgroundColor = this.bgColor;
+				// 如果是镂空型tag，没有传递边框颜色（borderColor）的话，使用文字的颜色（color属性）
+				if(this.mode == 'plain' && this.color && !this.borderColor) style.borderColor = this.color;
+				else style.borderColor = this.borderColor;
+				return style;
+			},
+			iconStyle() {
+				if(!this.closeable) return ;
+				let style = {};
+				if(this.size == 'mini') style.fontSize = '20rpx';
+				else style.fontSize = '22rpx';
+				if(this.mode == 'plain' || this.mode == 'light') style.color = this.type;
+				else if(this.mode == 'dark')  style.color = "#ffffff";
+				if(this.closeColor) style.color = this.closeColor;
+				return style;
+			},
+			// 关闭图标的颜色
+			closeIconColor() {
+				// 如果定义了关闭图标的颜色，就用此值，否则用字体颜色的值
+				// 如果上面的二者都没有，如果是dark深色模式，图标就为白色
+				// 最后如果上面的三者都不合适，就返回type值给图标获取颜色
+				let color = '';
+				if(this.closeColor) return this.closeColor;
+				else if(this.color) return this.color;
+				else if(this.mode == 'dark') return '#ffffff';
+				else return this.type;
+			}
+		},
+		methods: {
+			// 标签被点击
+			clickTag() {
+				// 如果是disabled状态，不发送点击事件
+				if(this.disabled) return ;
+				this.$emit('click', this.index);
+			},
+			// 点击标签关闭按钮
+			close() {
+				this.$emit('close', this.index);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-tag {
+		box-sizing: border-box;
+		align-items: center;
+		border-radius: 6rpx;
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		line-height: 1;
+	}
+	
+	.u-size-default {
+		font-size: 22rpx;
+		padding: 12rpx 22rpx;
+	}
+	
+	.u-size-mini {
+		font-size: 20rpx;
+		padding: 6rpx 12rpx;
+	}
+
+	.u-mode-light-primary {
+		background-color: $u-type-primary-light;
+		color: $u-type-primary;
+		border: 1px solid $u-type-primary-disabled;
+	}
+	
+	.u-mode-light-success {
+		background-color: $u-type-success-light;
+		color: $u-type-success;
+		border: 1px solid $u-type-success-disabled;
+	}
+	
+	.u-mode-light-error {
+		background-color: $u-type-error-light;
+		color: $u-type-error;
+		border: 1px solid $u-type-error-disabled;
+	}
+	
+	.u-mode-light-warning {
+		background-color: $u-type-warning-light;
+		color: $u-type-warning;
+		border: 1px solid $u-type-warning-disabled;
+	}
+	
+	.u-mode-light-info {
+		background-color: $u-type-info-light;
+		color: $u-type-info;
+		border: 1px solid $u-type-info-disabled;
+	}
+	
+	.u-mode-dark-primary {
+		background-color: $u-type-primary;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-success {
+		background-color: $u-type-success;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-error {
+		background-color: $u-type-error;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-warning {
+		background-color: $u-type-warning;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-info {
+		background-color: $u-type-info;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-plain-primary {
+		background-color: #FFFFFF;
+		color: $u-type-primary;
+		border: 1px solid $u-type-primary;
+	}
+	
+	.u-mode-plain-success {
+		background-color: #FFFFFF;
+		color: $u-type-success;
+		border: 1px solid $u-type-success;
+	}
+	
+	.u-mode-plain-error {
+		background-color: #FFFFFF;
+		color: $u-type-error;
+		border: 1px solid $u-type-error;
+	}
+	
+	.u-mode-plain-warning {
+		background-color: #FFFFFF;
+		color: $u-type-warning;
+		border: 1px solid $u-type-warning;
+	}
+	
+	.u-mode-plain-info {
+		background-color: #FFFFFF;
+		color: $u-type-info;
+		border: 1px solid $u-type-info;
+	}
+	
+	.u-disabled {
+		opacity: 0.55;
+	}
+
+	.u-shape-circle {
+		border-radius: 100rpx;
+	}
+	
+	.u-shape-circleRight {
+		border-radius:  0 100rpx 100rpx 0;
+	}
+
+	.u-shape-circleLeft {
+		border-radius: 100rpx 0 0 100rpx;
+	}
+	
+	.u-close-icon {
+		margin-left: 14rpx;
+		font-size: 22rpx;
+		color: $u-type-success;
+	}
+	
+	.u-icon-wrap {
+		display: inline-flex;
+		transform: scale(0.86);
+	}
+</style>
diff --git a/uview-ui/components/u-td/u-td.vue b/uview-ui/components/u-td/u-td.vue
new file mode 100644
index 0000000..b00ad8b
--- /dev/null
+++ b/uview-ui/components/u-td/u-td.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="u-td" :style="[tdStyle]">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * td td单元格
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
+	 * @tutorial https://www.uviewui.com/components/table.html#td-props
+	 * @property {String Number} width 单元格宽度百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度（默认auto）
+	 * @example <u-td>二年级</u-td>
+	 */
+	export default {
+		name: "u-td",
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [Number, String],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				tdStyle: {
+					
+				}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width != "auto") style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.fontSize = this.parent.fontSize + 'rpx';
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				style.color = this.parent.color;
+				this.tdStyle = style;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-td {
+		@include vue-flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-content-color;
+		align-self: stretch;
+		box-sizing: border-box;
+		height: 100%;
+	}
+</style>
diff --git a/uview-ui/components/u-th/u-th.vue b/uview-ui/components/u-th/u-th.vue
new file mode 100644
index 0000000..9fe5a16
--- /dev/null
+++ b/uview-ui/components/u-th/u-th.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="u-th" :style="[thStyle]">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * th th单元格
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
+	 * @tutorial https://www.uviewui.com/components/table.html#td-props
+	 * @property {String Number} width 标题单元格宽度百分比或者具体带单位的值，如30%，200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度
+	 * @example 暂无示例
+	 */
+	export default {
+		name: "u-th",
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				thStyle: {}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width) style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				Object.assign(style, this.parent.style);
+				this.thStyle = style;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-th {
+		@include vue-flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-main-color;
+		font-weight: bold;
+		background-color: rgb(245, 246, 248);
+	}
+</style>
diff --git a/uview-ui/components/u-time-line-item/u-time-line-item.vue b/uview-ui/components/u-time-line-item/u-time-line-item.vue
new file mode 100644
index 0000000..be86fdc
--- /dev/null
+++ b/uview-ui/components/u-time-line-item/u-time-line-item.vue
@@ -0,0 +1,83 @@
+<template>
+	<view class="u-time-axis-item">
+		<slot name="content" />
+		<view class="u-time-axis-node" :style="[nodeStyle]">
+			<slot name="node">
+				<view class="u-dot">
+				</view>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * timeLineItem 时间轴Item
+	 * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。(搭配u-time-line使用)
+	 * @tutorial https://www.uviewui.com/components/timeLine.html
+	 * @property {String} bg-color 左边节点的背景颜色，一般通过slot内容自定义背景颜色即可（默认#ffffff）
+	 * @property {String Number} node-top 节点左边图标绝对定位的top值，单位rpx
+	 * @example <u-time-line-item node-top="2">...</u-time-line-item>
+	 */
+	export default {
+		name: "u-time-line-item",
+		props: {
+			// 节点的背景颜色
+			bgColor: {
+				type: String,
+				default: "#ffffff"
+			},
+			// 节点左边图标绝对定位的top值
+			nodeTop: {
+				type: [String, Number],
+				default: ""
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			nodeStyle() {
+				let style = {
+					backgroundColor: this.bgColor,
+				};
+				if (this.nodeTop != "") style.top = this.nodeTop + 'rpx';
+				return style;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-time-axis-item {
+		@include vue-flex;
+		flex-direction: column;
+		width: 100%;
+		position: relative;
+		margin-bottom: 32rpx;
+	}
+
+	.u-time-axis-node {
+		position: absolute;
+		top: 12rpx;
+		left: -40rpx;
+		transform-origin: 0;
+		transform: translateX(-50%);
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 1;
+		font-size: 24rpx;
+	}
+
+	.u-dot {
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 100rpx;
+		background: #ddd;
+	}
+</style>
diff --git a/uview-ui/components/u-time-line/u-time-line.vue b/uview-ui/components/u-time-line/u-time-line.vue
new file mode 100644
index 0000000..f3c7587
--- /dev/null
+++ b/uview-ui/components/u-time-line/u-time-line.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="u-time-axis">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * timeLine 时间轴
+	 * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。
+	 * @tutorial https://www.uviewui.com/components/timeLine.html
+	 * @example <u-time-line></u-time-line>
+	 */
+	export default {
+		name: "u-time-line",
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-time-axis {
+		padding-left: 40rpx;
+		position: relative;
+	}
+
+	.u-time-axis::before {
+		content: " ";
+		position: absolute;
+		left: 0;
+		top: 12rpx;
+		width: 1px;
+		bottom: 0;
+		border-left: 1px solid #ddd;
+		transform-origin: 0 0;
+		transform: scaleX(0.5);
+	}
+</style>
diff --git a/uview-ui/components/u-toast/u-toast.vue b/uview-ui/components/u-toast/u-toast.vue
new file mode 100644
index 0000000..ff9a272
--- /dev/null
+++ b/uview-ui/components/u-toast/u-toast.vue
@@ -0,0 +1,223 @@
+<template>
+	<view class="u-toast" :class="[isShow ? 'u-show' : '', 'u-type-' + tmpConfig.type, 'u-position-' + tmpConfig.position]" :style="{
+		zIndex: uZIndex
+	}">
+		<view class="u-icon-wrap">
+			<u-icon v-if="tmpConfig.icon" class="u-icon" :name="iconName" :size="30" :color="tmpConfig.type"></u-icon>
+		</view>
+		<text class="u-text">{{tmpConfig.title}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * toast 消息提示
+	 * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
+	 * @tutorial https://www.uviewui.com/components/toast.html
+	 * @property {String} z-index toast展示时的z-index值
+	 * @event {Function} show 显示toast，如需一进入页面就显示toast，请在onReady生命周期调用
+	 * @example <u-toast ref="uToast" />
+	 */
+	export default {
+		name: "u-toast",
+		props: {
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+		},
+		data() {
+			return {
+				isShow: false,
+				timer: null, // 定时器
+				config: {
+					params: {}, // URL跳转的参数，对象
+					title: '', // 显示文本
+					type: '', // 主题类型，primary，success，error，warning，black
+					duration: 2000, // 显示的时间，毫秒
+					isTab: false, // 是否跳转tab页面
+					url: '', // toast消失后是否跳转页面，有则跳转，优先级高于back参数
+					icon: true, // 显示的图标
+					position: 'top', // toast出现的位置
+					callback: null, // 执行完后的回调函数
+					back: false, // 结束toast是否自动返回上一页
+				},
+				tmpConfig: {}, // 将用户配置和内置配置合并后的临时配置变量
+			};
+		},
+		computed: {
+			iconName() {
+				// 只有不为none，并且type为error|warning|succes|info时候，才显示图标
+				if (['error', 'warning', 'success', 'info'].indexOf(this.tmpConfig.type) >= 0 && this.tmpConfig.icon) {
+					let icon = this.$u.type2icon(this.tmpConfig.type);
+					return icon;
+				}
+			},
+			uZIndex() {
+				// 显示toast时候，如果用户有传递z-index值，有限使用
+				return this.isShow ? (this.zIndex ? this.zIndex : this.$u.zIndex.toast) : '999999';
+			}
+		},
+		methods: {
+			// 显示toast组件，由父组件通过this.$refs.xxx.show(options)形式调用
+			show(options) {
+				// 不降结果合并到this.config变量，避免多次条用u-toast，前后的配置造成混论
+				this.tmpConfig = this.$u.deepMerge(this.config, options);
+				if (this.timer) {
+					// 清除定时器
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+				this.isShow = true;
+				this.timer = setTimeout(() => {
+					// 倒计时结束，清除定时器，隐藏toast组件
+					this.isShow = false;
+					clearTimeout(this.timer);
+					this.timer = null;
+					// 判断是否存在callback方法，如果存在就执行
+					typeof(this.tmpConfig.callback) === 'function' && this.tmpConfig.callback();
+					this.timeEnd();
+				}, this.tmpConfig.duration);
+			},
+			// 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
+			hide() {
+				this.isShow = false;
+				if (this.timer) {
+					// 清除定时器
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+			},
+			// 倒计时结束之后，进行的一些操作
+			timeEnd() {
+				// 如果带有url值，根据isTab为true或者false进行跳转
+				if (this.tmpConfig.url) {
+					// 如果url没有"/"开头，添加上，因为uni的路由跳转需要"/"开头
+					if (this.tmpConfig.url[0] != '/') this.tmpConfig.url = '/' + this.tmpConfig.url;
+					// 判断是否有传递显式的参数
+					if (Object.keys(this.tmpConfig.params).length) {
+						// 判断用户传递的url中，是否带有参数
+						// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+						// 如果有params参数，转换后无需带上"?"
+						let query = '';
+						if (/.*\/.*\?.*=.*/.test(this.tmpConfig.url)) {
+							// object对象转为get类型的参数
+							query = this.$u.queryParams(this.tmpConfig.params, false);
+							this.tmpConfig.url = this.tmpConfig.url + "&" + query;
+						} else {
+							query = this.$u.queryParams(this.tmpConfig.params);
+							this.tmpConfig.url += query;
+						}
+					}
+					// 如果是跳转tab页面，就使用uni.switchTab
+					if (this.tmpConfig.isTab) {
+						uni.switchTab({
+							url: this.tmpConfig.url
+						});
+					} else {
+						uni.navigateTo({
+							url: this.tmpConfig.url
+						});
+					}
+				} else if(this.tmpConfig.back) {
+					// 回退到上一页
+					this.$u.route({
+						type: 'back'
+					})
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-toast {
+		position: fixed;
+		z-index: -1;
+		transition: opacity 0.3s;
+		text-align: center;
+		color: #fff;
+		border-radius: 8rpx;
+		background: #585858;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		opacity: 0;
+		pointer-events: none;
+		padding: 18rpx 40rpx;
+		width: 100%;
+		text-wrap: wrap;
+		
+	}
+
+	.u-toast.u-show {
+		opacity: 1;
+	}
+
+	.u-icon {
+		margin-right: 10rpx;
+		@include vue-flex;
+		align-items: center;
+		line-height: normal;
+	}
+
+	.u-position-center {
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%,-50%);
+		/* #ifndef APP-NVUE */
+		max-width: 70%;
+		/* #endif */
+	}
+
+	.u-position-top {
+		left: 50%;
+		top: 50rpx;
+		transform: translate(-50%,-50%);
+	}
+
+	.u-position-bottom {
+		left: 50%;
+		bottom: 20%;
+		transform: translate(-50%,-50%);
+	}
+
+	.u-type-primary {
+		color: $u-type-primary;
+		background-color: $u-type-primary-light;
+		border: 1px solid rgb(215, 234, 254);
+	}
+
+	.u-type-success {
+		color: $u-type-success;
+		background-color: $u-type-success-light;
+		border: 1px solid #BEF5C8;
+	}
+
+	.u-type-error {
+		color: $u-type-error;
+		background-color: $u-type-error-light;
+		border: 1px solid #fde2e2;
+	}
+
+	.u-type-warning {
+		color: $u-type-warning;
+		background-color: $u-type-warning-light;
+		border: 1px solid #faecd8;
+	}
+
+	.u-type-info {
+		color: $u-type-info;
+		background-color: $u-type-info-light;
+		border: 1px solid #ebeef5;
+	}
+
+	.u-type-default {
+		color: #fff;
+		background-color: #585858;
+	}
+</style>
diff --git a/uview-ui/components/u-top-tips/u-top-tips.vue b/uview-ui/components/u-top-tips/u-top-tips.vue
new file mode 100644
index 0000000..98d58df
--- /dev/null
+++ b/uview-ui/components/u-top-tips/u-top-tips.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="u-tips" :class="['u-' + type, isShow ? 'u-tip-show' : '']" :style="{
+		top: navbarHeight + 'px',
+		zIndex: uZIndex
+	}">{{ title }}</view>
+</template>
+
+<script>
+	/**
+	 * topTips 顶部提示
+	 * @description 该组件一般用于页面顶部向下滑出一个提示，尔后自动收起的场景。
+	 * @tutorial https://www.uviewui.com/components/topTips.html
+	 * @property {String Number} navbar-height 导航栏高度(包含状态栏高度在内)，单位PX
+	 * @property {String Number} z-index z-index值（默认975）
+	 * @example <u-top-tips ref="uTips"></u-top-tips>
+	 */
+	export default {
+		name: "u-top-tips",
+		props: {
+			// 导航栏高度，用于提示的初始化
+			navbarHeight: {
+				type: [Number, String],
+				// #ifndef H5
+				default: 0,
+				// #endif
+				// #ifdef H5
+				default: 44,
+				// #endif
+			},
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				timer: null, // 定时器
+				isShow: false, // 是否显示消息组件
+				title: '', // 组件中显示的消息内容
+				type: 'primary', // 消息的类型（颜色不同），primary，success，error，warning，info
+				duration: 2000, // 组件显示的时间，单位为毫秒
+			};
+		},
+		computed: {
+			uZIndex() {
+				return this.zIndex ? this.zIndex : this.$u.zIndex.topTips;
+			}
+		},
+		methods: {
+			show(config = {}) {
+				// 先清除定时器（可能是上一次定义的，需要清除了再开始新的）
+				clearTimeout(this.timer);
+				// 时间，内容，类型主题(type)等参数
+				if (config.duration) this.duration = config.duration;
+				if (config.type) this.type = config.type;
+				this.title = config.title;
+				this.isShow = true;
+				// 倒计时
+				this.timer = setTimeout(() => {
+					this.isShow = false;
+					clearTimeout(this.timer);
+					this.timer = null;
+				}, this.duration);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	view {
+		box-sizing: border-box;
+	}
+
+	// 顶部弹出类型样式
+	.u-tips {
+		width: 100%;
+		position: fixed;
+		z-index: 1;
+		padding: 20rpx 30rpx;
+		color: #FFFFFF;
+		font-size: 28rpx;
+		left: 0;
+		right: 0;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		opacity: 0;
+		// 此处为最核心点，translateY(-100%)意味着将其从Y轴隐藏（隐藏到顶部(h5)或者说导航栏(app)下面）
+		transform: translateY(-100%);
+		transition: all 0.35s linear;
+	}
+
+	.u-tip-show {
+		transform: translateY(0);
+		opacity: 1;
+		z-index: 99;
+	}
+
+	.u-primary {
+		background: $u-type-primary;
+	}
+
+	.u-success {
+		background: $u-type-success;
+	}
+
+	.u-warning {
+		background: $u-type-warning;
+	}
+
+	.u-error {
+		background: $u-type-error;
+	}
+
+	.u-info {
+		background: $u-type-info;
+	}
+</style>
diff --git a/uview-ui/components/u-tr/u-tr.vue b/uview-ui/components/u-tr/u-tr.vue
new file mode 100644
index 0000000..06aed4a
--- /dev/null
+++ b/uview-ui/components/u-tr/u-tr.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="u-tr">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tr 表格行标签
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配<u-table>使用）
+	 * @tutorial https://www.uviewui.com/components/table.html
+	 * @example <u-tr></u-tr>
+	 */
+	export default {
+		name: "u-tr",
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-tr {
+		@include vue-flex;
+	}
+</style>
diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue
new file mode 100644
index 0000000..c065ead
--- /dev/null
+++ b/uview-ui/components/u-upload/u-upload.vue
@@ -0,0 +1,654 @@
+<template>
+	<view class="u-upload" v-if="!disabled">
+		<view
+			v-if="showUploadList"
+			class="u-list-item u-preview-wrap"
+			v-for="(item, index) in lists"
+			:key="index"
+			:style="{
+				width: $u.addUnit(width),
+				height: $u.addUnit(height)
+			}"
+		>
+			<view
+				v-if="deletable"
+				class="u-delete-icon"
+				@tap.stop="deleteItem(index)"
+				:style="{
+					background: delBgColor
+				}"
+			>
+				<u-icon class="u-icon" :name="delIcon" size="20" :color="delColor"></u-icon>
+			</view>
+			<u-line-progress
+				v-if="showProgress && item.progress > 0 && !item.error"
+				:show-percent="false"
+				height="16"
+				class="u-progress"
+				:percent="item.progress"
+			></u-line-progress>
+			<view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view>
+			<image @tap.stop="doPreviewImage(item.url || item.path, index)" class="u-preview-image" v-if="!item.isImage" :src="item.url || item.path" :mode="imageMode"></image>
+		</view>
+		<slot name="file" :file="lists"></slot>
+		<view style="display: inline-block;" @tap="selectFile" v-if="maxCount > lists.length">
+			<slot name="addBtn"></slot>
+			<view
+				v-if="!customBtn"
+				class="u-list-item u-add-wrap"
+				hover-class="u-add-wrap__hover"
+				hover-stay-time="150"
+				:style="{
+					width: $u.addUnit(width),
+					height: $u.addUnit(height)
+				}"
+			>
+				<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
+				<view class="u-add-tips">{{ uploadText }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * upload 图片上传
+ * @description 该组件用于上传图片场景
+ * @tutorial https://www.uviewui.com/components/upload.html
+ * @property {String} action 服务器上传地址
+ * @property {String Number} max-count 最大选择图片的数量（默认99）
+ * @property {Boolean} custom-btn 如果需要自定义选择图片的按钮，设置为true（默认false）
+ * @property {Boolean} show-progress 是否显示进度条（默认true）
+ * @property {Boolean} disabled 是否启用(显示/移仓)组件（默认false）
+ * @property {String} image-mode 预览图片等显示模式，可选值为uni的image的mode属性值（默认aspectFill）
+ * @property {String} del-icon 右上角删除图标名称，只能为uView内置图标
+ * @property {String} del-bg-color 右上角关闭按钮的背景颜色
+ * @property {String | Number} index 在各个回调事件中的最后一个参数返回，用于区别是哪一个组件的事件
+ * @property {String} del-color 右上角关闭按钮图标的颜色
+ * @property {Object} header 上传携带的头信息，对象形式
+ * @property {Object} form-data 上传额外携带的参数
+ * @property {String} name 上传文件的字段名，供后端获取使用（默认file）
+ * @property {Array<String>} size-type original 原图，compressed 压缩图，默认二者都有（默认['original', 'compressed']）
+ * @property {Array<String>} source-type 选择图片的来源，album-从相册选图，camera-使用相机，默认二者都有（默认['album', 'camera']）
+ * @property {Boolean} preview-full-image	是否可以通过uni.previewImage预览已选择的图片（默认true）
+ * @property {Boolean} multiple	是否开启图片多选，部分安卓机型不支持（默认true）
+ * @property {Boolean} deletable 是否显示删除图片的按钮（默认true）
+ * @property {String Number} max-size 选择单个文件的最大大小，单位B(byte)，默认不限制（默认Number.MAX_VALUE）
+ * @property {Array<Object>} file-list 默认显示的图片列表，数组元素为对象，必须提供url属性
+ * @property {Boolean} upload-text 选择图片按钮的提示文字（默认“选择图片”）
+ * @property {Boolean} auto-upload 选择完图片是否自动上传，见上方说明（默认true）
+ * @property {Boolean} show-tips 特殊情况下是否自动提示toast，见上方说明（默认true）
+ * @property {Boolean} show-upload-list 是否显示组件内部的图片预览（默认true）
+ * @event {Function} on-oversize 图片大小超出最大允许大小
+ * @event {Function} on-preview 全屏预览图片时触发
+ * @event {Function} on-remove 移除图片时触发
+ * @event {Function} on-success 图片上传成功时触发
+ * @event {Function} on-change 图片上传后，无论成功或者失败都会触发
+ * @event {Function} on-error 图片上传失败时触发
+ * @event {Function} on-progress 图片上传过程中的进度变化过程触发
+ * @event {Function} on-uploaded 所有图片上传完毕触发
+ * @event {Function} on-choose-complete 每次选择图片后触发，只是让外部可以得知每次选择后，内部的文件列表
+ * @example <u-upload :action="action" :file-list="fileList" ></u-upload>
+ */
+export default {
+	name: 'u-upload',
+	props: {
+		//是否显示组件自带的图片预览功能
+		showUploadList: {
+			type: Boolean,
+			default: true
+		},
+		// 后端地址
+		action: {
+			type: String,
+			default: ''
+		},
+		// 最大上传数量
+		maxCount: {
+			type: [String, Number],
+			default: 52
+		},
+		//  是否显示进度条
+		showProgress: {
+			type: Boolean,
+			default: true
+		},
+		// 是否启用
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 预览上传的图片时的裁剪模式，和image组件mode属性一致
+		imageMode: {
+			type: String,
+			default: 'aspectFill'
+		},
+		// 头部信息
+		header: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 额外携带的参数
+		formData: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 上传的文件字段名
+		name: {
+			type: String,
+			default: 'file'
+		},
+		// 所选的图片的尺寸, 可选值为original compressed
+		sizeType: {
+			type: Array,
+			default() {
+				return ['original', 'compressed'];
+			}
+		},
+		sourceType: {
+			type: Array,
+			default() {
+				return ['album', 'camera'];
+			}
+		},
+		// 是否在点击预览图后展示全屏图片预览
+		previewFullImage: {
+			type: Boolean,
+			default: true
+		},
+		// 是否开启图片多选，部分安卓机型不支持
+		multiple: {
+			type: Boolean,
+			default: true
+		},
+		// 是否展示删除按钮
+		deletable: {
+			type: Boolean,
+			default: true
+		},
+		// 文件大小限制，单位为byte
+		maxSize: {
+			type: [String, Number],
+			default: Number.MAX_VALUE
+		},
+		// 显示已上传的文件列表
+		fileList: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 上传区域的提示文字
+		uploadText: {
+			type: String,
+			default: '选择图片'
+		},
+		// 是否自动上传
+		autoUpload: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示toast消息提示
+		showTips: {
+			type: Boolean,
+			default: true
+		},
+		// 是否通过slot自定义传入选择图标的按钮
+		customBtn: {
+			type: Boolean,
+			default: false
+		},
+		// 内部预览图片区域和选择图片按钮的区域宽度
+		width: {
+			type: [String, Number],
+			default: 200
+		},
+		// 内部预览图片区域和选择图片按钮的区域高度
+		height: {
+			type: [String, Number],
+			default: 200
+		},
+		// 右上角关闭按钮的背景颜色
+		delBgColor: {
+			type: String,
+			default: '#fa3534'
+		},
+		// 右上角关闭按钮的叉号图标的颜色
+		delColor: {
+			type: String,
+			default: '#ffffff'
+		},
+		// 右上角删除图标名称，只能为uView内置图标
+		delIcon: {
+			type: String,
+			default: 'close'
+		},
+		// 如果上传后的返回值为json字符串，是否自动转json
+		toJson: {
+			type: Boolean,
+			default: true
+		},
+		// 上传前的钩子，每个文件上传前都会执行
+		beforeUpload: {
+			type: Function,
+			default: null
+		},
+		// 移除文件前的钩子
+		beforeRemove: {
+			type: Function,
+			default: null
+		},
+		// 允许上传的图片后缀
+		limitType:{
+			type: Array,
+			default() {
+				// 支付宝小程序真机选择图片的后缀为"image"
+				// https://opendocs.alipay.com/mini/api/media-image
+				return ['png', 'jpg', 'jpeg', 'webp', 'gif', 'image'];
+			}
+		},
+		// 在各个回调事件中的最后一个参数返回，用于区别是哪一个组件的事件
+		index: {
+			type: [Number, String],
+			default: ''
+		}
+	},
+	mounted() {},
+	data() {
+		return {
+			lists: [],
+			isInCount: true,
+			uploading: false
+		};
+	},
+	watch: {
+		fileList: {
+			immediate: true,
+			handler(val) {
+				val.map(value => {
+					// 首先检查内部是否已经添加过这张图片，因为外部绑定了一个对象给fileList的话(对象引用)，进行修改外部fileList
+					// 时，会触发watch，导致重新把原来的图片再次添加到this.lists
+					// 数组的some方法意思是，只要数组元素有任意一个元素条件符合，就返回true，而另一个数组的every方法的意思是数组所有元素都符合条件才返回true
+					let tmp = this.lists.some(val => {
+						return val.url == value.url;
+					})
+					// 如果内部没有这个图片(tmp为false)，则添加到内部
+					!tmp && this.lists.push({ url: value.url, error: false, progress: 100 });
+				});
+			}
+		},
+		// 监听lists的变化，发出事件
+		lists(n) {
+			this.$emit('on-list-change', n, this.index);
+		}
+	},
+	methods: {
+		// 清除列表
+		clear() {
+			this.lists = [];
+		},
+		// 重新上传队列中上传失败的所有文件
+		reUpload() {
+			this.uploadFile();
+		},
+		// 选择图片
+		selectFile() {
+			if (this.disabled) return;
+			const { name = '', maxCount, multiple, maxSize, sizeType, lists, camera, compressed, maxDuration, 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: sourceType,
+					sizeType,
+					success: resolve,
+					fail: reject
+				});
+			});
+			chooseFile
+				.then(res => {
+					let file = null;
+					let listOldLength = this.lists.length;
+					res.tempFiles.map((val, index) => {
+						// 检查文件后缀是否允许，如果不在this.limitType内，就会返回false
+						if(!this.checkFileExt(val)) return ;
+						
+						// 如果是非多选，index大于等于1或者超出最大限制数量时，不处理
+						if (!multiple && index >= 1) return;
+						if (val.size > maxSize) {
+							this.$emit('on-oversize', val, this.lists, this.index);
+							this.showToast('超出允许的文件大小');
+						} else {
+							if (maxCount <= lists.length) {
+								this.$emit('on-exceed', val, this.lists, this.index);
+								this.showToast('超出最大允许的文件个数');
+								return;
+							}
+							lists.push({
+								url: val.path,
+								progress: 0,
+								error: false,
+								file: val
+							});
+						}
+					});
+					// 每次图片选择完，抛出一个事件，并将当前内部选择的图片数组抛出去
+					this.$emit('on-choose-complete', this.lists, this.index);
+					if (this.autoUpload) this.uploadFile(listOldLength);
+				})
+				.catch(error => {
+					this.$emit('on-choose-fail', error);
+				});
+		},
+		// 提示用户消息
+		showToast(message, force = false) {
+			if (this.showTips || force) {
+				uni.showToast({
+					title: message,
+					icon: 'none'
+				});
+			}
+		},
+		// 该方法供用户通过ref调用，手动上传
+		upload() {
+			this.uploadFile();
+		},
+		// 对失败的图片重新上传
+		retry(index) {
+			this.lists[index].progress = 0;
+			this.lists[index].error = false;
+			this.lists[index].response = null;
+			uni.showLoading({
+				title: '重新上传'
+			});
+			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.lists, this.index);
+				return;
+			}
+			// 检查是否是已上传或者正在上传中
+			if (this.lists[index].progress == 100) {
+				if (this.autoUpload == false) this.uploadFile(index + 1);
+				return;
+			}
+			// 执行before-upload钩子
+			if(this.beforeUpload && typeof(this.beforeUpload) === 'function') {
+				// 执行回调，同时传入索引和文件列表当作参数
+				// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+				// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+				// 因为upload组件可能会被嵌套在其他组件内，比如u-form，这时this.$parent其实为u-form的this，
+				// 非页面的this，所以这里需要往上历遍，一直寻找到最顶端的$parent，这里用了this.$u.$parent.call(this)
+				// 明白意思即可，无需纠结this.$u.$parent.call(this)的细节
+				let beforeResponse = this.beforeUpload.bind(this.$u.$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) {
+					// 如果返回false，继续下一张图片的上传
+					return this.uploadFile(index + 1);
+				} else {
+					// 此处为返回"true"的情形，这里不写代码，就跳过此处，继续执行当前的上传逻辑
+				}
+			}
+			// 检查上传地址
+			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.$u.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: e => {
+					this.uploadError(index, e);
+				},
+				complete: res => {
+					uni.hideLoading();
+					this.uploading = false;
+					this.uploadFile(index + 1);
+					this.$emit('on-change', res, index, this.lists, this.index);
+				}
+			});
+			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.$emit('on-error', err, index, this.lists, this.index);
+			this.showToast('上传失败，请重试');
+		},
+		// 删除一个图片
+		deleteItem(index) {
+			uni.showModal({
+				// title: '提示',
+				content: '您确定要删除此项吗？',
+				success: async (res) => {
+					if (res.confirm) {
+						// 先检查是否有定义before-remove移除前钩子
+						// 执行before-remove钩子
+						if(this.beforeRemove && typeof(this.beforeRemove) === 'function') {
+							// 此处钩子执行 原理同before-remove参数，见上方注释
+							let beforeResponse = this.beforeRemove.bind(this.$u.$parent.call(this))(index, this.lists);
+							// 判断是否返回了promise
+							if (!!beforeResponse && typeof beforeResponse.then === 'function') {
+								await beforeResponse.then(res => {
+									// promise返回成功，不进行动作，继续上传
+									this.handlerDeleteItem(index);
+								}).catch(err => {
+									// 如果进入promise的reject，终止删除操作
+									this.showToast('已终止移除');
+								})
+							} else if(beforeResponse === false) {
+								// 返回false，终止删除
+								this.showToast('已终止移除');
+							} else {
+								// 如果返回true，执行删除操作
+								this.handlerDeleteItem(index);
+							}
+						} else {
+							// 如果不存在before-remove钩子，
+							this.handlerDeleteItem(index);
+						}
+					}
+				}
+			});
+		},
+		// 执行移除图片的动作，上方代码只是判断是否可以移除
+		handlerDeleteItem(index) {
+			// 如果文件正在上传中，终止上传任务，进度在0 < progress < 100则意味着正在上传
+			if (this.lists[index].process < 100 && this.lists[index].process > 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 (index >= 0 && index < this.lists.length) {
+				this.lists.splice(index, 1);
+				this.$emit('on-list-change', this.lists, this.index);
+			}
+		},
+		// 预览图片
+		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: () => {
+					uni.showToast({
+						title: '预览图片失败',
+						icon: 'none'
+					});
+				}
+			});
+		},
+		// 判断文件后缀是否允许
+		checkFileExt(file) {
+			// 检查是否在允许的后缀中
+			let noArrowExt = false;
+			// 获取后缀名
+			let fileExt = '';
+			const reg = /.+\./;
+			// 如果是H5，需要从name中判断
+			// #ifdef H5
+			fileExt = file.name.replace(reg, "").toLowerCase();
+			// #endif
+			// 非H5，需要从path中读取后缀
+			// #ifndef H5
+			fileExt = file.path.replace(reg, "").toLowerCase();
+			// #endif
+			// 使用数组的some方法，只要符合limitType中的一个，就返回true
+			noArrowExt = this.limitType.some(ext => {
+				// 转为小写
+				return ext.toLowerCase() === fileExt;
+			})
+			if(!noArrowExt) this.showToast(`不允许选择${fileExt}格式的文件`);
+			return noArrowExt;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../libs/css/style.components.scss';
+
+.u-upload {
+	@include vue-flex;
+	flex-wrap: wrap;
+	align-items: center;
+}
+
+.u-list-item {
+	width: 200rpx;
+	height: 200rpx;
+	overflow: hidden;
+	margin: 10rpx;
+	background: rgb(244, 245, 246);
+	position: relative;
+	border-radius: 10rpx;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.u-preview-wrap {
+	border: 1px solid rgb(235, 236, 238);
+}
+
+.u-add-wrap {
+	flex-direction: column;
+	color: $u-content-color;
+	font-size: 26rpx;
+}
+
+.u-add-tips {
+	margin-top: 20rpx;
+	line-height: 40rpx;
+}
+
+.u-add-wrap__hover {
+	background-color: rgb(235, 236, 238);
+}
+
+.u-preview-image {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border-radius: 10rpx;
+}
+
+.u-delete-icon {
+	position: absolute;
+	top: 10rpx;
+	right: 10rpx;
+	z-index: 10;
+	background-color: $u-type-error;
+	border-radius: 100rpx;
+	width: 44rpx;
+	height: 44rpx;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-icon {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-progress {
+	position: absolute;
+	bottom: 10rpx;
+	left: 8rpx;
+	right: 8rpx;
+	z-index: 9;
+	width: auto;
+}
+
+.u-error-btn {
+	color: #ffffff;
+	background-color: $u-type-error;
+	font-size: 20rpx;
+	padding: 4px 0;
+	text-align: center;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 9;
+	line-height: 1;
+}
+</style>
diff --git a/uview-ui/components/u-uploadFile/u-uploadFile.vue b/uview-ui/components/u-uploadFile/u-uploadFile.vue
new file mode 100644
index 0000000..3e1b94b
--- /dev/null
+++ b/uview-ui/components/u-uploadFile/u-uploadFile.vue
@@ -0,0 +1,654 @@
+<template>
+	<view class="u-upload" v-if="!disabled">
+		<view
+			v-if="showUploadList"
+			class="u-list-item u-preview-wrap"
+			v-for="(item, index) in lists"
+			:key="index"
+			:style="{
+				width: $u.addUnit(width),
+				height: $u.addUnit(height)
+			}"
+		>
+			<view
+				v-if="deletable"
+				class="u-delete-icon"
+				@tap.stop="deleteItem(index)"
+				:style="{
+					background: delBgColor
+				}"
+			>
+				<u-icon class="u-icon" :name="delIcon" size="20" :color="delColor"></u-icon>
+			</view>
+			<u-line-progress
+				v-if="showProgress && item.progress > 0 && !item.error"
+				:show-percent="false"
+				height="16"
+				class="u-progress"
+				:percent="item.progress"
+			></u-line-progress>
+			<view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view>
+			<image @tap.stop="doPreviewImage(item.url || item.path, index)" class="u-preview-image" v-if="!item.isImage" :src="item.url || item.path" :mode="imageMode"></image>
+		</view>
+		<slot name="file" :file="lists"></slot>
+		<view style="display: inline-block;" @tap="selectFile" v-if="maxCount > lists.length">
+			<slot name="addBtn"></slot>
+			<view
+				v-if="!customBtn"
+				class="u-list-item u-add-wrap"
+				hover-class="u-add-wrap__hover"
+				hover-stay-time="150"
+				:style="{
+					width: $u.addUnit(width),
+					height: $u.addUnit(height)
+				}"
+			>
+				<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
+				<view class="u-add-tips">{{ uploadText }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * upload 图片上传
+ * @description 该组件用于上传图片场景
+ * @tutorial https://www.uviewui.com/components/upload.html
+ * @property {String} action 服务器上传地址
+ * @property {String Number} max-count 最大选择图片的数量（默认99）
+ * @property {Boolean} custom-btn 如果需要自定义选择图片的按钮，设置为true（默认false）
+ * @property {Boolean} show-progress 是否显示进度条（默认true）
+ * @property {Boolean} disabled 是否启用(显示/移仓)组件（默认false）
+ * @property {String} image-mode 预览图片等显示模式，可选值为uni的image的mode属性值（默认aspectFill）
+ * @property {String} del-icon 右上角删除图标名称，只能为uView内置图标
+ * @property {String} del-bg-color 右上角关闭按钮的背景颜色
+ * @property {String | Number} index 在各个回调事件中的最后一个参数返回，用于区别是哪一个组件的事件
+ * @property {String} del-color 右上角关闭按钮图标的颜色
+ * @property {Object} header 上传携带的头信息，对象形式
+ * @property {Object} form-data 上传额外携带的参数
+ * @property {String} name 上传文件的字段名，供后端获取使用（默认file）
+ * @property {Array<String>} size-type original 原图，compressed 压缩图，默认二者都有（默认['original', 'compressed']）
+ * @property {Array<String>} source-type 选择图片的来源，album-从相册选图，camera-使用相机，默认二者都有（默认['album', 'camera']）
+ * @property {Boolean} preview-full-image	是否可以通过uni.previewImage预览已选择的图片（默认true）
+ * @property {Boolean} multiple	是否开启图片多选，部分安卓机型不支持（默认true）
+ * @property {Boolean} deletable 是否显示删除图片的按钮（默认true）
+ * @property {String Number} max-size 选择单个文件的最大大小，单位B(byte)，默认不限制（默认Number.MAX_VALUE）
+ * @property {Array<Object>} file-list 默认显示的图片列表，数组元素为对象，必须提供url属性
+ * @property {Boolean} upload-text 选择图片按钮的提示文字（默认“选择图片”）
+ * @property {Boolean} auto-upload 选择完图片是否自动上传，见上方说明（默认true）
+ * @property {Boolean} show-tips 特殊情况下是否自动提示toast，见上方说明（默认true）
+ * @property {Boolean} show-upload-list 是否显示组件内部的图片预览（默认true）
+ * @event {Function} on-oversize 图片大小超出最大允许大小
+ * @event {Function} on-preview 全屏预览图片时触发
+ * @event {Function} on-remove 移除图片时触发
+ * @event {Function} on-success 图片上传成功时触发
+ * @event {Function} on-change 图片上传后，无论成功或者失败都会触发
+ * @event {Function} on-error 图片上传失败时触发
+ * @event {Function} on-progress 图片上传过程中的进度变化过程触发
+ * @event {Function} on-uploaded 所有图片上传完毕触发
+ * @event {Function} on-choose-complete 每次选择图片后触发，只是让外部可以得知每次选择后，内部的文件列表
+ * @example <u-upload :action="action" :file-list="fileList" ></u-upload>
+ */
+export default {
+	name: 'u-upload',
+	props: {
+		//是否显示组件自带的图片预览功能
+		showUploadList: {
+			type: Boolean,
+			default: true
+		},
+		// 后端地址
+		action: {
+			type: String,
+			default: ''
+		},
+		// 最大上传数量
+		maxCount: {
+			type: [String, Number],
+			default: 52
+		},
+		//  是否显示进度条
+		showProgress: {
+			type: Boolean,
+			default: true
+		},
+		// 是否启用
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 预览上传的图片时的裁剪模式，和image组件mode属性一致
+		imageMode: {
+			type: String,
+			default: 'aspectFill'
+		},
+		// 头部信息
+		header: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 额外携带的参数
+		formData: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 上传的文件字段名
+		name: {
+			type: String,
+			default: 'file'
+		},
+		// 所选的图片的尺寸, 可选值为original compressed
+		sizeType: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		sourceType: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 是否在点击预览图后展示全屏图片预览
+		previewFullImage: {
+			type: Boolean,
+			default: true
+		},
+		// 是否开启图片多选，部分安卓机型不支持
+		multiple: {
+			type: Boolean,
+			default: true
+		},
+		// 是否展示删除按钮
+		deletable: {
+			type: Boolean,
+			default: true
+		},
+		// 文件大小限制，单位为byte
+		maxSize: {
+			type: [String, Number],
+			default: Number.MAX_VALUE
+		},
+		// 显示已上传的文件列表
+		fileList: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 上传区域的提示文字
+		uploadText: {
+			type: String,
+			default: '选择图片'
+		},
+		// 是否自动上传
+		autoUpload: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示toast消息提示
+		showTips: {
+			type: Boolean,
+			default: true
+		},
+		// 是否通过slot自定义传入选择图标的按钮
+		customBtn: {
+			type: Boolean,
+			default: false
+		},
+		// 内部预览图片区域和选择图片按钮的区域宽度
+		width: {
+			type: [String, Number],
+			default: 200
+		},
+		// 内部预览图片区域和选择图片按钮的区域高度
+		height: {
+			type: [String, Number],
+			default: 200
+		},
+		// 右上角关闭按钮的背景颜色
+		delBgColor: {
+			type: String,
+			default: '#fa3534'
+		},
+		// 右上角关闭按钮的叉号图标的颜色
+		delColor: {
+			type: String,
+			default: '#ffffff'
+		},
+		// 右上角删除图标名称，只能为uView内置图标
+		delIcon: {
+			type: String,
+			default: 'close'
+		},
+		// 如果上传后的返回值为json字符串，是否自动转json
+		toJson: {
+			type: Boolean,
+			default: true
+		},
+		// 上传前的钩子，每个文件上传前都会执行
+		beforeUpload: {
+			type: Function,
+			default: null
+		},
+		// 移除文件前的钩子
+		beforeRemove: {
+			type: Function,
+			default: null
+		},
+		// 允许上传的图片后缀
+		limitType:{
+			type: Array,
+			default() {
+				// 支付宝小程序真机选择图片的后缀为"image"
+				// https://opendocs.alipay.com/mini/api/media-image
+				return ['png', 'jpg', 'jpeg', 'webp', 'gif', 'image'];
+			}
+		},
+		// 在各个回调事件中的最后一个参数返回，用于区别是哪一个组件的事件
+		index: {
+			type: [Number, String],
+			default: ''
+		}
+	},
+	mounted() {},
+	data() {
+		return {
+			lists: [],
+			isInCount: true,
+			uploading: false
+		};
+	},
+	watch: {
+		fileList: {
+			immediate: true,
+			handler(val) {
+				val.map(value => {
+					// 首先检查内部是否已经添加过这张图片，因为外部绑定了一个对象给fileList的话(对象引用)，进行修改外部fileList
+					// 时，会触发watch，导致重新把原来的图片再次添加到this.lists
+					// 数组的some方法意思是，只要数组元素有任意一个元素条件符合，就返回true，而另一个数组的every方法的意思是数组所有元素都符合条件才返回true
+					let tmp = this.lists.some(val => {
+						return val.url == value.url;
+					})
+					// 如果内部没有这个图片(tmp为false)，则添加到内部
+					!tmp && this.lists.push({ url: value.url, error: false, progress: 100 });
+				});
+			}
+		},
+		// 监听lists的变化，发出事件
+		lists(n) {
+			this.$emit('on-list-change', n, this.index);
+		}
+	},
+	methods: {
+		// 清除列表
+		clear() {
+			this.lists = [];
+		},
+		// 重新上传队列中上传失败的所有文件
+		reUpload() {
+			this.uploadFile();
+		},
+		// 选择图片
+		selectFile() {
+			if (this.disabled) return;
+			const { name = '', maxCount, multiple, maxSize, sizeType, lists, camera, compressed, maxDuration, sourceType } = this;
+			let chooseFile = null;
+			const newMaxCount = maxCount - lists.length;
+			// 设置为只选择图片的时候使用 chooseImage 来实现
+			chooseFile = new Promise((resolve, reject) => {
+				uni.chooseFile({
+					count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
+					sourceType: sourceType,
+					sizeType,
+					success: resolve,
+					fail: reject
+				});
+			});
+			chooseFile
+				.then(res => {
+					let file = null;
+					let listOldLength = this.lists.length;
+					res.tempFiles.map((val, index) => {
+						// 检查文件后缀是否允许，如果不在this.limitType内，就会返回false
+						if(!this.checkFileExt(val)) return ;
+						
+						// 如果是非多选，index大于等于1或者超出最大限制数量时，不处理
+						if (!multiple && index >= 1) return;
+						if (val.size > maxSize) {
+							this.$emit('on-oversize', val, this.lists, this.index);
+							this.showToast('超出允许的文件大小');
+						} else {
+							if (maxCount <= lists.length) {
+								this.$emit('on-exceed', val, this.lists, this.index);
+								this.showToast('超出最大允许的文件个数');
+								return;
+							}
+							lists.push({
+								url: val.path,
+								progress: 0,
+								error: false,
+								file: val
+							});
+						}
+					});
+					// 每次图片选择完，抛出一个事件，并将当前内部选择的图片数组抛出去
+					this.$emit('on-choose-complete', this.lists, this.index);
+					if (this.autoUpload) this.uploadFile(listOldLength);
+				})
+				.catch(error => {
+					this.$emit('on-choose-fail', error);
+				});
+		},
+		// 提示用户消息
+		showToast(message, force = false) {
+			if (this.showTips || force) {
+				uni.showToast({
+					title: message,
+					icon: 'none'
+				});
+			}
+		},
+		// 该方法供用户通过ref调用，手动上传
+		upload() {
+			this.uploadFile();
+		},
+		// 对失败的图片重新上传
+		retry(index) {
+			this.lists[index].progress = 0;
+			this.lists[index].error = false;
+			this.lists[index].response = null;
+			uni.showLoading({
+				title: '重新上传'
+			});
+			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.lists, this.index);
+				return;
+			}
+			// 检查是否是已上传或者正在上传中
+			if (this.lists[index].progress == 100) {
+				if (this.autoUpload == false) this.uploadFile(index + 1);
+				return;
+			}
+			// 执行before-upload钩子
+			if(this.beforeUpload && typeof(this.beforeUpload) === 'function') {
+				// 执行回调，同时传入索引和文件列表当作参数
+				// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+				// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+				// 因为upload组件可能会被嵌套在其他组件内，比如u-form，这时this.$parent其实为u-form的this，
+				// 非页面的this，所以这里需要往上历遍，一直寻找到最顶端的$parent，这里用了this.$u.$parent.call(this)
+				// 明白意思即可，无需纠结this.$u.$parent.call(this)的细节
+				let beforeResponse = this.beforeUpload.bind(this.$u.$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) {
+					// 如果返回false，继续下一张图片的上传
+					return this.uploadFile(index + 1);
+				} else {
+					// 此处为返回"true"的情形，这里不写代码，就跳过此处，继续执行当前的上传逻辑
+				}
+			}
+			// 检查上传地址
+			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.$u.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: e => {
+					this.uploadError(index, e);
+				},
+				complete: res => {
+					uni.hideLoading();
+					this.uploading = false;
+					this.uploadFile(index + 1);
+					this.$emit('on-change', res, index, this.lists, this.index);
+				}
+			});
+			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.$emit('on-error', err, index, this.lists, this.index);
+			this.showToast('上传失败，请重试');
+		},
+		// 删除一个图片
+		deleteItem(index) {
+			uni.showModal({
+				// title: '提示',
+				content: '您确定要删除此项吗？',
+				success: async (res) => {
+					if (res.confirm) {
+						// 先检查是否有定义before-remove移除前钩子
+						// 执行before-remove钩子
+						if(this.beforeRemove && typeof(this.beforeRemove) === 'function') {
+							// 此处钩子执行 原理同before-remove参数，见上方注释
+							let beforeResponse = this.beforeRemove.bind(this.$u.$parent.call(this))(index, this.lists);
+							// 判断是否返回了promise
+							if (!!beforeResponse && typeof beforeResponse.then === 'function') {
+								await beforeResponse.then(res => {
+									// promise返回成功，不进行动作，继续上传
+									this.handlerDeleteItem(index);
+								}).catch(err => {
+									// 如果进入promise的reject，终止删除操作
+									this.showToast('已终止移除');
+								})
+							} else if(beforeResponse === false) {
+								// 返回false，终止删除
+								this.showToast('已终止移除');
+							} else {
+								// 如果返回true，执行删除操作
+								this.handlerDeleteItem(index);
+							}
+						} else {
+							// 如果不存在before-remove钩子，
+							this.handlerDeleteItem(index);
+						}
+					}
+				}
+			});
+		},
+		// 执行移除图片的动作，上方代码只是判断是否可以移除
+		handlerDeleteItem(index) {
+			// 如果文件正在上传中，终止上传任务，进度在0 < progress < 100则意味着正在上传
+			if (this.lists[index].process < 100 && this.lists[index].process > 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 (index >= 0 && index < this.lists.length) {
+				this.lists.splice(index, 1);
+				this.$emit('on-list-change', this.lists, this.index);
+			}
+		},
+		// 预览图片
+		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: () => {
+					uni.showToast({
+						title: '预览图片失败',
+						icon: 'none'
+					});
+				}
+			});
+		},
+		// 判断文件后缀是否允许
+		checkFileExt(file) {
+			// 检查是否在允许的后缀中
+			let noArrowExt = false;
+			// 获取后缀名
+			let fileExt = '';
+			const reg = /.+\./;
+			// 如果是H5，需要从name中判断
+			// #ifdef H5
+			fileExt = file.name.replace(reg, "").toLowerCase();
+			// #endif
+			// 非H5，需要从path中读取后缀
+			// #ifndef H5
+			fileExt = file.path.replace(reg, "").toLowerCase();
+			// #endif
+			// 使用数组的some方法，只要符合limitType中的一个，就返回true
+			noArrowExt = this.limitType.some(ext => {
+				// 转为小写
+				return ext.toLowerCase() === fileExt;
+			})
+			if(!noArrowExt) this.showToast(`不允许选择${fileExt}格式的文件`);
+			return noArrowExt;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../libs/css/style.components.scss';
+
+.u-upload {
+	@include vue-flex;
+	flex-wrap: wrap;
+	align-items: center;
+}
+
+.u-list-item {
+	width: 200rpx;
+	height: 200rpx;
+	overflow: hidden;
+	margin: 10rpx;
+	background: rgb(244, 245, 246);
+	position: relative;
+	border-radius: 10rpx;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	justify-content: center;
+}
+
+.u-preview-wrap {
+	border: 1px solid rgb(235, 236, 238);
+}
+
+.u-add-wrap {
+	flex-direction: column;
+	color: $u-content-color;
+	font-size: 26rpx;
+}
+
+.u-add-tips {
+	margin-top: 20rpx;
+	line-height: 40rpx;
+}
+
+.u-add-wrap__hover {
+	background-color: rgb(235, 236, 238);
+}
+
+.u-preview-image {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border-radius: 10rpx;
+}
+
+.u-delete-icon {
+	position: absolute;
+	top: 10rpx;
+	right: 10rpx;
+	z-index: 10;
+	background-color: $u-type-error;
+	border-radius: 100rpx;
+	width: 44rpx;
+	height: 44rpx;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-icon {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-progress {
+	position: absolute;
+	bottom: 10rpx;
+	left: 8rpx;
+	right: 8rpx;
+	z-index: 9;
+	width: auto;
+}
+
+.u-error-btn {
+	color: #ffffff;
+	background-color: $u-type-error;
+	font-size: 20rpx;
+	padding: 4px 0;
+	text-align: center;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 9;
+	line-height: 1;
+}
+</style>
diff --git a/uview-ui/components/u-verification-code/u-verification-code.vue b/uview-ui/components/u-verification-code/u-verification-code.vue
new file mode 100644
index 0000000..b3079f4
--- /dev/null
+++ b/uview-ui/components/u-verification-code/u-verification-code.vue
@@ -0,0 +1,164 @@
+<template>
+	<view class="u-code-wrap">
+		<!-- 此组件功能由js完成，无需写html逻辑 -->
+	</view>
+</template>
+
+<script>
+	/**
+	 * verificationCode 验证码输入框
+	 * @description 考虑到用户实际发送验证码的场景，可能是一个按钮，也可能是一段文字，提示语各有不同，所以本组件 不提供界面显示，只提供提示语，由用户将提示语嵌入到具体的场景
+	 * @tutorial https://www.uviewui.com/components/verificationCode.html
+	 * @property {Number String} seconds 倒计时所需的秒数（默认60）
+	 * @property {String} start-text 开始前的提示语，见官网说明（默认获取验证码）
+	 * @property {String} change-text 倒计时期间的提示语，必须带有字母"x"，见官网说明（默认X秒重新获取）
+	 * @property {String} end-text 倒计结束的提示语，见官网说明（默认重新获取）
+	 * @property {Boolean} keep-running 是否在H5刷新或各端返回再进入时继续倒计时（默认false）
+	 * @event {Function} change 倒计时期间，每秒触发一次
+	 * @event {Function} start 开始倒计时触发
+	 * @event {Function} end 结束倒计时触发
+	 * @example <u-verification-code :seconds="seconds" @end="end" @start="start" ref="uCode" 
+	 */
+	export default {
+		name: "u-verification-code",
+		props: {
+			// 倒计时总秒数
+			seconds: {
+				type: [String, Number],
+				default: 60
+			},
+			// 尚未开始时提示
+			startText: {
+				type: String,
+				default: '获取验证码'
+			},
+			// 正在倒计时中的提示
+			changeText: {
+				type: String,
+				default: 'X秒重新获取'
+			},
+			// 倒计时结束时的提示
+			endText: {
+				type: String,
+				default: '重新获取'
+			},
+			// 是否在H5刷新或各端返回再进入时继续倒计时
+			keepRunning: {
+				type: Boolean,
+				default: false
+			},
+			// 为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
+			uniqueKey: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				secNum: this.seconds,
+				timer: null,
+				canGetCode: true, // 是否可以执行验证码操作
+			}
+		},
+		mounted() {
+			this.checkKeepRunning();
+		},
+		watch: {
+			seconds: {
+				immediate: true,
+				handler(n) {
+					this.secNum = n;
+				}
+			}
+		},
+		methods: {
+			checkKeepRunning() {
+				// 获取上一次退出页面(H5还包括刷新)时的时间戳，如果没有上次的保存，此值可能为空
+				let lastTimestamp = Number(uni.getStorageSync(this.uniqueKey + '_$uCountDownTimestamp'));
+				if(!lastTimestamp) return this.changeEvent(this.startText);
+				// 当前秒的时间戳
+				let nowTimestamp = Math.floor((+ new Date()) / 1000);
+				// 判断当前的时间戳，是否小于上一次的本该按设定结束，却提前结束的时间戳
+				if(this.keepRunning && lastTimestamp && lastTimestamp > nowTimestamp) {
+					// 剩余尚未执行完的倒计秒数
+					this.secNum = lastTimestamp - nowTimestamp;
+					// 清除本地保存的变量
+					uni.removeStorageSync(this.uniqueKey + '_$uCountDownTimestamp');
+					// 开始倒计时
+					this.start();
+				} else {
+					// 如果不存在需要继续上一次的倒计时，执行正常的逻辑
+					this.changeEvent(this.startText);
+				}
+			},
+			// 开始倒计时
+			start() {
+				// 防止快速点击获取验证码的按钮而导致内部产生多个定时器导致混乱
+				if(this.timer) {
+					clearInterval(this.timer);
+					this.timer = null;
+				}
+				this.$emit('start');
+				this.canGetCode = false;
+				// 这里放这句，是为了一开始时就提示，否则要等setInterval的1秒后才会有提示
+				this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+				this.setTimeToStorage();
+				this.timer = setInterval(() => {
+					if (--this.secNum) {
+						// 用当前倒计时的秒数替换提示字符串中的"x"字母
+						this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+					} else {
+						clearInterval(this.timer);
+						this.timer = null;
+						this.changeEvent(this.endText);
+						this.secNum = this.seconds;
+						this.$emit('end');
+						this.canGetCode = true;
+					}
+				}, 1000);
+			},
+			// 重置，可以让用户再次获取验证码
+			reset() {
+				this.canGetCode = true;
+				clearInterval(this.timer);
+				this.secNum = this.seconds;
+				this.changeEvent(this.endText);
+			},
+			changeEvent(text) {
+				this.$emit('change', text);
+			},
+			// 保存时间戳，为了防止倒计时尚未结束，H5刷新或者各端的右上角返回上一页再进来
+			setTimeToStorage() {
+				if(!this.keepRunning || !this.timer) return;
+				// 记录当前的时间戳，为了下次进入页面，如果还在倒计时内的话，继续倒计时
+				// 倒计时尚未结束，结果大于0；倒计时已经开始，就会小于初始值，如果等于初始值，说明没有开始倒计时，无需处理
+				if(this.secNum > 0 && this.secNum <= this.seconds) {
+					// 获取当前时间戳(+ new Date()为特殊写法)，除以1000变成秒，再去除小数部分
+					let nowTimestamp = Math.floor((+ new Date()) / 1000);
+					// 将本该结束时候的时间戳保存起来 => 当前时间戳 + 剩余的秒数
+					uni.setStorage({
+						key: this.uniqueKey + '_$uCountDownTimestamp',
+						data: nowTimestamp + Number(this.secNum)
+					})
+				}
+			}
+		},
+		// 组件销毁的时候，清除定时器，否则定时器会继续存在，系统不会自动清除
+		beforeDestroy() {
+			this.setTimeToStorage();
+			clearTimeout(this.timer);
+			this.timer = null;
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-code-wrap {
+		width: 0;
+		height: 0;
+		position: fixed;
+		z-index: -1;
+	}
+</style>
diff --git a/uview-ui/components/u-waterfall/u-waterfall.vue b/uview-ui/components/u-waterfall/u-waterfall.vue
new file mode 100644
index 0000000..31964b7
--- /dev/null
+++ b/uview-ui/components/u-waterfall/u-waterfall.vue
@@ -0,0 +1,176 @@
+<template>
+	<view class="u-waterfall">
+		<view id="u-left-column" class="u-column"><slot name="left" :leftList="leftList"></slot></view>
+		<view id="u-right-column" class="u-column"><slot name="right" :rightList="rightList"></slot></view>
+	</view>
+</template>
+
+<script>
+/**
+ * waterfall 瀑布流
+ * @description 这是一个瀑布流形式的组件，内容分为左右两列，结合uView的懒加载组件效果更佳。相较于某些只是奇偶数左右分别，或者没有利用vue作用域插槽的做法，uView的瀑布流实现了真正的 组件化，搭配LazyLoad 懒加载和loadMore 加载更多组件，让您开箱即用，眼前一亮。
+ * @tutorial https://www.uviewui.com/components/waterfall.html
+ * @property {Array} flow-list 用于渲染的数据
+ * @property {String Number} add-time 单条数据添加到队列的时间间隔，单位ms，见上方注意事项说明（默认200）
+ * @example <u-waterfall :flowList="flowList"></u-waterfall>
+ */
+export default {
+	name: "u-waterfall",
+	props: {
+		value: {
+			// 瀑布流数据
+			type: Array,
+			required: true,
+			default: function() {
+				return [];
+			}
+		},
+		// 每次向结构插入数据的时间间隔，间隔越长，越能保证两列高度相近，但是对用户体验越不好
+		// 单位ms
+		addTime: {
+			type: [Number, String],
+			default: 200
+		},
+		// id值，用于清除某一条数据时，根据此idKey名称找到并移除，如数据为{idx: 22, name: 'lisa'}
+		// 那么该把idKey设置为idx
+		idKey: {
+			type: String,
+			default: 'id'
+		}
+	},
+	data() {
+		return {
+			leftList: [],
+			rightList: [],
+			tempList: [],
+			children: []
+		}
+	},
+	watch: {
+		copyFlowList(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();
+		}
+	},
+	mounted() {
+		this.tempList = this.cloneData(this.copyFlowList);
+		this.splitData();
+	},
+	computed: {
+		// 破坏flowList变量的引用，否则watch的结果新旧值是一样的
+		copyFlowList() {
+			return this.cloneData(this.value);
+		}
+	},
+	methods: {
+		async splitData() {
+			if (!this.tempList.length) return;
+			let leftRect = await this.$uGetRect('#u-left-column');
+			let rightRect = await this.$uGetRect('#u-right-column');
+			// 如果左边小于或等于右边，就添加到左边，否则添加到右边
+			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 {
+				// 这里是为了保证第一和第二张添加时，左右都能有内容
+				// 因为添加第一张，实际队列的高度可能还是0，这时需要根据队列元素长度判断下一个该放哪边
+				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)
+			}
+		},
+		// 复制而不是引用对象和数组
+		cloneData(data) {
+			return JSON.parse(JSON.stringify(data));
+		},
+		// 清空数据列表
+		clear() {
+			this.leftList = [];
+			this.rightList = [];
+			// 同时清除父组件列表中的数据
+			this.$emit('input', []);
+			this.tempList = [];
+		},
+		// 清除某一条指定的数据，根据id实现
+		remove(id) {
+			// 如果findIndex找不到合适的条件，就会返回-1
+			let index = -1;
+			index = this.leftList.findIndex(val => val[this.idKey] == id);
+			if(index != -1) {
+				// 如果index不等于-1，说明已经找到了要找的id，根据index索引删除这一条数据
+				this.leftList.splice(index, 1);
+			} else {
+				// 同理于上方面的方法
+				index = this.rightList.findIndex(val => val[this.idKey] == id);
+				if(index != -1) this.rightList.splice(index, 1);
+			}
+			// 同时清除父组件的数据中的对应id的条目
+			index = this.value.findIndex(val => val[this.idKey] == id);
+			if(index != -1) this.$emit('input', this.value.splice(index, 1));
+		},
+		// 修改某条数据的某个属性
+		modify(id, key, value) {
+			// 如果findIndex找不到合适的条件，就会返回-1
+			let index = -1;
+			index = this.leftList.findIndex(val => val[this.idKey] == id);
+			if(index != -1) {
+				// 如果index不等于-1，说明已经找到了要找的id，修改对应key的值
+				this.leftList[index][key] = value;
+			} else {
+				// 同理于上方面的方法
+				index = this.rightList.findIndex(val => val[this.idKey] == id);
+				if(index != -1) this.rightList[index][key] = value;
+			}
+			// 修改父组件的数据中的对应id的条目
+			index = this.value.findIndex(val => val[this.idKey] == id);
+			if(index != -1) {
+				// 首先复制一份value的数据
+				let data = this.cloneData(this.value);
+				// 修改对应索引的key属性的值为value
+				data[index][key] = value;
+				// 修改父组件通过v-model绑定的变量的值
+				this.$emit('input', data);
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-waterfall {
+	@include vue-flex;
+	flex-direction: row;
+	align-items: flex-start;
+}
+
+.u-column {
+	@include vue-flex;
+	flex: 1;
+	flex-direction: column;
+	height: auto;
+}
+
+.u-image {
+	width: 100%;
+}
+</style>
diff --git a/uview-ui/components/uview-v1/uview-v1.vue b/uview-ui/components/uview-v1/uview-v1.vue
new file mode 100644
index 0000000..e69de29
diff --git a/uview-ui/iconfont.css b/uview-ui/iconfont.css
new file mode 100644
index 0000000..836c718
--- /dev/null
+++ b/uview-ui/iconfont.css
@@ -0,0 +1,910 @@
+/* #ifdef APP-PLUS */
+@font-face {
+	font-family: "uicon-iconfont";
+	font-weight: normal;
+	font-style: normal;
+	font-display: auto;
+	src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAGQYAAsAAAAAw2gAAGPEAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCdAAqCv3SB/XABNgIkA4ZoC4M2AAQgBYRtB5cNG+OfdYacxwEA9eYzEqHbAaXC+ZFZWS8oKTr7/09LKmNsu7DdEEVL04JkStgZyOKZ/ILQ2JzQooY+O2mlDm88cwprtIUJRYoVp8q1MEe1Ow/WIUjUNfnNH9HJV5m92kW8dnj/3pEhB8aSgR+4kj24yOevPzf/ix2t5Ij79FHJAsd5EFJ2EoByUZPNHtWZ1VUw8TCKNsPzc+v9/WVQI8dGjhpsRMkSRg/YRimMGiDhCBkIyggFLMAzAAsVA/BOjAJUrBMVFTk9PQUPK0D0ro1REM/4bck0GjGLMBKwOzEqMDrm/+DNvwEAhTsoAAkoYGpB7e4LMInq4Z7d2/lSHmrkiVCowgFOGC/4BjLdjqZBMK9fkWmEJpgKgx8EK9nAPEPOk30pNCLq0BlSKNLexDrvFnL/EBcKlB/2YPqlzm92rMBKbxWxIXacD0TdMTTllTdfbtWnkEtVgBUaVkW6e6oqLSvgq84luVauJUGaMQg240CPmETe+8e/tZabTzHZvWtZycoqHH//BQBFFJvYg6cSCAPK0P/lViVvbmTWIzDi0N0rLjdoVkyOXJIrXJMg1hJIpYJpuwL9q2rensSOdFq7rfav29kR3LEgWD1R08h27tjxMauRWqk1yAqQxIEnxwk/k9Xvp4mNJ5uJLShAeP9ebatUY0naCgW0UITh59azOqqoboMT35k+wU5MV6BC/qWqJ5UnA9vtHQlfnOYXH0EGqAuWT9o/uCI/R6qH5JFb21r+/3mKC2j3fzlyPaQSlCkmTghdBueFPOIgIuD/pjV7uSVUtRJH3r1Qi793yiERbvfPn1kmfye50j+ht+xRakKdXWpRyFaEW2p3vgqDx5kmUV5C/ceN8zDBBaE/Jw+cu0rV+oKmNmRq88X0i/W3q7b+l373+kzPkBYGICUCkGiCVIIo+wTKgQBlF0E6BXIjpfPl9IoRIB0I0nsFUA6kfAHcKG6W9/JrN1/Mz5Ce9/jc+327ryVoKss14vz/aVtEFGJxKA6zw9isAcvQsULlmCICMkSMr7y8H5v/3H7HKsRIsIE7JNR0v68Ola+NidPXgYK7d4y5/kTrx1YiH3ACHY721PpPEwB52aopNP+2724kpHhSAITxv1FDjHzpgDzZMsCCoCevzA4ZdNuGwWaub2JsOr5/+GfTAhbIQEXxzM4jWww363cwcBfD37CDtobhdX241wMioCayVW4+bY0NiYeueRB+9rkNjZPR3SzDmPy+DZuAipEDJ95srvX1+/VHZ73km/Ct/p2utNSVpqu82hqCBAuZNq+8ATmVfJVWWHeYbwS/04tPTM/uwnx5/WrZyVW5K5oTo3NVqPm14m2BMjTemmu9rddzuzLfe3tb7nMPuIeaD4waumN34v8dT1ljigt5jIEn4Cl4Bp6D5ra9AG3NcPfedF1NNsxLUJuXzqNjHXsFxnkN7h/femLnVG/A/n11YXjrmqOdt2C8CXIrtGdHJTfBu2Cm98D7IK87oI0PwYGTB7d/BKbooLKD+cRp72PwCfgUPJjtMzDN5ocTVRGvs6Za+Bx8Ab4ErbS26yswyKFJmhmlgAJ7RxhpsHpyne6mux7O9NRLF7310VdL/fQ3QBlk9lgsrTBPIVaoHNDQMdRZoDhTZtCYLJhDgOkttEgOhiVZjcuWr1i5qiSi1jWlrF23fsPGoarqPdJQmPaAzQefgK8sZ8+dH+jCxUuXr1y9dv3GzVu37zTWRAX+AgQKEixEKFdcbtx5AINyGjgWYHT9vvZfIDCqgylAED4WAqOAYHwChMSnQCh8BoTG50AYfAGExVaEw53C40sgAnYgIs4mEt4TGe+LgrOIij2IhtOIjiOJga+ATLA2kCnWATLD7TLH47LACcTEE7LE10BWOJGs8Q2QDT6QLZ6UHe4QC0/JHveIjTOIg2+BHPCgHPGAnLAukDNGALlgPSBX3Ccuzic37Eju+A7IAyeRJ04mL4wE4uF48sZc+eBu8bESkADfA/niByA/nEP++BEoAD8BBWI0UBB+BgrG9hSCX4BC8ZAW4WmF4WEJcZdE+BVIjNNJgp1JipWBZHhG4RgDFIFdSI6dKBK/AUXhd6Bo/AEUgw8Vi/MoDn8CxeNMUuA2JeAjJeIUSsIqQErsSirsRmrMoWRsTSn4CygVfwOl4R+gdGxLi7EdLcG9ysC/QJmPNw0eURZOpWxsSTk4lnIxDigPx5EW9yv/nFXgqND5XUthfaAiHEXFeFYl2JNKsRctw96kw3Mqwz5Ujn2pArtTJfaj5difqnAA6bENVeNAqsFBtAIHUy2WBarDeKCVWA5oFaYC1WNJIAMuoAZcSI2YANSEpYCaMRFoNVYEWoNJQC2YDNSKhYDacBGtxcW0DgsDrcciQBuwKNBGDAdqxxJAHVgcqBOLAW3CYKAfMARoM86lLbiEtuJS2oZhQD24TNtxuXZgKFAvrtAeXKk+XKX9uFoHcI0O4lodwtJA/RgLNIDrNIjrNYRlgI7iBh3DjTqDm3QWN2sYt2gUR9AvWBXoBR7VOzxmPozNgflIbAHMx82tPbwZJFOzvJzMNDmb6fIyM8Q3M5VgDlereV4PzAv63byo53AICxLwkgUqvGyBel5RqXlVOvOays3rWmHeUK15Uw3mLa0289Ri3labeUdrzbv6yczSFTNb/8MKwIAcGwADKmwIDOTORsozG0trNlG+2VQVZjNVmtVUY1bXCrOG1pk1tcEfawH4D2DQdYP/N20SmD0zvuG/kuhhSdB/fz0IEhYaHmrTyNGHgpHDaUQyEvylEiPhpvAsgAdcUqDhBAzjoxDBamWWHEXLRUk3zQIxJnRqcWaNC1AmhIpAAVyaA7hpHlAPTAEsEAikPkuF4ArAbE4NKENRV7oFAztaGpkyLioJfbF3cbQNo6FblBgH+xgUe1gRDVZjE0h+jmFKOA1ZH2aGqUo1CNuTLdrewl6g5gToj+dRS0ckZ5JyNwz5Vguh2Wa0tKjj/kJ0Pi8Q8yPlTocrnq4hEa3FCDocKYsubQ9jkix6OMlKQVSKzZhMfyUP+hh8LpsQPaxNgRhujI5YpMtinZ4414eSNeBbw1Ls6Gp2amgIjjunapxZgSPKLKeXY1BBiz3kxFjZLCmGrd20fav4lvWoCFiF0i7H/rBPPxcbTXmpffcEi0en9a4TrZ3b29250myHaYrEbXJ2IQIbKp61FYJT8MxSGdedJsFuVe2162qscnZbu93dHb9dtt/tHxOSmhwU4liXKB6sThZdbqZB68SUGFIUHO9hC4V931S2mW42m7B+S/EEgYKUJasluMCKgWG0syNq01mLLImeKX+CQedh0gE8PQ1oajBrg1UqguHfLBI4fLvEHTNqQ01rZq/1J39onmem5XFG2PmFXDN/f7C8Zl/Cq6X+CZJlshonJDsrE/AIu0EMC9sGlTQsLrgq4vVMLdh5NKgO4rC/QGaKWGIacOw8l5RuOgcchkMH1+90IOa/2N+azrACjLEvwNZsit0UF7BcoRWCbK67FLt24V0TPbgcxG39QNk1uUNKGPRZcS7Y7J5ktZljwx4ATLywmxph7hHqvPNfk+GdpPwQNMgQwXQYO54MZiiwuRQE2xAwOQgOAqGgE/RQl5+FfF7eDYfm2jFIhuuoz9XThdADbICBfGs1rTkfbCtCEhxC5FEhFdA8I68xxB3fDFU9JZjRqUMNKcPlXD7pCm4sIH8q20pngJRErVfT2Iahf+8X8Lvg3AOBsOtwuevJxeXm2SYvAbmlbDkExXPQNDIWTadUAEa98rqioP2RNAsLylBYAMEHqJgBVgaLpgzMHbjbBA2L39wEpEXjzCY7s00W1LgT1EwRxSjjxoJ/oFoKjHPON5aDfedhXl8dmckO1uIN10j1HFmyxd2SFOnC0Vh9kVKwrAGJr0OuGlYpYquJrxYtQ2mlzzGVcVCL8swKGkTQ64kagF8j100W718Q8VopCopjK6C4i689URK20A+IJnQuzXMmR52pWYXM9Hpi04bbbujXXkyI4rNVaAWkKSDXORDJu/7z0pirFs1kEmQzXpT6cfjEUGba5thBeu5/cVtb3kINXO93sNeGlXdWDqW8Hfe6osCwCoqrx2W+Y7uOkVA5lLKlGFBqiITEw/FVPIzO4oLVG5FIN0RNBuV1nGh7JMPZTXV5Ho4HjtjKUErsFtxU6QAwTFvFtdCrDy/vjtdR1yFyq7L59XcVnfG+Rx8fNugzG5n4hSR8dfVxQtOPLXnV3U7typyHRy8KvUrEizAGooABJbOhIKbfJpjGMVh3UtTP7zGK1rIRZfTb3Lsw1r2mC4I6QtKc6cFxOj0gJi8doJz3ht3QfkJJ1wL/kAGhczPEyF41Y2VGn1I5pc51d/6ovdWl/R++PzjbHq1PH8agTYWXvDKFjYlQtx/giou9Kijc3D51Ry9CZgqZoq2SRhVnwZlZRRRgBmkvlgBUl9aIk4EYz0Ld31USbuBrAuX2cHRLqLkvaB/EQt/dhAhuSvI+lWsRSEvUWC1eFNI9VBWo8ByVBbcPhCMpx9csfloGoIYWdabz1qC15pKm5GcSYKDyBZPDbdrU6okbWL/G04cmkqLK7na4JW3mTtSQ1lp4KzldOg7Q+7J3YEJwv/wuuru5bNkSevbx0X4pjyaLxzTIFpb2bTClTaYAK5VDU4gwIQ0oaMJgscXpMtSQPWSJnFlqSYHUQjHGOGRKUH8O36cNr9+SoNKjs5XxSJ5Ky+n2FS3j8cepyIBkSzCnH/K07s6pmXizamV/7UUOgEJDBqRBqHOygXBIIVHwVooRWC7qBIzPMuxeDuU5bMWvt3V8Ap51RNVMI+ghOGnGhok7t75QDbfX+hlVr7KXA93sSUUvdVq8g4hMktX8uiXrkdWyjmawkwnROjZ/yWSORHT1kZOeOU918lDEm08fmk5fQovOZw48n6lB0JwiejPCVQHNy+Yi3nStRNdRYsk3/KCdyzDOBPdT3RcSEWTnMhc1KtuAJeNCExCwxbvSEd+EWSLpqAokpBRDybILw0GWJ5WICLUxnrU3v70ZJFQ6snWeJKejBykXDXRK7poBRMxK96reuvm9SPI/uFVG+LeyL1wIiFdJFAobVU4sITsEjSkVvZSt9hFPFAmCMGfPWo+WrkRm1j/ICLuKrhjPMQCAxQTKRWMjcRloQoArUYtA9LrztibHkNO7kgft3xgnNF1DGixWcOCk/e6DuVeL37stucRVKA/8tjsTiaXlZu7soX8nyS/8SmuVRmdrVllccLKGEN7vqCrtcczv14jfmVyQykAf3ig1GTo1M8FzhXwRSOzZwpns4LloG9+SyHQgpVxK5LcGVeV6pUQuJDV6UqZP5MkoIO0/JAKD/mzgNHlCvngeFWPrYIiGTcW9SEAwPFJGZ6TF+fgrVBZjsLkB8oTbAUODXA/7t+eKQiDtdeVpWOCq06nj9NZEmQio7UC7ockeAm2JYyQQaaNj8MbMoZqyT4S40BUhJ5uwQyw3OepOW1Q2rITt1Hg3eCuYEDuDTlIiEoYSMSjSVHju3rK8Uj2/kPfI72reEEn5D77TsyRz46rb4Fwc49qev2NsROWSHfmmHx37briuXDtZPWbFaIaLrcdcUJnH1U2G8dkk24tVhjReHe3rCwhsStxxo6p1qZ5LW+u1kvD+DTsrFg4DdfyQCrTDuzdHOz6DNoWyqXOoncD8KLT+C8pNiqE0DdeyTpqd6z2CJn5jBu8mzsXQA4U0spwOkrV6VaYE3+8guIKg0kAD1yJoh6/vRtCpKHpfFxKlhjI5PlM5Nk6lDuQUPIkNdEWaXk/i9tdWDppsyTsM9t29y+sA7BtYHER5q2gbOYvRtmZjbLgnghKmHeSXKhrKGznO7v1Eg7jmvq4svo1Wl0/E20tH9qGyx5eeVJtr275eqrjRPVcplxx1P7Cq5W7s0FP/lsU8hM3qRNNylTBTwnbYbc0a5+ldB5M8UxzyV0VQ2r2Wg4zfxR3GBMGon5T36dCTMsX4GiqF/2wXk3OhUJR6gtdB19zBwOF5L7zh/8rK8dSB8rJGolYqjTme+17uQDY7tl/rLMiR+mJwqEUbS09a55yo2r4QRFC27tgamxxwCXrHW2OjKwwyZhwJVkQHojOMhCbV+OtExBzqWz144bIAwPXJWSDl9V/AT3gt/FvV9DLpa4kkcYPK75GNRA1aDiHjMMPATTRifViXHA909in81q1XvX+wfHiN61JXFECEqzYQEfv/HDFYFFItyUjz4zKqm7ovloZwWPTQH71LMd61qsNBMTe7JemSwyHp4larXRNCn7NMfu4U+NORlgAJjug7eX/XAHRQQxoCfDGwzf5gri3/qvYmu7pPq5YEDVaz+2trZMgC7pVtVTd2HRgFfPM2kY25Ll6SOc3Q2RIFUZaVzcL54q+Ozo4NM1XwLvi2osPGiWJUn9QSdlnqyZgbcO9yM4yiNIMijGdQ2zBUHF4UV6om7EWCKS5wS/J3xb8d+SONy9jOLvu2JoP60VwkMQN07ZQ5qqpMcd+CE4QRPn+dX0mvvNZkpVdfQfhPev1V0Z36wWachYYQ3eRmvw0y5MasO0b1iibPof8wcWiEbOXhB4XAP4S+B49q+gJmXzNGTQqCDxbw5WD66y/fHrPfyuT7YW7l8KdnE4Ps4t73zz+61KxOMOujxFj2aTTFe7gnp7kgABgVsD10CvwGqmAErcCqtHZWG+BT5s+IIwhUDu4iJAp4v4qLHTwU5tngUJrx4C5XWBI23qzM6zIhlfuU7P1CPqfrZ+QDVmmC4NoKNzL1OD2aSWC06s0Wn0fqZSMduphiyNC+okatppSEAPWk8qD+oix8EYiCJd+LNRAbStUos1rq14goRTgeVh4i0l4+RWmMVWQEJEhBtL4II0We6UBxmCHgYSS+LBCQU8pQbV3TwVaX+wVBsQ+CD091vUEfaANTl4fgzGu/c4rlFhh5y2Q07snSbzpu5QJgNLSolAGsz6U/0ZOhppppp0fLAwFMVBlmnVJFptBgpmVKGECEzg3aOPJmH1hIpGl91Lks8E+gcjD64gSTrluWWAARj6UXHhQnDNuB7keTt0mgXKCeVVsHBa0uFyMaKifSUUCyd020gBEpAb6cmV5IqOJ6xtw4G2jPFbVgdh94xis61hMVglUA7TV5Les9yNoiyN47XnFo5mqwv2Lglp5uzMELnNQ8kG3j/b3t+IjFV9cFIGsHsutjg6YbFMqPW13VdIxED5cwOv8Em0DAIUcRoon26OQP923iA49DobDctXYKxcR3AKUJsEnfYIiAn4NKPVZ25AZ2olE50nWtLWP/kn+rSQF84pbKtRCV+d0BLBrgJWuQ4Rh168LgfjctiRyqQ1nj+noGt/yUwhg5HkeEy4dwIc7Cvlm6ytQZ8L0D7/xRjz0whoJnHH5CH3tndWVoqNwmaLzQysMQvA+24yGzYD4ZwCbfT+thJ8klKI0fJlDw1RwxKDKWLUZCNoPssMf0o2Ws2PfiDG3cvgcILQ38kCGuiVAMWNZtfhAopddem+UJQj4OntsYGkIChGZlSC/o/UnkTV3yEDKDJBvAqAyZDcg7JPlmB3z/NuQx0bF3Ifcg98jZltCjGDAGpPw4QEwRwfgSJYvjatCyzG8y1NlMxL4o5HikxKOlh1VYlTzj9mnkl9RBc4ahQtI0wyMFXYJMc0Pge/jcwBPdRCLc+aJU3CWaqstAufCIeomrsJ1AFGY6/mwHPahHVh/xmfX2SZhV6gYEJhinHPjs/DwX2d77BhWFhvFvVr4jSuh3oin6ljQRfvjP+b/SlEj5odhpCCi4ehNhzBhLdLnKEP7BjR+Zhd/Y2SFIcV1rgKJwye1srRKZ5bHOxzNG2hgGxC+/0+P80WKyfY+qQZdbpRXue1R2KxSl2i00ZKA6kHU43MWiqyeAPwoAVbMwHnjk+CI3aPO5jrmHJGp++vAeWjEqU/aSkkip4n42UurvLMWqP+J+riFu6uxlpQlxxlpQGH9ZjptOKfaG0P9VeAyeGC+iqds18Q30QM2KhCXhHrokaLjPkmX8OKlSFU1D81hxS/d3AKcw3Ap0SgT6j9kX6AoW0VZCUSnE4w+jhJSm5m5EMFCP4V/I8RHzC0F+INjYCIVklYlSuUqNclnUOgtEmcoeWhwgldjKqhRP+plqNmICWyZufBov1/ZAsZQGuZP+nhwDvPJMeX8cwuo6oJfX6hV2FD9941s1rBQ6n7DAdI15y6+X74vQHtP5ytb3r8nJtZmaC5EcaBSLaANCXkwDKznaqFDKRwdl7b/Pu6So1X090akA1oTr0bEENqZmibeYBhvSUtw2gilHjQyl2Q/cuv6S4630xlYF8z9rkB+ZTDEvphEaVKZmMiwayg4SIHlhApIxEVX4q1ESoY0xg7pnKHauYTLwYkOFumLLuB/Iu8D5SIa+wZToNxJPGONdZEoLIv1xLjIJNo4K0wOHhjVjcmxHSsnOjO44yPwj5lpLOwJpINT8kWjT4WNwePOXADWeUepOyYP9ByhwoN7FZsU2vYcAGo3sJjEbT06dnVOKBwADocztZ50ekLFu25iQ5Ey6luygQRVUSxkZPZCg0hgd0l7xc+zFjiS+I5iWDIKxL7EIhwrcS5BLGgwiGJcPxj4e5h42pMjDLM8WQ5Te9YVf2TORuKL1oBck8gYY9kPWfPh55ynVii+ZI6T8vOnXgUQWJAINiPj1rkcDLdj7xI8xVSJI/NNdT6bR+QZO/q6sRMc7x+CifRr9ksSc57WoDOisla8Sm+VicLG9W/Wjn2SSQInxS52bIq7igDSTqCiS6g6VHv9GSh+Lb9KFgt3EbcE5lf6pSRWuDNsnzVFrsLoectCnXeOq4X3Wtd37AxxkO2o6QBGAhR09CkBMpESSRyN0OsDQBsIWCXWU5qDWewgqIxXQDp7q5uc6oYaeCF6zpjBCUZKGSLikTk1DZNb3f2khif0PTQCePvgV5Ap88EtMcUnEsBjxRbl4VX78/181nbbsAnR9pO7l1ns+4dY09vyk6xNJ8uOKcyT8X3j38KQ3OMgMhBqudT8NtadUCaoOwAiFAmttJC2uOHkMFtcGzl2JFqHtf7iaR6Ee1CBYFfz4TmjoWh1NwhNxWnKAdyozJ3DJvXD0O5jvA/UbJ7O2zR7j/Ma8zXWelB8Hxu9VnIEZ8K3Qp7FU0K03UoNmpzm2V9ewkctSvh8tvztZHP1WcN9gTxJMBBXiiieN5HX0qAX3WdJmM+Cg+LXLLHUMM9J4NZU0EKDQ5y3ZSXaKnUwHeVGVcW+O6GuWtgWa68FueXHPdCv1btld9de9DVs237UXFSFPu7C2uY2a5BZpyXzPt+HE/PDojq2sfzO5V6+zitZovjspcwG10LYGLRyDsUXeFKi3MbWuv1jnV1mTymNokNXj5kyegqNFKpKiAH2bwMAB+jQLxqlREBxqBU4rQuZO7Nw3IsBTeyICjSb2xEpzCKXOuH9doTUNshIBYRghJGAQprcbSgwtnlWe1jEiDCSUW7pbG/4lNn6P9a9b2B+ROjE61602C3dJuEmRBMAmafG96cuBzIpBn8bcs5OHfJulnFHMDqImCr8FPE019EJolMQNWebj+MZgdaooJdzqmaYUAxj8EVvi4gte1c/Pv0BmhKSZeipETqYs0wgMutcyaWGzQcNoCoU0I4zxFoTcm/dmQXdCSIOJGWzxZSV8PjSjyUnaC8qWLmSJG4Rrg5K/v3gz4kHcDkl5eHvGMDncEPfowxkgQqQT5mJ/PE27QqW1cQlV2Fg5L7h8VwqMyUIgZJS9nxfNewC06r/osk+IKyHWbu2QEc0ix2rrUW/m2ClM92zwr67lWnsuOEjI2RPNKgLrK9gIobDYqVy/rKxMn98GQTE/vv6tTo88CuGgHf0dlTVnXmwN+tijuS1roWz7DLDkRm3HOZxzM52Vc2nizruHB4UWrp0ZOwDgEu0h/skNdMNDwAx12D+iIWCajOMqiQYOwJNJhmAnBcO9wKkZQBWKPr+1bM5cOYHENjJ22vnLstPaVCU0g7lPud7tFppO5waQFjnIpfszDqTOuSTivW5XkerIsnjSvaGjIitzG892JwZ3cgO6i8c81IBKRWncjRQluGbU024NcCuNUqXf5gWbskkW28kBD971BIf2baAQbAJ5SjmXJqvLg48Ojg4gw8UbbsDOnfTgMw8rt8JmrjRpbeXyCoBWbe/7gBdPk243O1n1bNRaYwQ8y5GcMNYtBBL8FO/9T4Y7nXJebV/NIp4I+52EjYDu0B6l4gMPvKaq+LhSuMUdxE35PjcwYumtF0mKqNyHpjR4uglKPRtvex4WWLGMvJkqC6j48dwwjyWAxsGtiBLMEW3OOiWbKpZuVqTy27tLYK02PZluf9ZmJmDR3F2c4EjQVKwm75MPbusDCmQm3+JIN8OZqN238yGmXxqt2zvX+uMfHWQCSXNvSIMg2qnlU2htZUhlD6DuC4Q2cSGl6eOaT7Xj0cD2XdgHt5/7PGH4j8HFE73l/JZ9miWbCWm8//5Hnrd03uczmEBhI5O9/f27WdLYMMXGlvUbOToh11ztPEsX7zDLTQz7XO0H7+ygAm2xwzomNvZQQ5EgPXfbmD7+yZOfjR+UV8kWINsavhmQ1qMvbClbh57CRndTbytt/t+IlUM2cxsPPBrw83rbYUIveu0shyQDbG37gEOgv/NUZB7SrdcNOiIz/vTx4zP/i8+OqiKV01kK39MSzxiz/74i4ByvAwlB4LQM96HxCa2tJ2Z7P9y742U3IKkc3JyHDolnzESo9pSEqfOAbgMYPEq+sVD8goApBR5iZ0Th/0rQ+Qo1KhI9XzWQmhG6YnYJwBt4gtvZX35E/AbsTJHWAssmANx4d5Xlm8xN1Oxx+sLOq8sxlBgoPgvxUzDKB5+jKJV4nr8LCxaX6N7DpJ7h1MnITu+rLh5sas1ZDVppROoChQ5qt/Hm5sW1XXAypIkk2TCykwqBn9wWYXIGXau7W9ZVwu2scKr0o7Hg1a09J8+jVJBwFNn2OyucEj9xMXjT6WZezTSwCafUbTTd3eFgiFmVp+5FAU04C5BqkjAj2hYfuSG2C4WsQCHdQbNzcONmiGDe2twRmcbcVzlPOz2dvavXsFmBBFeBiDhmt7K2qiAKw8RoEJkh5f+V7NpApcnTYxo7Crs00VRPIx8i6V0gS52b1mne6MdttBzpvGZt72dkoMM6jByHgkDoBMIjj4Z5Zm6bsfOJfWOAbH5h/oqz8M54SQVoec3oIrBY+4qRfAJtZWIuFKTquOcAZby3OmKSTaKXOVvq9/ydsQP0nXBwpuSuAFupbqX/WLHUB0qjAyLZ+3pnbFJTSvtAMypOJ6nEElyeYDwlxg+CjU7fDVP6UuoPjczP6D1oOkVQVV5Z+nkepPSpr6Dn2/XtCE1msNbJSw3XyNsdqapYfZ4vy9VKgcB6xBXZTqQAivsJ54wxQJM7AF37VIPoUG9eU2rYQKui0A9zMaHShvtQ3m1TZUmfDPRoi3E988P9DmqjwV99YIg1NAMpHVJSLTe/Wp3dx6bajzhJ73ogv5IbLRDB9BhWRhYcRZGv3JYJDZyVSQNltW43IxhA11edZyGx7mm3fFdYxlR28lkgdRfM+5krv+JkWTUZ5bPzT+fMzUpr5pTK5PwapRXTeY/Q/8SPV/ZVrr4srVAreTIBbZdOrtKNiyEvvB+nDtkOfGm6zp+Exdfqoc5PI3k82P8i9VXhqm6V0XHMDRXVD1Ah/Mb+J/Q+qr2sjbqFvTq9ubph3Lt7qgpxw8wKPRi634f1obUcLKtmojKN87Bf50JkTFTaHJJ2EH8KDP4QlYHWc3o/YUPU2tlbLPjynfqo2tXMxdak1elHslskjmEkcQpRKbRlpdsnq9nTv7/MhttLe9VNOo/3b3u7XhvFYosW7f5zq/POMv8lTeLGL1RhroJoCYuw8DYXZ9a8hWwlH4OGW6WHB1+0PVKrgoZ/zAMjL0kFL2Y5n4izhSr5Iymmt8Hoqc7rZ5Tbob25k02c7b52ekb4PuEGv6xLK5bpQCqLkleLY+jqARs5k4LZN+LSBXssJ1usPp6RIEhIORUb9MdwA9xX2xpoOygT85EpSjkIBlFTl/s2P+cXPo33ihjerxjDfHR4Jy9fu9WQZ3ycya1spDKvpZ9wRLveYw1tFTzFMyzKYOogdg/v7Dwn2p84aI+Cb8g99hCqeTvo3k5PvDI8r3aTIiVXp5f2GUZS2+NBY9PU6nxTU9eotMgEhxlZ5PjA63QmoxikRzf41DSVFk9fSmmehDlHVWbTb2LGP5gRBTT2v0aEAWgSe9eh+SMaZ+eIsDF7NWdV6kqKoqajB7l4Lh0n2tqJx2RhXJktGpwVe7nNFq7aWJG1TAgEAoCjnrjAbas5Be8myuMRoPeFUhvpjc8pT9ux1lvqMb091AUsR3QeZNElBVzA+c2Zoe0ErjJlQqTQ+UDVo7aNIdIH54RtD+SgpjY4xpcJFo57Jnw+WDrUUAoNT7X8Djp9Jm+wCCHoDou0AJ5sjTncGxpshtfeEQhbL7SZeZUYT3ZfUkwSxHG5NAEGZQJNSIu7X9edFp8MoypP63hmS+WK7hMjD2JnK+QpKop9K+vNnWVoGNJrZuTNBOljPj9qj1Y84j0jAwuZYRjsGlpskyg+4DFbQrV0YIW0n9h7EQKucYF1FqjI1EKVDaBc7W2+mxopdX6QggduaFp11N2ek0uLImtCzfN/oyKGo//jLb4yZ3L4GDxsIkaklZNawo7uPizPiQqZunpon9N9BQ8QQPvVyQUXKYvSF1tNddo0b+2sz36gII1HakljwleeKESuApdIZvh7Si+vTlIynk9hJ7s91KqNTFaaaJ0VKsNAR+xkFJLMQ5bT6Og4rrNp19Rtrc4Z5ZnuWLbayzdZwJ3RqpXG7OEP0XJdTUCwHMrMr9TZuj87Xu3FjPJgeqT/nmijEZM/VnHS7W7Mi0rGvQZkNJmai+k8ExO7VnFuwyDpLqtamIdtiXxlmdIi00knRnaUtD9jbVKdV9qVOuKO0vItsodgR5wE7tz8lERgZXAWw4ov9LwsYee8h9Qmw8agNWL/K+9dQaXICLvqeQlUJTKKXFOE26e35d2oAKcDhynz4ZGb8v42CzZ/uEExKjPtyOsDfitDG/RLKcaN02KoyG44hg/K6hPthImDmpZAAZzA7XNE5hDKpFiuTK3pz1cD522bnaC0Kn6NytNzO+ZnpQ+teWCYWwNHq2dJiqlWqRrYJS1XXrIqt5FqlE6x+Bt+zVAU3EVz3x0CKA6XgN60oz/NTuA6QguEU3Y55pOune6iiINsj1Gz4QzZnMX3i8638sCvlpyAJ0+5HXPn3Fa2gqim7z1p9a+ZW4+0Ifgem+94lP5jLC7N40cdLHBONWWKfa6bZ3HekdhIQuHeHRT6JQIemMa06RoNKb5NFaTG+QGlulwI0bpIdEBKm51cFBvApVFkL+t/nzuqgUlo+RYkGoSHTUsr78N+AqJyqpmNXxsVe3se2z6nxjUclUGLz7N08URhKOXiPiNZvdCIsN6IwN3t6HJRJ+ZddcZcpfw/Z7+e39h4Hrk8m2TP4sU/mFaadJpUmf6wCjfLnsSv2m5a5Says0rHQ2uXrR1f1rhMkMiK1etjWQr7IUOFbi0rlq04yo5PWa6aqTazjz8akgzvmpraCRNlFN7VV/IcYHQ8hpybQwZ7TAG2Ixl+3fDNmzDYbgXoIz8g/7djLuZwfRqiLO0oBeS11RatK0gZqOYj3pSGODUmgrSi1aJ6LWkfcYWegD1dUihYG1U/9M1Eu2aoXt0+RDYlDx1cOLuD8pxQbt67d2ir1kS7bQgEl78wMcEeoq18l7AVIbWVnnVca3vErGhEMylma3fn9DTk5GmxtvIrL0xNwPGbLRlZtLpOKA9Rvm1beWMRHSEK5X3djyxaRguj26mb0dLLXJEPReflRTcW6mVQNG8JBH5+SvZ9+huFmm3nt7AG19t7utRN2IY4fRpeS9TQ5NeSVgS2Sw5u24qtofgtwBQxhfI7AGSGu0ya5pRvqOJO6Vr0SYyjA08AQnweopDQTgiFIreGtZIbvPciUZTrBT6Tg1QVlU+SzprOSknZzDMDVclSUo+BAVYtawBcowws1C4MULQUWar65YKUJaO+pKpYSspQi8gEK1WZeWzcgJ3KbiDum/RjsXExCAnc/oB3Vz2+dGyQSLTmhSimzavNZ8w+U/NpJvnUz0MjxGriyFCoJXESmpr6Bn6cXTi3czvP2gY9Y7aU7HSMMG82T6CJ+p2hntwb2gu6O6FQVE7uxEOIQlG6krcdJiMax/rGjPkBYYHUR1ogWI0ELQfeRMrbI7ZH3tq9cdp7I+NxXzF38d8yua+lHxImOFyKSdXGHDduBuJKZ9I33JkzFTUS+zrRkvUI4CcYEx2PINpqHmbcITGzy5LydrcNh7vf0A6Fqnw7TDriOnAwI0zl08HoiLo1iIPrQtW+3ubxHXgAMxapvNNMkVcaU1fGYlpJrZjyzMRAKE56nXz8UJFbNEWaVjzwb0A3ogW6zFf9lDFK/6tMnQAdj+HrRrp9Y4A2H4px48gHHwGalhZPywPR/23ljHG2/hcN8mi5N+xjIa0WisV9wLl92/uniwcz6wQLHSnPop5/PfL9h0dCl3o/4hOzJ0S/cSfgOwW/eRPm87yDgEy3ok2CSZoVvQbeFOcJ9Ez8BokYI3sUQ5wftgOTY+yLdwEQrbkXghK6Z/v0NLxz2N0oJTdgET2+2xBd8ERggt0bTmk4InjUOaz18UAKfwlZE0ted4017LEMrPAsHdak/Gvs8IiCFa/aI9fsVpC/xq9KDGm32aTlHzUyulU10Ya+FiluOS/W3SGWHi8JTqOksPhinGVyjPix7ZfMPZurc/7FQw3AqFb4Hi4cknrFrQUJyE1PLh+EFSWa0J26dHDVJkTYwCtBdFyd2AWUV8iq3WPMAUT0n8ZHLRzmjsDbGH4EwiUgBMOur7HP1RwWbissVHdfhbQalHLsyROWd335Ku3tieMbeP9JPjXBXSjpkWfLGYbg8Z863zQvz0t42OaF5h8fsJ3Xa5eX/x1p4VyAaFuL0CLy167NjwCirc2tq0VkyWXnWKggH8SB2IKCWCgOyi+Aeq7z80F6U23VGibHqqu2vM2q7UBnN7Zrz1aCVq+7rDjMNSVLEIN4mjWNhDpEopOPCt8OIBCDsnpWY2DxZgKV+A0Pg8gF2PIbgSaelQc2deICBqUw/B5BY73jAfgVfNahIrC5I5wACO+IRuJ17IdI30y793zAgcDJWdwx+DurjzcPH8Mt9Iv6F3C74Xme08Xao5PYBuT0EespGu+ILes7vBvHGqH0k481ZXiIktxFpTriArGPCIi6Uve33iaCEbkj1EuljZIELAFJ6UoCTEByVRFLgYgqG8/cEhD5EfJqC4ipX5xBQ4sFzaI1Qs7PXBqfMmqawFQAC4V/79qf4ANJfy7vUwEfiZNhUQD2MglqWGSFutx2g0Oiujy/qOAYFrlgbmCfN+oipCXQpk2IEkTpps4Sgg7HUClUsmlTySLfFB9Ber4gLYXvmwiVlEDBJuDFKkLH7EkgK9va2p7USHXxrCXRxqSTk1UmN5LiyliDgSxIk42ZkrQB/LLaALWUFxmWLQmKc91K+G7+nZAe+MXgc8MXscC4wg9X872rodycVD2bzmWlrGIWRh6kYMmnu+OVzH2XZ6nVdH+2rWoSCspWRf27hMuF3IL9924hMBuatFXb+0MF1IpPDE4ERuxbnn+w1aOkxDt2UF/mixVHFJnuAksLwhLzF6WwN8B+gE8P8VqPkeru6wSYDoxAl81qHcDwz0AdcDfvPq8bvoBU4TxDkL2QXl02supoUTG+CeF/YivwHb346D83uAqUtjO616w3jB2GKSrChNmHkalolBpV4c434vytEq0TnXRQgwWlHLe3g4sTm0udKH5RGyt2JWzCUcotCtv0+BmTGXxnbkWx+l552nS6Qz/28zVilb5jOtEb0rWfgZvuP+5/wJLtyrYE/3PxwMqey8bzu4ZtdyQOjDxb7XUY/2cGP/1IrpFiEeJ4fQztH+j00f5R9qNd+xAKOR0pED7Jp/pvBLW+3pU+agU0TFFPDoPYiGxXb9/lFkLo7tLVEidvt3CH/WB4Uk3+u0AUbUjpDRUGggFKOKsLWFX7iJAPHKPDLcug4bvJNgNAI7YBPn84pYmY222rBtQkm3kRzKim86G0mhXpEPcBDpyW/KPox2bTdERNDZTeQUBZA0qD0mtq0kNdpc4uEfGGKtP1k0ppBwlj/DbyY0rrLnj/l83lWUb0eecL+Ci4g9o7HbZ93uVvl6fB9dp/XO4Ghx5/yoi643QHFw1bUTumPXcA/6x9mKi7V0Ji7r7XOanZWNIHkw4EI/q289a0Z1cWx0zNu/zjfDeE/IVnSLkB7wD4T5iVHXZ0kqDB5umEBhVWQ5zdkx4WWSMJDA6UkWgkIcme7ATbJVv9Tra3opFnSfZjwrl9fJZMs4KjWYzqTegYzYpGEkRHdlmyDd0x8svYxfTBtkVG8snvk5NClpCBC8sDAlGtJWQBb6qYzZJI6ClF+hCLptDvrrMWPFKoM6Z/z6aY8o3G/Z9qDAenv/LCI1qv+eq1CUmY9N4Hpo9704Aws+MjPDWUaUe2sYbwrIzeu+bfqclgPwZ2icXmAN/nU8CQPzNkyM4wg03HzhgcO35kHWB67NnB3NYb3ukrh2oEFwypgcNBNT4B8mvxl2i1LrXUiyxqq7lMkS78IJRKhD9QpWCALCQXpHYwG5x+M/fPqtj14GGPlcCqn0YrpYdG639ne95011bQSAenMEQfy27Ft0m3pQ+zKz+/zbItFq0LbO2cOkB4iqhorwz7l2NAhqneL7KfXt4iBR77DjNMb/KShSPciUN/TPnc7f8bAiGfK3+wqA2vFWdWPIOLgQdanhHdt4ZXL3wcYeXbHa7xwVna4DF12E5vN4KWqsPXhLzE9dv6+2FCooAkCLfISW7bXyaXoxMw2mGR93EHvC86GNL1K26aJSBHzfqZn4GwmI7tpvRT+ynd3BujyP+/IM8hR798GQX2vwcA4Zh3kohgzGSISrpJog6ZjAFinxvmkCa8LMVQFlNGoo4xxsK/Qj6GVkx0a/Rozq0Rf0k5VywN+yomsx/7iqXu0qZAyUQJwsqq8sqS5wN82e66j5jfMR95RovfLYwjQMd4XryhCGxltNJ96jBGLyOmLrkuzUmdD7UFsbV5ykPsd1rmJYP9dM/STHbaz0NcI0uL/BwZU2bxQ98tyMyL10FIzf0s8JfQWhrgLKFvqxC++bFxLRSu6SMzVPZRs3xZ5pwsnCUxJfrKqv/nAClIT4ekmBmvGYyfS3ZMTJaLpqPArUbGzgRmjCAU5wniDuIJC8WaZ+XzdrIbzh3OPFhUr1B8cgfulIQEociuLyyIvtkFvKgHRShKSKC0vgD+px7+Y0vY4ffa99Vmm92IjPM80S7UBZsjdWSUX7GNjZuihllpDPKZp9L1UDxRWv27OigIcXScpqXRHXXceOkAkd1YBvO46In1W0k/XvqRtPXmOvD49xGWnjVSXz/I1rKHt012e4qgHi9hOfWuwZltLoCTxmi57VUFRIiRp4VNuHrfXIfwno3x8WnWc/Kpkvh40HshGqUT9gYpto4YuoFx74Je+KO1y1rQU15SQkwXC7gHpqnSfYryoqhd2DTCSnt/LkvN4/qziKtQysa2LepgZ0dut96aHevKAd60x9fSoRitNkbxgWdmTDqioru7AixCEYzpGja62EnqxPZfshjNng5ldDMW56WbdLEWs7pMTHdb+UrmcN9GMXWR8SdtKGYXU38mvMbuHK4FFgzUkx6LPTzTPWgdj3RPEFK+2VGqeKiQOg5AH/q2AX+M5QVpg9RY/cQR3ARO8fSNULCypgPJwgJRXLJZQeOhAvOCMcgXA/wuLTwsKsQMjhG4W6aF14m5njUcLDDNF8flm+WvO5ZiOoH/8NB+l2nWsvwZ/d+mpjZqwIJtk6HKSijY5A6wHTeBj0BvK+Hk/JB8oGEG6t0175Q4pXpADYT4iQHVVcOolINMDRQByTMz5RBRQvDWIjI1eut/HzCoDL+7p29ilNd5lZJKDlQeUDRyaheWIOpqoSUU6uocFuqEN1+7RG2ArycsCd0bumQ8oeFP8z0LTHMgEgHfhTlzYQ8IhOyqZ6tBHq2Dpn2xFXApnU1ivuv19jgJ7OftldQlte5RHqSjeWsnqWAbISE/o9Yt2p20h6Y16ChtnenQbwLZL0lyzsK58qS/FOfLGErAoJTkeDtsQEdn7xzFv8yzVggVYNmdUoLQB8yekhOIvqMfvTs0kP8FzAOPpfGfuM64fLfnz7kOz+c57I8ucy7z3pzvhicuH+1Wh2SGeZSa6ZRKnWmpe1hmCJRYXLz8tXAACbdfuNCOIEo0W0cOCMGyAFoTobXGuoFkXecuMhcyQ5aTJZ70aZlsmu4paHu8EjJF5nXu1iTrhprWJgLN+Pw5W2Qlw03gSTitBSY/I/zS9QckIQYI1/R4zx/juBkRvI/H+FZGzHYtjoSfwMmsROyBQY0GPF+L2pd6NIOwxj0JM+kqCveuR7QpQQS/MSe/wT8CWO/b0xiw3Pmagc3Yh6/5BSG7FNzkHLjcOSNX7BjdEBuNm8GZG27i4iBNZu8CbGZ1qcmZ4gDnpqCcDBffIClu5m5rJMsr/HNOVLMg+XVcyC9NmIDlLvVFLtgbOHPcCJZy5/LHLNLSYw6YO6NntgUh/ZPgJGWxLgkZBy3NQ8fipjU6fhPnECkWisWRyPRYdbWcqTtjpoJhEghOqKoxucm7xBsxIeBm8J/xMziC6TDv0tg0q7FRSqOi5hhBjLmylSoB5l5oyG2EfBPHZMTEwZ/ibJIjbr+HHDSZgk3NOKefjfTm+N6BXry5NMK7aYKhAd703FbzlTrisXJjlmneyupq2lzFt9nUxcp48oGKzdW/9NIOtha3prmSzT2KPVDf+lYjKUX1dpgutiH0/efLTWRz8eOZk4HxwaBqNc1UIYrbO4ohorRCFKt4RljNoXGAD+ww7AGgBkoVV839zQEdL6lUlb0qvKXJ7GVOSZL9kclIxGylmcSseRJGJgdK93e3oaqvF7KAfWr1DZMa4D+FqLhMMz7VRLLf5JRQwjs1fpJ9jl4OUf6S/Wdp1hIbWr9+uYhuPwnq/z1M5AGVjAOHjvh8Qg0aGV8/RiNupYlE1KXUsKFtJdLGWD1h3QskGmlLikhbCnSLdLQL3WE9SyOhIPn7GtS8YqliHlXzPkie273YbKnZBwj4id9s9LPKe7MTA6Aeb0YaADU0BX57HsbxK43KZsF6iyqNt/M4twFnOSQSU6liMSTHPk6Pd02Rtha6VaFbrXxuijD9MVbuWDAX1vK4q9LQ0eSsWDTZGtI6uYh6a4dhCF9xJmyJbfR7V7nzQG8/3O3cDcsR9M0RzRGCFUA00vXUA1S9QxWkqrx/uPJ3cx6yMGL66XqHfOgq5fvsEroe6rcwWvSDKgc9uPrpO+UqlG+zrV9nNO+HFOwXrtL0DvpHeLqe3o826g7Rv5L0KwtqmUAA+ZhehbQLQuYrao9O8Yj6iiQ8wO4zJVeTTfdDlD7hm+Evy37gWe64hLr6eVfu+qwa+0tzL4VXOFey2wBndhIoxFW+uUNGAxO+E3NriRQmhVSbS5SR64Zy+fVD8+GfndiWnVuNBpqWmJjomBYLqkWrRtM2ZMRw8zF4bg55/AIuc9wWGBuEYQP8Y5y1yzhJ/huLHzC5T+3+hOJF67n5rr/EqZTKjsHG7szkbRrNiAEzHBkdE9OiAejqrKzWcnHZ9et984gfCUgChZBXSwRMQKifAY8kGIm5glUhQAPg86lSM8smJ5LZFA2ZaTOz5jBtGLKvzAlt0bRDvDlMN8bb6+Dx8i9ohZ9IgcZX1AY3gCDDuhzLeLS/CK0gZB8/aBhtITVhH4UhtPixHoIQICKPWD7k/12ZAC3nfvX57j9UTlzuDwTlmwqytv1KxtRKMV0acpayIDuKlqJpxQCfzmLlpD05GsteSaaTokk0szRMF8Ye04rhalB7faeuzBerPm3+go7zFcah8TlrA1cFrVqRg3+s/YTouC99n0qfT7JJzfWgW43TzST6uw3Qnv/yr+W9ft+k2aCc+54LEpXf/IayiXn+gK9bcqJD7S3TnBKofUkLBtP8saKfSeNe559NPTvvNU66Wmy5n74d0XMACBAtRYV7ny5Hi5duA3lsLe2nhXnKT7Q8dh5tjKaVf1CmyPOfhJ/myULK/MIUTc1WgSkyjSwk0SaFkzQSIEgo0w7DDk+MqZ2cGx2dR/7HmCacBhxn1qHHtDZweDh69ybk2f1vuJIDYmGMXLA41SIt8dmrcRIhGgq3jghPbf9X+e7dTUwnbRURkapRdPfaTXpKGhYr901PwwBjo5DA9+P7+7fFDbuC1otjtnkDeXYka6VSLIyQeqtSzVPD7j0YJRLCIZGlo3mV/hLpqTKJTLLeslUu9clShY8fX8C4XjGx0qry8gl2N3s0MytK7u93bfwmp5UDWLD7CeTCR+RJ5ImFhRMwu7KwgDwBVGE91dU9QpWxABzSuWics5yvRkZHyX92znLKdNUdBIWIjrEL1C/0aghAegc9nVVNFwAz7IHzMZEnFz6eQOLrv3TAY2OIDmOhA+bMhbZlPrUaTZ2PwIy8RacxszPN8v+VMpS4faM0RHKh94m+1BL1HBgDhiIkH8I5loZpudEoTIF3VH0p98ck2Kjmg+3tYmvqfecsU5Zplm7r99WxJASYV1ifcpSiTqH4ilMavtMpZ59pyqnL+hr1lMbH+ZQTX3NKwc9JSB9RU1785CmFD/oUUiqcS+qod6azj14oRZ5C+zwGMxAULiTxuEJMIyZMw/al4GOahVnNIc3ZVU9Bs/w/vcwVDEVa0RTNIofNwvroFPy+MF3H5K3jpbx0YLzn5kbXO7TQ3YAbvcVBT18zFPIINEBFIAEkBFAAPbdvkgJMFQ8G1ANQNU0J6HoIqAGkH+3nEvYFmQftM98bbB68t952EKBHBweqXQ0CPx3D/Nb088S6G9Zr/rpRMcxqR6xOWI7UpjKdft7drbG6ubbQwulXzG9fYVfEP1D3f7f3XQ9mgoC9RyZ+Ls9EGm58Zb/W5AMni0Ic5ZoTMzWsdMLq5uuP/93+7/rOLtou4HN4Y122tIEid24irpySjkxDLqbMsQWGIvd+mu0O52RIN8ktvpf9km2Az3G7rCQct8i9h07Sh+pJE9AsvafI3SBgz3nVotJQtXmHU2xSzMEZd+PpBF2ALgFVKrPLybWbA+Gu7DnbuiWNrLMtT0QChTPLFDeXAZg9972k02Mu4fIMlzpUuEtY9Qi41KHGXsKpOi4Z8nCXMHrSi35El4hziVqkw8wxCPg8NidEb0Y97CDODM793cd8QzR1NyWW6b8ulisGZ4gdqIdvXKft9jniFHEOBF9sY77ZLETPyZCKnUrrnlhPWT9Zt8LS9Q2COLcdgm+tgyA63sJ8wHb41CmRaZjeJeAGdfTWrT//FKCCsD3Y4xjpx8tbt4cp9HNfnTdi5adPD9h+PTDol/p699eOzvT8jz5UKOf48d9+A189CJtf13DxTjZktli7G4dPtiZXe12EHcvepi+2XJxe8QbheJGXn9w2fNLd6L5NQ3zSu2UwjXXBn9Ky+ryVcrOqX6J9OYq2wwA/u9GBtH3gqycas2Y58Ow36UsslzAOFxYktzIerQMWLG6Fb/U6NppxwrFALE8RAjKf/Jk0dcxpyZ7SPISi/H5xXnJpivSZzKf07ktmR+0KutikRsHC24lQ2ZEI1K4xKHFGNnTgRPff61yds33/tpeaYznhZpzm23uB/544JpTs0875JGYuUy+anU1elClhfuJ4twM1a+JNkXLUz92CWbSrvhxUAPlfb4si2C7x9x9KLAsW2QRGV0XGYMesGZ2WnQz6qiDU0Tcf9clWqrZsDYBWIrbtgBoo1rLEQj42NmK84EbutXjbXwAE+Asmq1hdzt2MVYxu566OdNQo9Y+87u61kKy7rm6bGJzs7laH0UdN56df1tXWpqXU1AQHGr+drfj+vZVgqAVGoSei20nT3qnL/Y6HgvV9xmHQYXrz0s3TzKOZ7wqW+/MksC1sxwzyhvDWk+XeTVXet6dZYyXdgd2HtwlzvS4eW7AXO8fuoT0+0DXwHhOOg0h7t4swRaVaVtrdNeMw4jDz5ODBcNnAwC2nAadpD2Sq+ln6yoIsVmRkmz0+Qps14bgd5g9FRFIszd8r1ezlBGtySX9k2+AWYRLALF0qZ9ZFfUmuRKrF3ORAJSsqMlDby8sdZ0D9PbDGEelg7ZOkqQzCMsN8Hn96bXyX6ma2bA5tZjBDzy0zm3RbGqMaeyrrVZMOpE2cScM01oCdNrxZ4yOUstdvOX4MINgbNXrvFkOlWDaPNh2kyjvavWEDVe+gp9Jy2vdCT9Cm/y5MWbN7ABiLs7DaRG1SXmLecVeyXEQVEHhRFmCg+lANzvsBWLDbzmX1if87EFs5OhYQnpD61DnJ4HpQB0Jhv/xHOeXnj5pwn0D5+5lNu8+YSe+KGfdpdEml2gGiIoXsKO2mtVmCyTrtrspuW/5R+Z8/rLIyUYmsxq1EKhMrPh6YZveAQob9HJ7JGFV8OWN7JuRRRre2783laqH1tbPUjDMZatNr1kK1iWWa8839FvvRVfCSa4YpK8OYQUmlpUkQ9a8XBeGBRtkCw1ViJysslLEc93pTlMbAvOVx8VRE4rJi22+z82TUJ7H4E6r/hyz5qvup6dvdRc67dzkWH/x2a6n7VWt7fyo8RVtvMKQHIT118MUbEJywb/JQhcMvYgx/Ch63vtWDN1XLA1KgaF+m8j37nYUy0i/F0FPnfzyrm3EKlepW0Tp7Lb81Bf6xf15ZPP7X+MkW0qvuzfzI/gzypNuH1maz6XbMhJ3a0CvLLYDF8iujxat267qYt5ld6+wiOIg1utu6NQ4EP22o7w8wgH/wlRw/woqbFD5lt/O2NItc6G06zL2t3D4Q9opLnHPRaMFPt2xvs1i3rY/cFmDQlcPJJLY1m/yWDBqSfY5wxO3HAXcCBOls+/rKXavFcN/jR32wCI8eBYG+R4+diatdnfv6ZlwmXHidexAr+vpWIGoRjSI8BFoLCIsA1NMubBpG6ZkB3c+KKTNr5dKKzzvmOkrKxIPmm+2Bv8LcxvlwL8cLcRz++BF5Anlc6HFAuBw+Dp9w0zMd0JudN5+b+eleaFK57qvsK8+/x28bhYPQ1i5sD5ykdovtMehiMU4J/CNJAsDOfZ473HxQ7CFSU6rfSoOz/rFa5pFpgROJfM6T7YhCsFAoZFCXhocGicbSWEvMavxyDhx1DHDvcaQKCgSo+vCCLH5EiUkaDXmcgXCcRTEEpU9UapIsNjmDFflQIirV+IhEqRssUEZpcMuDrMV4FTNhiWsiiMXUmCcRoW1DFK94W7UgJbS/MfEqmnPIh1/Lio0V3LZqkOBouwWN3Fgg2CG4M4p2j963lx3PdGZHyUEExiQfeCZ5tCrcXzhmbWVsa1y9c3VTV5NOs7QgJQaw4EXn4C9XVphzEAwguUdwxblIYh5Rsljib/FECKKWeDKPQSQlLh2EHn33g5WVSaIOefSon0KJJpZW+1b9OvpeHGRWZ/tPOw7/d+ezMvYwLYrVSEiHkiSICATtpstrQQRKgxD+0YpVQbGIKiqLfklgUhYFNQKeG97qw/2RjaAijwVpYK+0ulq2Lw3UVV3LCSGW244tAbuk0wlJYc9tq107Xx3bgWDUMHkVhYJkACBX5IEIX6sjK3giqgq9m9i0Ad3EQIL/ikqiMdX0NtMtOYxlKBQGi+SbVVY0xm1JPimkmZjBVjvK8+39vmIQEkLvJlqY4Q7G3tfXwZUORE17Gc1VUCXnkF+/TgLp/NfJwXxlzt+RX78qLn07daanjbSqabVpWfOmpxQW9s/zv8fFpaR+W5+5dqBt7HXzGmEpWDXJOmhLgXXC0e+x8clpk0s2GtRbY1Zm+NZn/5TCwf554WNs90XXZawbaJ18cAcvWwkmLaXmzqPfYuNT0sb4tlQHsNl9kSs9A1XPippcSTkeL1Bn2ER/CHRdlEGvR0XZrbx7nCKIz1BH2wR+0Hk1dlF3L2WtnMT7X8p55LdvI8KeTwj6+A3tEZGrOboFj+ITYFcFFakgKJBUhStM4KPwW4Y0OSd97w7vPY4x3YUgyOBwZfpZO8+S0mGZExbeZYo+sXf4ki9Yv6gGlcL9Od3te8lZOxO7RO6sIZ69jr69eaCbTeJSTCjXS74HR//MRaXUuF33xyP+RVKLkRVt26oRekQ/VVAVxVTkvwi8/3XwdENna7A2YdVSILOm5njt8QUVB4TJaqPMEIzSza7cBM6iHu2GUumi4MSActweJS4KGb2xvIxYjt2TRJbkhvLUiEm9wwSYerW4dOqMkhkWTlXfAKFnzqwPBW7mK9bYJe+5f+xyivslMDUesTgUBPfpo4I2jOh/Kc5zb9c4pWR3FHs0STySSzYNFXs1JCxe1BDVLl0Iqfsf21ZBrym4evbflJ7x//KvAeFeh6gton2prl60Ufj//5GjRAlBP5L/oPxxBSrqS0cm4n0ynggX1XheH/Gv5kKQIA6FxbrkZT34YgqJdleWqoGr70I45433roakHZ/X5bq8Nl1lsAOuFrIG7q4Lz56/2oMX9HZeT7YUymmpjzeiQSKuIMlPWxWahE7C5if5h08gCEeAabz9YIm1kB0RZVe9zg50mWz6uzGP3g8iofjA7M2OsdPBK+QJYHR+XWBUn8aFudhf0JtZ4+sJDNiEgL+n6i+JkIl0koiUFf4jL/WvGL77Qgqh1iSaOWOR+NSUvzNvpy/Lb42ag31rbGalZogm6/ufelcvP7YY4+uEWLmfaig44Xsib9HcucigNxO6IwlHSq6sfTn2uzHz848W6W89IxHO75bZuARsikpPMmugZUEyWt3Kv4BXIvrbjTs/Lt73nfZb4hmbs4m/2fuX8LrNeOJZKgDz6uPOhinde7f3vC9uX8Ld1/m7pKgESSnJ3udnkUIXR9drarbfpQzzolPQ6cOFi4hCwXTYUupSR4nFQOeQl4ansdBoGP+favRy1f52iJfGigLRKKxO7hxNp6alOOMAQBRXW1TzGD635ol0qM/c2Uyfcci9ABVnGhnV8cyvPGsdldgCQtjbTKvGNu/O/LBdaqNr7dQxKA7Fr0BfypUq2/g8t/jUu0oEJEnI/pbHpCOc02UXX1a6iMwSft24gX4oGHEEMRizUAOjbNTuoUFeIts0Ak0AaU6ILGO9UdsGdzeDnpE84EAyuEV4iGvjVFg1MtcBRqj4dlSW0EIILkEL9iJns/s6iGGfkcjrhMAdkOxJDrMMs/po+bEzkGS0JEj7YSov7p5mzTNVS+KdzaQ/ecV6QUpDiQZSgVWp1PBeQiJUrIVimdoOmQL3lElNgoqXQBFQeHFGEhQHLctAhKPdJOqTuFv0WzjSN/q3tbgZ+sxcnDn6HBh0oX4yzz25shZqhc5sh6uAWFLyiJVdFni/0IY628FBlPR0+KdTlU4qp6tO9+4qGClccSLaASScs3u1bqPQoZ7ViBxEbk+zHqHDrknhmStMFmWWZJI4TPYYNZGZtIfIZ/oMscgpAsR/+Yh8Yj4pKiYhBJ595/cOltWtJ/VlQfNyHcFsPbLahGbbEH7C9kQg+iSDyIs8a3s2/AcIit61li094fOjpMrUUQmyN/BkY9+34X8CUwEu5Iemjrb7Xw7zi7eetU+MKa0kMc23yO1WR8LpYL2nV7rzavi3JAQHUVtV+47zLukaZwuSwSez4jiP449a32nSlV7O2mF3XyNVr2kQsTtle2OGyq6H/U8vb5qEj+aQG/8stRvxCHfqAIWKk3YIaKe7NSJtC6w+joEZSd/5MdbmUSZxJfst9oWn3E+AyiE59qDtXcSFFEby+8CgtHgRC1++J9rx5Acr2ckdJ2k3Wisb6/Ci37QVYsuo8qiOColn9OLQEvO3v4KccbYrs5JJTJYeQb79Cz5LlLOOIPm3nWISQO4NikVREVlAmZ/7Wvd99UUk9eSfB3R7nAoQtV1pJBwQeZT+fOIu8uPZw4/a7RuOIDZmeSES4RoV1ISY6ol79I5TcB5EDXmSPb2QXkD/8IY9UZ5Q8lKwBLXl3qSfi5nFP1tehfhVnvHMulrCLLlqCQRwGm+Zv9lFM88YT0+0J+H/8KgHCB5oi8QJRr9PQSl3oTFF9B8+JmtPSoWZaJ0pppQjO8MuFW+0F8dUfVG+X2DgcfmdJZqbMy9MifT5x+J3jqb3HLPZG8T2Sw/ay0obnUa2SHf1ZhFi/lOJvqbkoY6E91IVsz/t7EXysSPDMRF96F9x8dlSojRN6tPJ2KmRchR2D9FFcBrYyWKJpe+RTEK0WUxNSXlClCOr0PQH7xfp0cR/GL+yRGgSWo8qRuej8S72kgdKCwWxjpXIYJeaRSZGH5hVKslk52ZZoa1qQGVzr5fv9+MN8Bv7JybmAljWuqeU/qCSk5HgvYw0HhPzpPofJ9N2ClKqSZYCQfkvLKSU0m7q9E+1Q1XYPxD0TxhloFBJb0WMu3NiRUEJzJOxJE05iB9DVLPxfqhAs0dHvlv1cm4WosQxJzkuYTDcSuMaZTcxiNhRokgAnd6/QHxIY+oX8PCPfK+dfv415j6ThHxFwkVY+T0RYRUfv9ZCjIi0ER4alNlo2ONV8YnTjgMOt+MTpEucQDA998QaXQRTG19GS2e1LL/xAuum4huoPaSY9M3czdZPuWlRVE9rvJSoDtIG5QWpcNZShu1nh8+2js52xk8Na6AufoWVU2GzlzvoSnjauw+xDFHbaMvRcziDds6HTGcSDjl/Gl7kanHNjZkMbx2VGib0j5PNunZNBpWW6yP8xwr20fba2gJ8MjAJ/pZpjulJblmMYDlE0fZuKwbbCosLeznaXgozJqazU8/E4Y4UOD6Z0R/J7+t5SUa0BRcJZ3e/upw2WdpNN6eaMroBC44YQwKAHKMAQLAdl6YY523STj2W73wv4UQR6fk7U2f6t35Gn5mFbXXuMiHHJz94kRl+68eQPIxcIsOzB56YgHuIGgSENxnp16zVNvvJ61jbJmpYJl3OrdisTH3rDl5XBBR0GN/OUE3tdnVUyB9nkKCA0yJ9F1mYAKdf7EVM3GK7k8Clt+Bu+aQnbEidEbLcVzO6ES+wge6D+v6x4U0ZfBaZeZv/QHK+ZMOk+9071AuSV4LbSFmvbjndGhi4IIYqMe00IJFLYhjAnq10HZjd6mcQNAiwWbm5Wdi+xuC3ZRZaN/JXx2g10KTNL5PbX8orLR3hOVPr758I8dz0vH9S8alpk2mBxvqJLdUh1b85wFivhioqoDalrihXI4iScLMKdX4FU0vMyxfkqxlTC5T1UESGJhxSLzIyIXkWVUl2XEL1g9KAjOKYSVZSNz8BH2dnPwJ8OCfAx1btDlB9DTVQxDyNpPBV9pmdnpv8m4N8aj2dSkOQh8DsrE/OIg/xlEJn5P3IN4Eh9Hlf8jvQ1QRHNQX2we8KrAJ3w5Mn4DVAObgb5ieRERhr7jIkqrJzb3VrDCgP8qogcLRY5K6Fu1euEneRu6DwUVT/gVP8oqVSUrvP0o/yYKf1hgcU9IzHzBMz33N6g/XOB7bxXGBE74enp+H9RArBdvxqSBaNwjfdA9ceSFfWqUhqyDrAosLIE0bzwHsukrvf2t4xIQNjlEHYOLf3GcM8kBprtVgY8tTCBHPBHVmYtehnAO7J33feME/ObjwTcI1VSTtOXc649mxAh6KhaSgd/8NMeN/58H1PqlWh7QfkhdUKhdZNW9VAq59nJ2ayE+YZ5UPG5ieGLwgvWfqMeA4hnaXAS0D64/VP4Az46fXzlgeU7TqKhdqCottOebCVPOqpW+VZNtKiAeatAsf0AjUVtJpB5g3LJFL5T1cEVW6LOTDXT4T1HIYwoeeegoCpI7VBkf2qPHAMfv8BeRQ+9uHDMWQbdHer5wp0YlOWU8bOjIzf/l////XMOX5k/ZGdSq9LLf32cW7svA9T+BOXp0SCE6gm4F/e2WmvCSQQ5NZyoL2mU2hEvoKNwnmhEX6FNFoFYbDzWMwrjO6aaxVRPuyaDlMf1LiLNB5Z2eirRXJvN57Q1dvbRcB3g+DsSlFstJYbGA+kLv89evRfthYPArXc2Gi3vEC/ZDsgiEtNjJEtT0rcvdxk+e7E0VqMLDVREAfskv0CJxDV0Wbm/VBSWakS6l0SuHu3x3uV0PZZCCWZ90ebIavAH2bMXkdOzZJpZJJJop07gMHoTMNDa3QadN4ANT1IXujcQbSmqyvO06ALoZQn6UAQHWthcWvo7NPiQOANuxe6/ecfAnTgq9Id18inBm0n9xXdUL795Rgthsa0i0NafFtKW3JrSiswfnqYUE8k+7eh+vHlIP+gy3kiF4gZgYO0cGO05V42OR470YmIIkWS4IYJC3I8fVOMZSNDTcNbhEMu3svvRflF3lO3sQhnQmqTxhjLTWxSvMVTZnh0OKJzwmKxYO+Ntmw0UUM45muuqI0rgxYvBjKiHJNB4dwpCBLd2d7/vtpd7HwwGahBQ45V3M/J1+IxtSFbDWmATFi3snlTcEoDmGj0K/JIve+R4lc80dAApXT6Zz0U7wM5niBwyuuzmdoJ5I17HYvfil4Ydd6xZ3nhzUhRXa9X8n1eBxCiGq4Q6kR9S7ALa8C9tZ4rp5XL4TDiOvV6s2bvu6YW4Usq/mqQtad6bkJGF2VEgyhQnIGMdlXellqw3XLdbSiSnqACDfhfC4pygv3jl2EUWU7Z5Sr7BjVobYSb4qweBco5Gon2Edl+uuRelEViS/o8033sVxTFaAixLLHccd1OqwiXLBkHFNbbJSV9+iQRO3bv8M78j+gBb+NKxvnP66z3dCTnu+9NPRDBcagFYrj/zse9VmVP4oirI65UldJPJy/pjCuzDswGx5KE8a13LSMb4gELFpw/3/cdDm3ue9rs9YcQG5eF9o5j/bW85meBIv2yrKmrgJFRDmKj/71FEvuNyV1kNvU2XVJOhx9JeAsbDWIzywsYtFCrMnRgR4vXgafQFuT5L1/AyRzW4n88VodlNFMxE7emj6Z2OLICvlTCXkeiYzayPYU1TFlldFSvwwoJpxiNCIct47/ulqY02wkDi0zUzdpERBa3hIkxvVNuT4x8WddxnDnpehx5w3tZnHe4k8OiIbgaQvRaZpXvFbY+clAu/9BQ3fChHMiBd6L9N5ks1x/I/d9X8arei10Oeumu5szXAZYBjmnA2Ppgyw0beON8QuQX1A2FhYIcJrCQCau9rECHlbWJVdak66SjBvE8M+4zOvhb8GHRx7ErBLXb4QvnkO2003ivoRu2N8ZwXndNZPuFc+0fXp1+j61FFLe3FweL6Ag67IrTHxaRG2uwFKdPWQHFVtWvtrln1dgDNQ0IKO/09Dygq9iG8PQwaXNu5Xl4wHtxoofnjUJvMM8CUoO5+SaFcfGFJvnc4FQMFKvVLhnntSHgNceOtyDWII4fD0eMbhYIKBvhcIY/HXJOmDF1PmQ3uAh6aTMm72rEjyzm9RoFN2GZfk7gJwAB3qfbry08C4o9PsuI5jBgcaBJIELC4OBHR3SwvpBD7l5baDf/6PkR1Ml1RGe2exURbo5/lu/sZZuFa5uD757fzdsXrnnuuxdMjma88fN7kxbkEJDqb2Ybxv9jvDan+FPSoEJ6Vd91vxtUvW4E+HfsNidP7lbjBf+KedWetu621YE8MewEeq/+vu/b0xEt6pb7LZR2mJGajgZ880M8dHJ6qLfn1yDwmcnqZqB7kPfPCYXHIdP4Wy9NUT3EEzEW+xHtC5v2//eFuP/+cmQMJh8+AcMRGGTUJf1+EEJraIWzYZTy28MnLXTmM0p59PB2msXoxx+QZ/a/sfmppxX3bO7x4/ZN1RIoNRWIgUQlCcR7JUAsPRXub7ei0JjaaEEAPZb6xHHCaYZCnXMadXpCpd52GjmfZAfNKVZ9Wzn1Ll1qoq0cQ9FwYtlxbBAtdSzqivCaw8BMBkJTX6+BiFJGaBgRmMJv/OPH54+g9U1ifWKkDkVvYGsDpDHUZ6KHnRcghOqIpvsRbqeHDEOn3SLuX+2r53bf0kPwzHLA8pnAw/K+W/x37KsI1BmcAXcGFTGg5NJbqAPUFvp9cLuswQpS7DY5vbnmBRnSW/TfHuN/pccFjFNuXIbeoYXBBVxGi4OewXVr2BJTgMYujWZdSLFdcvvKtnskeosEXFcjTVeq6Eu+qwchPd2N2wIGBieAQOm4u1eV351Q2CXjB6538pt+8r7K+FGW0nuvMCLberVjobosnB5tO6XczM+/2dOPVlWNsrvZEgDCbpoIuMl64muBMJySwfDlpkOuMP7PH7Hkhvn7z49Nr+2/Kv6PU+uHKKMC1IbzDvF4wJtmeQNelneWgP4AfAehBwDRttmfKeMXWwkqjRa/v6KvlqA0qL9e7LhO0QgHkM3IAS7dGB4Fxnoh/vKBzXOU8PH0BcwRysSN4VSzBmS+h3RIYgbmHNh92aEh2FgFHMdt45NfPc+QzZx42S7u+HzPHa6wUJhXovcfwLBqprtqB+rrhx/kmEe+/UeqQsn4amxu6iK3bbGRu+gboMLmrgKqUiEk8sBCc7thYDTZoyi5f3BBiFRxaAJNQWl6fVqwUMcAEUtE2fq9y2ipaRQVBedH8CyalvoD/dzNU7rYJv3xFNCYR9qtzzFgfNe+br8WOazfcXN3e+YwuYcOkG3VjYBfo25c4lLhWu1a4SIZN6y6yxkLK9pRiw6WRII4U9olMS5GHcRV4w6iJL3gtLfqHNQxOjjV5L5jP5zS4EhiK59Kd3gsCwVRwqbzZ6cCrG/84pP3JMwH3+EqXL5ft5ufT5VSEQd19GPf1iGsTTDYD9tqbV+DpaCfJWX1gPcYQV9jXDNeYNJkSaCfu7UZeTyXKJM5Kj7v95RTx7adFzaBKAmf2NeVrq6fDozm2TJIRgFve6TlFE2xxUax1S4ZE8u3UHJUca5ptACpF2WSW6nNC9eG52krT37myC675DZRZD050lb+DtSXBmnb/tgkywk+pJYDnCDe7sUkBnnInJUO3sJuFvU7LmOTQhfwB14sj7MX2Y/h8UZ5ebQskjUX6xFFUD+5ruQ/+TLIHQevZRVhbh23tJNNQ6+Y5tas+VoNjfJNMGuKDMx4cmtXA/YB24+Ku2qZdO8BHJD2rvaSxt/1E6r3c5cnZc88z0GrIFcJJ4GyKV5UnjEk7vFKfwsmufbwtoWZx9POTTKL5MtcSt4bYErIwSTE132kTybxbnbkRZ/3EI6TFMOC9ER02QiGMXEORLBhQeAgc6Q7QvnpnmnMygBXW07yRzEmTAcEnFKbqtc8lg2chHiu/5Pfl/rOutLrOMCVPRU66TZpu9CcHnngXBFblDLXHHWg+0p4XfQmYCAlCNLoFDiebubEjhsv9ej0MJxSwiREhAseHjNwg/i4gwN+0jnazisISAG9z3IgHHMsDD7cdJIvxDfdsR3P1s6iwzLZdz2N9jDwMO2KDy0Q7HSlFY6ECOfD3JkOloDUOkubJog37g66+MsbMenqid3syX1B4RNmDtAbmvmRVf1j2rkTQqbEDyU+68sS/RTqzIZTvugF+jl6uTZ23OlVG23l5M5hJNQ0mYl82yJMY6iAzpPMuCSqv22TiATxbX/R4nMCbW9NphE60LzL6BJvP+4yThA/R+oLCrmzZIg/Q/n+7n04JNXuNnXRjfrwkhQ5ZmpB0MQqAQ70uIpnxmygIA/09gE8c9LGMWbc5xE5xJEiaU6FZJCe2lzPRKNLjRIi1kdgKG3D/pvXgUiiUzzOxXX0DdH2Nsp/+Me2qce4uY0+IWK0ae5ANY0O94H6zSIUL7fj+m7j4ZekpofyJkmqhNiSHrR9NoxBcKklxJsR7yeR1dFD1ysfVbZRtuKvYVn6jQl2Pa1u4/1qD2QkiHdLcRWV9PXxjKQt8+sGSDomSomslSIOGPqIA/R5PtYImrcaC3Y0iGlMH3P1itsQka2VCWv2OtBAfKBfMD0E8VyEj3bzY8Dob+6OvpD/mzAUwDd1HPiKBDzz8kduCCA1fmybvXKohuz/E7Xt/NqLQ3wwQ/GJ6MjbD9Do8Mj+K0bH8wE4mkBmaP/YBVywiwD4mnkfeGYTGUDe3UnARwxaUNT3bdOUSL2KAEvg2M/AsPEjLAcn67r7ORAI/Jywwvy83LR6fT4MUw0BZUcBqlsx8CFUl3wEsgs+jOo9B+l+56OY+c9HowbYx1MHBpNDAqcwolpIQAsxbL+gi7VUsXU6bfqD/Sg0blfiZ/7HmLomvKQy0fWfaBgibOZ7f12aQhKr4WNwbCjFgov9gtej6PK3p/QWrY1H5vpwggZoIYbtFr6ssrX01tcp9sD/YD8KDcZOly/7H2PqJx5eHp9T+D75lmqnuhjneX9dUE0hjWWr58gHqoZSLDi92i94PQqH6m9PuytLaflH+ZH6qYGvfbvcNibL/0LBFGXZ2nkmeVe3x+vzA4gw+ZUMfVGhU1UqbazzQRjFSZrlRVnVTdv1wzjNy7rtx3ndz/v9AAjBP1aHn/mLxLONifSzNllxvCBKb2KWp2q68Twxettxf3b0AxSEUZykWV6UVd20XT+M07ys236c1/283w+AEIygGE6QFM2wHC+Ikqy8soeqG8/i3R3bcT0/CKM4SbO8KKu6abt+GKd5+YOw7u72h+PpfLne8AQiiUyh0ugMJovN4fL4AqFI7Pml25LJtbSv7tJB/tBMwRuzudgO1ByO07HlupMvSmhRD/15p/Xy3EgK4ySTuOEMGwFlnmxMMQiWMqEVQcaeaaMJkGXLsC7RmyVxI7Z6MM1fTrQoy++ic8ieSqsOSV/d8CmXp100JloyZFxpCH8cCFF9tPrMeIutGbpuo/tkB4J3Wl6oZ5jlk+ZsTNCcGr39RuF9xv7h1nxmweX15K+vJLegUOlwrvAZpqJ9aMKNd9OSb0O8UwvCKXhWWTKu+6c4Xjc79AOLJibjVAsaLlxwPNufYt4Re7a3FFttkQ2GsFyK6WbGWnMkFEBjBFBjm7AurDwns6iciBeuZOLjrlWpFu/gQ5vLXLxETJ/2LucldX+WyrJkeb5I48Nh8+ibQwqTj8ioOX1Sw4e6pLSiHJJIR7GdGrTnl93FqqwZSvFCOc6jMR6N5dRztiZcBXI4EOWu5pTdETV8r4xYPcYOqZ0M1Iz6PB8yFWBZcrN216hjIKir58345V60wkPuUoEinHFzwO7eDs2JsCdpqjIpZJ3zAr9r1TVRWbjEECDR7iMFSxH1k8bLJxVEHZgyUgCZBj6JAsu4Fawee5s5HT6ZfECmdIqKegsoOglC/0zJQAAFo07pPAWouhaIFniwH2U7ErVzgYyBSKpwE/LGq2t3rEQDYlJfXeokwGbtRWMagrd5S3FMmtEvfPV0RttXVhP00QgyNZWmULkKPDVwgXrMGUa6Nqdh0qBCyjYstQkmtAAjAXvZgIZJBi7b7v2FhBKtExYJ5a4Hu+d1oxRq/iK2eki0oPeEj1OWneh3JryGGVrlvdqOpOqOwGz6+CWn3u/T/a3IJ3FBevI1zIBdukX8BL4ds1y7rUtSRbnjDP1etwvSN1HUdbC5r8ddUqyiwiFBmxNv9RpmfXt10aJDAFX5oH5CNdHabugdixB1rUtLYdnmKXwcTy3yTOLZGQJzetKitZgpIPjoLzMF1Ton0NRLyhu6dNyiQUuG6GMlWO60RaOWzTX67usKiuFECGN5oxXp5rRsZAG14Eyuzsqi0lcsIXbhZXfE6EcNZIbQMe0oYAQgasNMBz3b7BUkHTFTg0RHoQhMlFZGGU/ejdeMfwpLflT1HFiEd7znbVfdav94mdP3O1MIyQDLftKTl4cVRG0qHVMl62E/A27D/FIprv6AhPMnZyCtkyiY2+6pcPhsG04nYIZDR726wQ2tPPykY/qi72XWgLJd/QA7GNW5ClDzf93Ax5/xDwF6LH+Ojcb7g0HTgZkhDLg1su2qLt5SbLB98Sv0n7jS8XkU1BIX6/wZHi1U+twvu9VQ3N3+DwAAAA==') format('woff2');
+}
+
+/* #endif */
+
+/* 支付宝，百度，头条小程序目前读取大的本地字体文件，导致无法显示图标，故用在线加载的方式-2020-05-12 */
+/* #ifndef APP-PLUS */
+@font-face {
+	font-family: "uicon-iconfont";
+	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384');
+	/* IE9 */
+	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384#iefix') format('embedded-opentype'),
+		/* IE6-IE8 */
+		url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAGQYAAsAAAAAw2gAAGPEAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCdAAqCv3SB/XABNgIkA4ZoC4M2AAQgBYRtB5cNG+OfdYacxwEA9eYzEqHbAaXC+ZFZWS8oKTr7/09LKmNsu7DdEEVL04JkStgZyOKZ/ILQ2JzQooY+O2mlDm88cwprtIUJRYoVp8q1MEe1Ow/WIUjUNfnNH9HJV5m92kW8dnj/3pEhB8aSgR+4kj24yOevPzf/ix2t5Ij79FHJAsd5EFJ2EoByUZPNHtWZ1VUw8TCKNsPzc+v9/WVQI8dGjhpsRMkSRg/YRimMGiDhCBkIyggFLMAzAAsVA/BOjAJUrBMVFTk9PQUPK0D0ro1REM/4bck0GjGLMBKwOzEqMDrm/+DNvwEAhTsoAAkoYGpB7e4LMInq4Z7d2/lSHmrkiVCowgFOGC/4BjLdjqZBMK9fkWmEJpgKgx8EK9nAPEPOk30pNCLq0BlSKNLexDrvFnL/EBcKlB/2YPqlzm92rMBKbxWxIXacD0TdMTTllTdfbtWnkEtVgBUaVkW6e6oqLSvgq84luVauJUGaMQg240CPmETe+8e/tZabTzHZvWtZycoqHH//BQBFFJvYg6cSCAPK0P/lViVvbmTWIzDi0N0rLjdoVkyOXJIrXJMg1hJIpYJpuwL9q2rensSOdFq7rfav29kR3LEgWD1R08h27tjxMauRWqk1yAqQxIEnxwk/k9Xvp4mNJ5uJLShAeP9ebatUY0naCgW0UITh59azOqqoboMT35k+wU5MV6BC/qWqJ5UnA9vtHQlfnOYXH0EGqAuWT9o/uCI/R6qH5JFb21r+/3mKC2j3fzlyPaQSlCkmTghdBueFPOIgIuD/pjV7uSVUtRJH3r1Qi793yiERbvfPn1kmfye50j+ht+xRakKdXWpRyFaEW2p3vgqDx5kmUV5C/ceN8zDBBaE/Jw+cu0rV+oKmNmRq88X0i/W3q7b+l373+kzPkBYGICUCkGiCVIIo+wTKgQBlF0E6BXIjpfPl9IoRIB0I0nsFUA6kfAHcKG6W9/JrN1/Mz5Ce9/jc+327ryVoKss14vz/aVtEFGJxKA6zw9isAcvQsULlmCICMkSMr7y8H5v/3H7HKsRIsIE7JNR0v68Ola+NidPXgYK7d4y5/kTrx1YiH3ACHY721PpPEwB52aopNP+2724kpHhSAITxv1FDjHzpgDzZMsCCoCevzA4ZdNuGwWaub2JsOr5/+GfTAhbIQEXxzM4jWww363cwcBfD37CDtobhdX241wMioCayVW4+bY0NiYeueRB+9rkNjZPR3SzDmPy+DZuAipEDJ95srvX1+/VHZ73km/Ct/p2utNSVpqu82hqCBAuZNq+8ATmVfJVWWHeYbwS/04tPTM/uwnx5/WrZyVW5K5oTo3NVqPm14m2BMjTemmu9rddzuzLfe3tb7nMPuIeaD4waumN34v8dT1ljigt5jIEn4Cl4Bp6D5ra9AG3NcPfedF1NNsxLUJuXzqNjHXsFxnkN7h/femLnVG/A/n11YXjrmqOdt2C8CXIrtGdHJTfBu2Cm98D7IK87oI0PwYGTB7d/BKbooLKD+cRp72PwCfgUPJjtMzDN5ocTVRGvs6Za+Bx8Ab4ErbS26yswyKFJmhmlgAJ7RxhpsHpyne6mux7O9NRLF7310VdL/fQ3QBlk9lgsrTBPIVaoHNDQMdRZoDhTZtCYLJhDgOkttEgOhiVZjcuWr1i5qiSi1jWlrF23fsPGoarqPdJQmPaAzQefgK8sZ8+dH+jCxUuXr1y9dv3GzVu37zTWRAX+AgQKEixEKFdcbtx5AINyGjgWYHT9vvZfIDCqgylAED4WAqOAYHwChMSnQCh8BoTG50AYfAGExVaEw53C40sgAnYgIs4mEt4TGe+LgrOIij2IhtOIjiOJga+ATLA2kCnWATLD7TLH47LACcTEE7LE10BWOJGs8Q2QDT6QLZ6UHe4QC0/JHveIjTOIg2+BHPCgHPGAnLAukDNGALlgPSBX3Ccuzic37Eju+A7IAyeRJ04mL4wE4uF48sZc+eBu8bESkADfA/niByA/nEP++BEoAD8BBWI0UBB+BgrG9hSCX4BC8ZAW4WmF4WEJcZdE+BVIjNNJgp1JipWBZHhG4RgDFIFdSI6dKBK/AUXhd6Bo/AEUgw8Vi/MoDn8CxeNMUuA2JeAjJeIUSsIqQErsSirsRmrMoWRsTSn4CygVfwOl4R+gdGxLi7EdLcG9ysC/QJmPNw0eURZOpWxsSTk4lnIxDigPx5EW9yv/nFXgqND5XUthfaAiHEXFeFYl2JNKsRctw96kw3Mqwz5Ujn2pArtTJfaj5difqnAA6bENVeNAqsFBtAIHUy2WBarDeKCVWA5oFaYC1WNJIAMuoAZcSI2YANSEpYCaMRFoNVYEWoNJQC2YDNSKhYDacBGtxcW0DgsDrcciQBuwKNBGDAdqxxJAHVgcqBOLAW3CYKAfMARoM86lLbiEtuJS2oZhQD24TNtxuXZgKFAvrtAeXKk+XKX9uFoHcI0O4lodwtJA/RgLNIDrNIjrNYRlgI7iBh3DjTqDm3QWN2sYt2gUR9AvWBXoBR7VOzxmPozNgflIbAHMx82tPbwZJFOzvJzMNDmb6fIyM8Q3M5VgDlereV4PzAv63byo53AICxLwkgUqvGyBel5RqXlVOvOays3rWmHeUK15Uw3mLa0289Ri3labeUdrzbv6yczSFTNb/8MKwIAcGwADKmwIDOTORsozG0trNlG+2VQVZjNVmtVUY1bXCrOG1pk1tcEfawH4D2DQdYP/N20SmD0zvuG/kuhhSdB/fz0IEhYaHmrTyNGHgpHDaUQyEvylEiPhpvAsgAdcUqDhBAzjoxDBamWWHEXLRUk3zQIxJnRqcWaNC1AmhIpAAVyaA7hpHlAPTAEsEAikPkuF4ArAbE4NKENRV7oFAztaGpkyLioJfbF3cbQNo6FblBgH+xgUe1gRDVZjE0h+jmFKOA1ZH2aGqUo1CNuTLdrewl6g5gToj+dRS0ckZ5JyNwz5Vguh2Wa0tKjj/kJ0Pi8Q8yPlTocrnq4hEa3FCDocKYsubQ9jkix6OMlKQVSKzZhMfyUP+hh8LpsQPaxNgRhujI5YpMtinZ4414eSNeBbw1Ls6Gp2amgIjjunapxZgSPKLKeXY1BBiz3kxFjZLCmGrd20fav4lvWoCFiF0i7H/rBPPxcbTXmpffcEi0en9a4TrZ3b29250myHaYrEbXJ2IQIbKp61FYJT8MxSGdedJsFuVe2162qscnZbu93dHb9dtt/tHxOSmhwU4liXKB6sThZdbqZB68SUGFIUHO9hC4V931S2mW42m7B+S/EEgYKUJasluMCKgWG0syNq01mLLImeKX+CQedh0gE8PQ1oajBrg1UqguHfLBI4fLvEHTNqQ01rZq/1J39onmem5XFG2PmFXDN/f7C8Zl/Cq6X+CZJlshonJDsrE/AIu0EMC9sGlTQsLrgq4vVMLdh5NKgO4rC/QGaKWGIacOw8l5RuOgcchkMH1+90IOa/2N+azrACjLEvwNZsit0UF7BcoRWCbK67FLt24V0TPbgcxG39QNk1uUNKGPRZcS7Y7J5ktZljwx4ATLywmxph7hHqvPNfk+GdpPwQNMgQwXQYO54MZiiwuRQE2xAwOQgOAqGgE/RQl5+FfF7eDYfm2jFIhuuoz9XThdADbICBfGs1rTkfbCtCEhxC5FEhFdA8I68xxB3fDFU9JZjRqUMNKcPlXD7pCm4sIH8q20pngJRErVfT2Iahf+8X8Lvg3AOBsOtwuevJxeXm2SYvAbmlbDkExXPQNDIWTadUAEa98rqioP2RNAsLylBYAMEHqJgBVgaLpgzMHbjbBA2L39wEpEXjzCY7s00W1LgT1EwRxSjjxoJ/oFoKjHPON5aDfedhXl8dmckO1uIN10j1HFmyxd2SFOnC0Vh9kVKwrAGJr0OuGlYpYquJrxYtQ2mlzzGVcVCL8swKGkTQ64kagF8j100W718Q8VopCopjK6C4i689URK20A+IJnQuzXMmR52pWYXM9Hpi04bbbujXXkyI4rNVaAWkKSDXORDJu/7z0pirFs1kEmQzXpT6cfjEUGba5thBeu5/cVtb3kINXO93sNeGlXdWDqW8Hfe6osCwCoqrx2W+Y7uOkVA5lLKlGFBqiITEw/FVPIzO4oLVG5FIN0RNBuV1nGh7JMPZTXV5Ho4HjtjKUErsFtxU6QAwTFvFtdCrDy/vjtdR1yFyq7L59XcVnfG+Rx8fNugzG5n4hSR8dfVxQtOPLXnV3U7typyHRy8KvUrEizAGooABJbOhIKbfJpjGMVh3UtTP7zGK1rIRZfTb3Lsw1r2mC4I6QtKc6cFxOj0gJi8doJz3ht3QfkJJ1wL/kAGhczPEyF41Y2VGn1I5pc51d/6ovdWl/R++PzjbHq1PH8agTYWXvDKFjYlQtx/giou9Kijc3D51Ry9CZgqZoq2SRhVnwZlZRRRgBmkvlgBUl9aIk4EYz0Ld31USbuBrAuX2cHRLqLkvaB/EQt/dhAhuSvI+lWsRSEvUWC1eFNI9VBWo8ByVBbcPhCMpx9csfloGoIYWdabz1qC15pKm5GcSYKDyBZPDbdrU6okbWL/G04cmkqLK7na4JW3mTtSQ1lp4KzldOg7Q+7J3YEJwv/wuuru5bNkSevbx0X4pjyaLxzTIFpb2bTClTaYAK5VDU4gwIQ0oaMJgscXpMtSQPWSJnFlqSYHUQjHGOGRKUH8O36cNr9+SoNKjs5XxSJ5Ky+n2FS3j8cepyIBkSzCnH/K07s6pmXizamV/7UUOgEJDBqRBqHOygXBIIVHwVooRWC7qBIzPMuxeDuU5bMWvt3V8Ap51RNVMI+ghOGnGhok7t75QDbfX+hlVr7KXA93sSUUvdVq8g4hMktX8uiXrkdWyjmawkwnROjZ/yWSORHT1kZOeOU918lDEm08fmk5fQovOZw48n6lB0JwiejPCVQHNy+Yi3nStRNdRYsk3/KCdyzDOBPdT3RcSEWTnMhc1KtuAJeNCExCwxbvSEd+EWSLpqAokpBRDybILw0GWJ5WICLUxnrU3v70ZJFQ6snWeJKejBykXDXRK7poBRMxK96reuvm9SPI/uFVG+LeyL1wIiFdJFAobVU4sITsEjSkVvZSt9hFPFAmCMGfPWo+WrkRm1j/ICLuKrhjPMQCAxQTKRWMjcRloQoArUYtA9LrztibHkNO7kgft3xgnNF1DGixWcOCk/e6DuVeL37stucRVKA/8tjsTiaXlZu7soX8nyS/8SmuVRmdrVllccLKGEN7vqCrtcczv14jfmVyQykAf3ig1GTo1M8FzhXwRSOzZwpns4LloG9+SyHQgpVxK5LcGVeV6pUQuJDV6UqZP5MkoIO0/JAKD/mzgNHlCvngeFWPrYIiGTcW9SEAwPFJGZ6TF+fgrVBZjsLkB8oTbAUODXA/7t+eKQiDtdeVpWOCq06nj9NZEmQio7UC7ockeAm2JYyQQaaNj8MbMoZqyT4S40BUhJ5uwQyw3OepOW1Q2rITt1Hg3eCuYEDuDTlIiEoYSMSjSVHju3rK8Uj2/kPfI72reEEn5D77TsyRz46rb4Fwc49qev2NsROWSHfmmHx37briuXDtZPWbFaIaLrcdcUJnH1U2G8dkk24tVhjReHe3rCwhsStxxo6p1qZ5LW+u1kvD+DTsrFg4DdfyQCrTDuzdHOz6DNoWyqXOoncD8KLT+C8pNiqE0DdeyTpqd6z2CJn5jBu8mzsXQA4U0spwOkrV6VaYE3+8guIKg0kAD1yJoh6/vRtCpKHpfFxKlhjI5PlM5Nk6lDuQUPIkNdEWaXk/i9tdWDppsyTsM9t29y+sA7BtYHER5q2gbOYvRtmZjbLgnghKmHeSXKhrKGznO7v1Eg7jmvq4svo1Wl0/E20tH9qGyx5eeVJtr275eqrjRPVcplxx1P7Cq5W7s0FP/lsU8hM3qRNNylTBTwnbYbc0a5+ldB5M8UxzyV0VQ2r2Wg4zfxR3GBMGon5T36dCTMsX4GiqF/2wXk3OhUJR6gtdB19zBwOF5L7zh/8rK8dSB8rJGolYqjTme+17uQDY7tl/rLMiR+mJwqEUbS09a55yo2r4QRFC27tgamxxwCXrHW2OjKwwyZhwJVkQHojOMhCbV+OtExBzqWz144bIAwPXJWSDl9V/AT3gt/FvV9DLpa4kkcYPK75GNRA1aDiHjMMPATTRifViXHA909in81q1XvX+wfHiN61JXFECEqzYQEfv/HDFYFFItyUjz4zKqm7ovloZwWPTQH71LMd61qsNBMTe7JemSwyHp4larXRNCn7NMfu4U+NORlgAJjug7eX/XAHRQQxoCfDGwzf5gri3/qvYmu7pPq5YEDVaz+2trZMgC7pVtVTd2HRgFfPM2kY25Ll6SOc3Q2RIFUZaVzcL54q+Ozo4NM1XwLvi2osPGiWJUn9QSdlnqyZgbcO9yM4yiNIMijGdQ2zBUHF4UV6om7EWCKS5wS/J3xb8d+SONy9jOLvu2JoP60VwkMQN07ZQ5qqpMcd+CE4QRPn+dX0mvvNZkpVdfQfhPev1V0Z36wWachYYQ3eRmvw0y5MasO0b1iibPof8wcWiEbOXhB4XAP4S+B49q+gJmXzNGTQqCDxbw5WD66y/fHrPfyuT7YW7l8KdnE4Ps4t73zz+61KxOMOujxFj2aTTFe7gnp7kgABgVsD10CvwGqmAErcCqtHZWG+BT5s+IIwhUDu4iJAp4v4qLHTwU5tngUJrx4C5XWBI23qzM6zIhlfuU7P1CPqfrZ+QDVmmC4NoKNzL1OD2aSWC06s0Wn0fqZSMduphiyNC+okatppSEAPWk8qD+oix8EYiCJd+LNRAbStUos1rq14goRTgeVh4i0l4+RWmMVWQEJEhBtL4II0We6UBxmCHgYSS+LBCQU8pQbV3TwVaX+wVBsQ+CD091vUEfaANTl4fgzGu/c4rlFhh5y2Q07snSbzpu5QJgNLSolAGsz6U/0ZOhppppp0fLAwFMVBlmnVJFptBgpmVKGECEzg3aOPJmH1hIpGl91Lks8E+gcjD64gSTrluWWAARj6UXHhQnDNuB7keTt0mgXKCeVVsHBa0uFyMaKifSUUCyd020gBEpAb6cmV5IqOJ6xtw4G2jPFbVgdh94xis61hMVglUA7TV5Les9yNoiyN47XnFo5mqwv2Lglp5uzMELnNQ8kG3j/b3t+IjFV9cFIGsHsutjg6YbFMqPW13VdIxED5cwOv8Em0DAIUcRoon26OQP923iA49DobDctXYKxcR3AKUJsEnfYIiAn4NKPVZ25AZ2olE50nWtLWP/kn+rSQF84pbKtRCV+d0BLBrgJWuQ4Rh168LgfjctiRyqQ1nj+noGt/yUwhg5HkeEy4dwIc7Cvlm6ytQZ8L0D7/xRjz0whoJnHH5CH3tndWVoqNwmaLzQysMQvA+24yGzYD4ZwCbfT+thJ8klKI0fJlDw1RwxKDKWLUZCNoPssMf0o2Ws2PfiDG3cvgcILQ38kCGuiVAMWNZtfhAopddem+UJQj4OntsYGkIChGZlSC/o/UnkTV3yEDKDJBvAqAyZDcg7JPlmB3z/NuQx0bF3Ifcg98jZltCjGDAGpPw4QEwRwfgSJYvjatCyzG8y1NlMxL4o5HikxKOlh1VYlTzj9mnkl9RBc4ahQtI0wyMFXYJMc0Pge/jcwBPdRCLc+aJU3CWaqstAufCIeomrsJ1AFGY6/mwHPahHVh/xmfX2SZhV6gYEJhinHPjs/DwX2d77BhWFhvFvVr4jSuh3oin6ljQRfvjP+b/SlEj5odhpCCi4ehNhzBhLdLnKEP7BjR+Zhd/Y2SFIcV1rgKJwye1srRKZ5bHOxzNG2hgGxC+/0+P80WKyfY+qQZdbpRXue1R2KxSl2i00ZKA6kHU43MWiqyeAPwoAVbMwHnjk+CI3aPO5jrmHJGp++vAeWjEqU/aSkkip4n42UurvLMWqP+J+riFu6uxlpQlxxlpQGH9ZjptOKfaG0P9VeAyeGC+iqds18Q30QM2KhCXhHrokaLjPkmX8OKlSFU1D81hxS/d3AKcw3Ap0SgT6j9kX6AoW0VZCUSnE4w+jhJSm5m5EMFCP4V/I8RHzC0F+INjYCIVklYlSuUqNclnUOgtEmcoeWhwgldjKqhRP+plqNmICWyZufBov1/ZAsZQGuZP+nhwDvPJMeX8cwuo6oJfX6hV2FD9941s1rBQ6n7DAdI15y6+X74vQHtP5ytb3r8nJtZmaC5EcaBSLaANCXkwDKznaqFDKRwdl7b/Pu6So1X090akA1oTr0bEENqZmibeYBhvSUtw2gilHjQyl2Q/cuv6S4630xlYF8z9rkB+ZTDEvphEaVKZmMiwayg4SIHlhApIxEVX4q1ESoY0xg7pnKHauYTLwYkOFumLLuB/Iu8D5SIa+wZToNxJPGONdZEoLIv1xLjIJNo4K0wOHhjVjcmxHSsnOjO44yPwj5lpLOwJpINT8kWjT4WNwePOXADWeUepOyYP9ByhwoN7FZsU2vYcAGo3sJjEbT06dnVOKBwADocztZ50ekLFu25iQ5Ey6luygQRVUSxkZPZCg0hgd0l7xc+zFjiS+I5iWDIKxL7EIhwrcS5BLGgwiGJcPxj4e5h42pMjDLM8WQ5Te9YVf2TORuKL1oBck8gYY9kPWfPh55ynVii+ZI6T8vOnXgUQWJAINiPj1rkcDLdj7xI8xVSJI/NNdT6bR+QZO/q6sRMc7x+CifRr9ksSc57WoDOisla8Sm+VicLG9W/Wjn2SSQInxS52bIq7igDSTqCiS6g6VHv9GSh+Lb9KFgt3EbcE5lf6pSRWuDNsnzVFrsLoectCnXeOq4X3Wtd37AxxkO2o6QBGAhR09CkBMpESSRyN0OsDQBsIWCXWU5qDWewgqIxXQDp7q5uc6oYaeCF6zpjBCUZKGSLikTk1DZNb3f2khif0PTQCePvgV5Ap88EtMcUnEsBjxRbl4VX78/181nbbsAnR9pO7l1ns+4dY09vyk6xNJ8uOKcyT8X3j38KQ3OMgMhBqudT8NtadUCaoOwAiFAmttJC2uOHkMFtcGzl2JFqHtf7iaR6Ee1CBYFfz4TmjoWh1NwhNxWnKAdyozJ3DJvXD0O5jvA/UbJ7O2zR7j/Ma8zXWelB8Hxu9VnIEZ8K3Qp7FU0K03UoNmpzm2V9ewkctSvh8tvztZHP1WcN9gTxJMBBXiiieN5HX0qAX3WdJmM+Cg+LXLLHUMM9J4NZU0EKDQ5y3ZSXaKnUwHeVGVcW+O6GuWtgWa68FueXHPdCv1btld9de9DVs237UXFSFPu7C2uY2a5BZpyXzPt+HE/PDojq2sfzO5V6+zitZovjspcwG10LYGLRyDsUXeFKi3MbWuv1jnV1mTymNokNXj5kyegqNFKpKiAH2bwMAB+jQLxqlREBxqBU4rQuZO7Nw3IsBTeyICjSb2xEpzCKXOuH9doTUNshIBYRghJGAQprcbSgwtnlWe1jEiDCSUW7pbG/4lNn6P9a9b2B+ROjE61602C3dJuEmRBMAmafG96cuBzIpBn8bcs5OHfJulnFHMDqImCr8FPE019EJolMQNWebj+MZgdaooJdzqmaYUAxj8EVvi4gte1c/Pv0BmhKSZeipETqYs0wgMutcyaWGzQcNoCoU0I4zxFoTcm/dmQXdCSIOJGWzxZSV8PjSjyUnaC8qWLmSJG4Rrg5K/v3gz4kHcDkl5eHvGMDncEPfowxkgQqQT5mJ/PE27QqW1cQlV2Fg5L7h8VwqMyUIgZJS9nxfNewC06r/osk+IKyHWbu2QEc0ix2rrUW/m2ClM92zwr67lWnsuOEjI2RPNKgLrK9gIobDYqVy/rKxMn98GQTE/vv6tTo88CuGgHf0dlTVnXmwN+tijuS1roWz7DLDkRm3HOZxzM52Vc2nizruHB4UWrp0ZOwDgEu0h/skNdMNDwAx12D+iIWCajOMqiQYOwJNJhmAnBcO9wKkZQBWKPr+1bM5cOYHENjJ22vnLstPaVCU0g7lPud7tFppO5waQFjnIpfszDqTOuSTivW5XkerIsnjSvaGjIitzG892JwZ3cgO6i8c81IBKRWncjRQluGbU024NcCuNUqXf5gWbskkW28kBD971BIf2baAQbAJ5SjmXJqvLg48Ojg4gw8UbbsDOnfTgMw8rt8JmrjRpbeXyCoBWbe/7gBdPk243O1n1bNRaYwQ8y5GcMNYtBBL8FO/9T4Y7nXJebV/NIp4I+52EjYDu0B6l4gMPvKaq+LhSuMUdxE35PjcwYumtF0mKqNyHpjR4uglKPRtvex4WWLGMvJkqC6j48dwwjyWAxsGtiBLMEW3OOiWbKpZuVqTy27tLYK02PZluf9ZmJmDR3F2c4EjQVKwm75MPbusDCmQm3+JIN8OZqN238yGmXxqt2zvX+uMfHWQCSXNvSIMg2qnlU2htZUhlD6DuC4Q2cSGl6eOaT7Xj0cD2XdgHt5/7PGH4j8HFE73l/JZ9miWbCWm8//5Hnrd03uczmEBhI5O9/f27WdLYMMXGlvUbOToh11ztPEsX7zDLTQz7XO0H7+ygAm2xwzomNvZQQ5EgPXfbmD7+yZOfjR+UV8kWINsavhmQ1qMvbClbh57CRndTbytt/t+IlUM2cxsPPBrw83rbYUIveu0shyQDbG37gEOgv/NUZB7SrdcNOiIz/vTx4zP/i8+OqiKV01kK39MSzxiz/74i4ByvAwlB4LQM96HxCa2tJ2Z7P9y742U3IKkc3JyHDolnzESo9pSEqfOAbgMYPEq+sVD8goApBR5iZ0Th/0rQ+Qo1KhI9XzWQmhG6YnYJwBt4gtvZX35E/AbsTJHWAssmANx4d5Xlm8xN1Oxx+sLOq8sxlBgoPgvxUzDKB5+jKJV4nr8LCxaX6N7DpJ7h1MnITu+rLh5sas1ZDVppROoChQ5qt/Hm5sW1XXAypIkk2TCykwqBn9wWYXIGXau7W9ZVwu2scKr0o7Hg1a09J8+jVJBwFNn2OyucEj9xMXjT6WZezTSwCafUbTTd3eFgiFmVp+5FAU04C5BqkjAj2hYfuSG2C4WsQCHdQbNzcONmiGDe2twRmcbcVzlPOz2dvavXsFmBBFeBiDhmt7K2qiAKw8RoEJkh5f+V7NpApcnTYxo7Crs00VRPIx8i6V0gS52b1mne6MdttBzpvGZt72dkoMM6jByHgkDoBMIjj4Z5Zm6bsfOJfWOAbH5h/oqz8M54SQVoec3oIrBY+4qRfAJtZWIuFKTquOcAZby3OmKSTaKXOVvq9/ydsQP0nXBwpuSuAFupbqX/WLHUB0qjAyLZ+3pnbFJTSvtAMypOJ6nEElyeYDwlxg+CjU7fDVP6UuoPjczP6D1oOkVQVV5Z+nkepPSpr6Dn2/XtCE1msNbJSw3XyNsdqapYfZ4vy9VKgcB6xBXZTqQAivsJ54wxQJM7AF37VIPoUG9eU2rYQKui0A9zMaHShvtQ3m1TZUmfDPRoi3E988P9DmqjwV99YIg1NAMpHVJSLTe/Wp3dx6bajzhJ73ogv5IbLRDB9BhWRhYcRZGv3JYJDZyVSQNltW43IxhA11edZyGx7mm3fFdYxlR28lkgdRfM+5krv+JkWTUZ5bPzT+fMzUpr5pTK5PwapRXTeY/Q/8SPV/ZVrr4srVAreTIBbZdOrtKNiyEvvB+nDtkOfGm6zp+Exdfqoc5PI3k82P8i9VXhqm6V0XHMDRXVD1Ah/Mb+J/Q+qr2sjbqFvTq9ubph3Lt7qgpxw8wKPRi634f1obUcLKtmojKN87Bf50JkTFTaHJJ2EH8KDP4QlYHWc3o/YUPU2tlbLPjynfqo2tXMxdak1elHslskjmEkcQpRKbRlpdsnq9nTv7/MhttLe9VNOo/3b3u7XhvFYosW7f5zq/POMv8lTeLGL1RhroJoCYuw8DYXZ9a8hWwlH4OGW6WHB1+0PVKrgoZ/zAMjL0kFL2Y5n4izhSr5Iymmt8Hoqc7rZ5Tbob25k02c7b52ekb4PuEGv6xLK5bpQCqLkleLY+jqARs5k4LZN+LSBXssJ1usPp6RIEhIORUb9MdwA9xX2xpoOygT85EpSjkIBlFTl/s2P+cXPo33ihjerxjDfHR4Jy9fu9WQZ3ycya1spDKvpZ9wRLveYw1tFTzFMyzKYOogdg/v7Dwn2p84aI+Cb8g99hCqeTvo3k5PvDI8r3aTIiVXp5f2GUZS2+NBY9PU6nxTU9eotMgEhxlZ5PjA63QmoxikRzf41DSVFk9fSmmehDlHVWbTb2LGP5gRBTT2v0aEAWgSe9eh+SMaZ+eIsDF7NWdV6kqKoqajB7l4Lh0n2tqJx2RhXJktGpwVe7nNFq7aWJG1TAgEAoCjnrjAbas5Be8myuMRoPeFUhvpjc8pT9ux1lvqMb091AUsR3QeZNElBVzA+c2Zoe0ErjJlQqTQ+UDVo7aNIdIH54RtD+SgpjY4xpcJFo57Jnw+WDrUUAoNT7X8Djp9Jm+wCCHoDou0AJ5sjTncGxpshtfeEQhbL7SZeZUYT3ZfUkwSxHG5NAEGZQJNSIu7X9edFp8MoypP63hmS+WK7hMjD2JnK+QpKop9K+vNnWVoGNJrZuTNBOljPj9qj1Y84j0jAwuZYRjsGlpskyg+4DFbQrV0YIW0n9h7EQKucYF1FqjI1EKVDaBc7W2+mxopdX6QggduaFp11N2ek0uLImtCzfN/oyKGo//jLb4yZ3L4GDxsIkaklZNawo7uPizPiQqZunpon9N9BQ8QQPvVyQUXKYvSF1tNddo0b+2sz36gII1HakljwleeKESuApdIZvh7Si+vTlIynk9hJ7s91KqNTFaaaJ0VKsNAR+xkFJLMQ5bT6Og4rrNp19Rtrc4Z5ZnuWLbayzdZwJ3RqpXG7OEP0XJdTUCwHMrMr9TZuj87Xu3FjPJgeqT/nmijEZM/VnHS7W7Mi0rGvQZkNJmai+k8ExO7VnFuwyDpLqtamIdtiXxlmdIi00knRnaUtD9jbVKdV9qVOuKO0vItsodgR5wE7tz8lERgZXAWw4ov9LwsYee8h9Qmw8agNWL/K+9dQaXICLvqeQlUJTKKXFOE26e35d2oAKcDhynz4ZGb8v42CzZ/uEExKjPtyOsDfitDG/RLKcaN02KoyG44hg/K6hPthImDmpZAAZzA7XNE5hDKpFiuTK3pz1cD522bnaC0Kn6NytNzO+ZnpQ+teWCYWwNHq2dJiqlWqRrYJS1XXrIqt5FqlE6x+Bt+zVAU3EVz3x0CKA6XgN60oz/NTuA6QguEU3Y55pOune6iiINsj1Gz4QzZnMX3i8638sCvlpyAJ0+5HXPn3Fa2gqim7z1p9a+ZW4+0Ifgem+94lP5jLC7N40cdLHBONWWKfa6bZ3HekdhIQuHeHRT6JQIemMa06RoNKb5NFaTG+QGlulwI0bpIdEBKm51cFBvApVFkL+t/nzuqgUlo+RYkGoSHTUsr78N+AqJyqpmNXxsVe3se2z6nxjUclUGLz7N08URhKOXiPiNZvdCIsN6IwN3t6HJRJ+ZddcZcpfw/Z7+e39h4Hrk8m2TP4sU/mFaadJpUmf6wCjfLnsSv2m5a5Says0rHQ2uXrR1f1rhMkMiK1etjWQr7IUOFbi0rlq04yo5PWa6aqTazjz8akgzvmpraCRNlFN7VV/IcYHQ8hpybQwZ7TAG2Ixl+3fDNmzDYbgXoIz8g/7djLuZwfRqiLO0oBeS11RatK0gZqOYj3pSGODUmgrSi1aJ6LWkfcYWegD1dUihYG1U/9M1Eu2aoXt0+RDYlDx1cOLuD8pxQbt67d2ir1kS7bQgEl78wMcEeoq18l7AVIbWVnnVca3vErGhEMylma3fn9DTk5GmxtvIrL0xNwPGbLRlZtLpOKA9Rvm1beWMRHSEK5X3djyxaRguj26mb0dLLXJEPReflRTcW6mVQNG8JBH5+SvZ9+huFmm3nt7AG19t7utRN2IY4fRpeS9TQ5NeSVgS2Sw5u24qtofgtwBQxhfI7AGSGu0ya5pRvqOJO6Vr0SYyjA08AQnweopDQTgiFIreGtZIbvPciUZTrBT6Tg1QVlU+SzprOSknZzDMDVclSUo+BAVYtawBcowws1C4MULQUWar65YKUJaO+pKpYSspQi8gEK1WZeWzcgJ3KbiDum/RjsXExCAnc/oB3Vz2+dGyQSLTmhSimzavNZ8w+U/NpJvnUz0MjxGriyFCoJXESmpr6Bn6cXTi3czvP2gY9Y7aU7HSMMG82T6CJ+p2hntwb2gu6O6FQVE7uxEOIQlG6krcdJiMax/rGjPkBYYHUR1ogWI0ELQfeRMrbI7ZH3tq9cdp7I+NxXzF38d8yua+lHxImOFyKSdXGHDduBuJKZ9I33JkzFTUS+zrRkvUI4CcYEx2PINpqHmbcITGzy5LydrcNh7vf0A6Fqnw7TDriOnAwI0zl08HoiLo1iIPrQtW+3ubxHXgAMxapvNNMkVcaU1fGYlpJrZjyzMRAKE56nXz8UJFbNEWaVjzwb0A3ogW6zFf9lDFK/6tMnQAdj+HrRrp9Y4A2H4px48gHHwGalhZPywPR/23ljHG2/hcN8mi5N+xjIa0WisV9wLl92/uniwcz6wQLHSnPop5/PfL9h0dCl3o/4hOzJ0S/cSfgOwW/eRPm87yDgEy3ok2CSZoVvQbeFOcJ9Ez8BokYI3sUQ5wftgOTY+yLdwEQrbkXghK6Z/v0NLxz2N0oJTdgET2+2xBd8ERggt0bTmk4InjUOaz18UAKfwlZE0ted4017LEMrPAsHdak/Gvs8IiCFa/aI9fsVpC/xq9KDGm32aTlHzUyulU10Ya+FiluOS/W3SGWHi8JTqOksPhinGVyjPix7ZfMPZurc/7FQw3AqFb4Hi4cknrFrQUJyE1PLh+EFSWa0J26dHDVJkTYwCtBdFyd2AWUV8iq3WPMAUT0n8ZHLRzmjsDbGH4EwiUgBMOur7HP1RwWbissVHdfhbQalHLsyROWd335Ku3tieMbeP9JPjXBXSjpkWfLGYbg8Z863zQvz0t42OaF5h8fsJ3Xa5eX/x1p4VyAaFuL0CLy167NjwCirc2tq0VkyWXnWKggH8SB2IKCWCgOyi+Aeq7z80F6U23VGibHqqu2vM2q7UBnN7Zrz1aCVq+7rDjMNSVLEIN4mjWNhDpEopOPCt8OIBCDsnpWY2DxZgKV+A0Pg8gF2PIbgSaelQc2deICBqUw/B5BY73jAfgVfNahIrC5I5wACO+IRuJ17IdI30y793zAgcDJWdwx+DurjzcPH8Mt9Iv6F3C74Xme08Xao5PYBuT0EespGu+ILes7vBvHGqH0k481ZXiIktxFpTriArGPCIi6Uve33iaCEbkj1EuljZIELAFJ6UoCTEByVRFLgYgqG8/cEhD5EfJqC4ipX5xBQ4sFzaI1Qs7PXBqfMmqawFQAC4V/79qf4ANJfy7vUwEfiZNhUQD2MglqWGSFutx2g0Oiujy/qOAYFrlgbmCfN+oipCXQpk2IEkTpps4Sgg7HUClUsmlTySLfFB9Ber4gLYXvmwiVlEDBJuDFKkLH7EkgK9va2p7USHXxrCXRxqSTk1UmN5LiyliDgSxIk42ZkrQB/LLaALWUFxmWLQmKc91K+G7+nZAe+MXgc8MXscC4wg9X872rodycVD2bzmWlrGIWRh6kYMmnu+OVzH2XZ6nVdH+2rWoSCspWRf27hMuF3IL9924hMBuatFXb+0MF1IpPDE4ERuxbnn+w1aOkxDt2UF/mixVHFJnuAksLwhLzF6WwN8B+gE8P8VqPkeru6wSYDoxAl81qHcDwz0AdcDfvPq8bvoBU4TxDkL2QXl02supoUTG+CeF/YivwHb346D83uAqUtjO616w3jB2GKSrChNmHkalolBpV4c434vytEq0TnXRQgwWlHLe3g4sTm0udKH5RGyt2JWzCUcotCtv0+BmTGXxnbkWx+l552nS6Qz/28zVilb5jOtEb0rWfgZvuP+5/wJLtyrYE/3PxwMqey8bzu4ZtdyQOjDxb7XUY/2cGP/1IrpFiEeJ4fQztH+j00f5R9qNd+xAKOR0pED7Jp/pvBLW+3pU+agU0TFFPDoPYiGxXb9/lFkLo7tLVEidvt3CH/WB4Uk3+u0AUbUjpDRUGggFKOKsLWFX7iJAPHKPDLcug4bvJNgNAI7YBPn84pYmY222rBtQkm3kRzKim86G0mhXpEPcBDpyW/KPox2bTdERNDZTeQUBZA0qD0mtq0kNdpc4uEfGGKtP1k0ppBwlj/DbyY0rrLnj/l83lWUb0eecL+Ci4g9o7HbZ93uVvl6fB9dp/XO4Ghx5/yoi643QHFw1bUTumPXcA/6x9mKi7V0Ji7r7XOanZWNIHkw4EI/q289a0Z1cWx0zNu/zjfDeE/IVnSLkB7wD4T5iVHXZ0kqDB5umEBhVWQ5zdkx4WWSMJDA6UkWgkIcme7ATbJVv9Tra3opFnSfZjwrl9fJZMs4KjWYzqTegYzYpGEkRHdlmyDd0x8svYxfTBtkVG8snvk5NClpCBC8sDAlGtJWQBb6qYzZJI6ClF+hCLptDvrrMWPFKoM6Z/z6aY8o3G/Z9qDAenv/LCI1qv+eq1CUmY9N4Hpo9704Aws+MjPDWUaUe2sYbwrIzeu+bfqclgPwZ2icXmAN/nU8CQPzNkyM4wg03HzhgcO35kHWB67NnB3NYb3ukrh2oEFwypgcNBNT4B8mvxl2i1LrXUiyxqq7lMkS78IJRKhD9QpWCALCQXpHYwG5x+M/fPqtj14GGPlcCqn0YrpYdG639ne95011bQSAenMEQfy27Ft0m3pQ+zKz+/zbItFq0LbO2cOkB4iqhorwz7l2NAhqneL7KfXt4iBR77DjNMb/KShSPciUN/TPnc7f8bAiGfK3+wqA2vFWdWPIOLgQdanhHdt4ZXL3wcYeXbHa7xwVna4DF12E5vN4KWqsPXhLzE9dv6+2FCooAkCLfISW7bXyaXoxMw2mGR93EHvC86GNL1K26aJSBHzfqZn4GwmI7tpvRT+ynd3BujyP+/IM8hR798GQX2vwcA4Zh3kohgzGSISrpJog6ZjAFinxvmkCa8LMVQFlNGoo4xxsK/Qj6GVkx0a/Rozq0Rf0k5VywN+yomsx/7iqXu0qZAyUQJwsqq8sqS5wN82e66j5jfMR95RovfLYwjQMd4XryhCGxltNJ96jBGLyOmLrkuzUmdD7UFsbV5ykPsd1rmJYP9dM/STHbaz0NcI0uL/BwZU2bxQ98tyMyL10FIzf0s8JfQWhrgLKFvqxC++bFxLRSu6SMzVPZRs3xZ5pwsnCUxJfrKqv/nAClIT4ekmBmvGYyfS3ZMTJaLpqPArUbGzgRmjCAU5wniDuIJC8WaZ+XzdrIbzh3OPFhUr1B8cgfulIQEociuLyyIvtkFvKgHRShKSKC0vgD+px7+Y0vY4ffa99Vmm92IjPM80S7UBZsjdWSUX7GNjZuihllpDPKZp9L1UDxRWv27OigIcXScpqXRHXXceOkAkd1YBvO46In1W0k/XvqRtPXmOvD49xGWnjVSXz/I1rKHt012e4qgHi9hOfWuwZltLoCTxmi57VUFRIiRp4VNuHrfXIfwno3x8WnWc/Kpkvh40HshGqUT9gYpto4YuoFx74Je+KO1y1rQU15SQkwXC7gHpqnSfYryoqhd2DTCSnt/LkvN4/qziKtQysa2LepgZ0dut96aHevKAd60x9fSoRitNkbxgWdmTDqioru7AixCEYzpGja62EnqxPZfshjNng5ldDMW56WbdLEWs7pMTHdb+UrmcN9GMXWR8SdtKGYXU38mvMbuHK4FFgzUkx6LPTzTPWgdj3RPEFK+2VGqeKiQOg5AH/q2AX+M5QVpg9RY/cQR3ARO8fSNULCypgPJwgJRXLJZQeOhAvOCMcgXA/wuLTwsKsQMjhG4W6aF14m5njUcLDDNF8flm+WvO5ZiOoH/8NB+l2nWsvwZ/d+mpjZqwIJtk6HKSijY5A6wHTeBj0BvK+Hk/JB8oGEG6t0175Q4pXpADYT4iQHVVcOolINMDRQByTMz5RBRQvDWIjI1eut/HzCoDL+7p29ilNd5lZJKDlQeUDRyaheWIOpqoSUU6uocFuqEN1+7RG2ArycsCd0bumQ8oeFP8z0LTHMgEgHfhTlzYQ8IhOyqZ6tBHq2Dpn2xFXApnU1ivuv19jgJ7OftldQlte5RHqSjeWsnqWAbISE/o9Yt2p20h6Y16ChtnenQbwLZL0lyzsK58qS/FOfLGErAoJTkeDtsQEdn7xzFv8yzVggVYNmdUoLQB8yekhOIvqMfvTs0kP8FzAOPpfGfuM64fLfnz7kOz+c57I8ucy7z3pzvhicuH+1Wh2SGeZSa6ZRKnWmpe1hmCJRYXLz8tXAACbdfuNCOIEo0W0cOCMGyAFoTobXGuoFkXecuMhcyQ5aTJZ70aZlsmu4paHu8EjJF5nXu1iTrhprWJgLN+Pw5W2Qlw03gSTitBSY/I/zS9QckIQYI1/R4zx/juBkRvI/H+FZGzHYtjoSfwMmsROyBQY0GPF+L2pd6NIOwxj0JM+kqCveuR7QpQQS/MSe/wT8CWO/b0xiw3Pmagc3Yh6/5BSG7FNzkHLjcOSNX7BjdEBuNm8GZG27i4iBNZu8CbGZ1qcmZ4gDnpqCcDBffIClu5m5rJMsr/HNOVLMg+XVcyC9NmIDlLvVFLtgbOHPcCJZy5/LHLNLSYw6YO6NntgUh/ZPgJGWxLgkZBy3NQ8fipjU6fhPnECkWisWRyPRYdbWcqTtjpoJhEghOqKoxucm7xBsxIeBm8J/xMziC6TDv0tg0q7FRSqOi5hhBjLmylSoB5l5oyG2EfBPHZMTEwZ/ibJIjbr+HHDSZgk3NOKefjfTm+N6BXry5NMK7aYKhAd703FbzlTrisXJjlmneyupq2lzFt9nUxcp48oGKzdW/9NIOtha3prmSzT2KPVDf+lYjKUX1dpgutiH0/efLTWRz8eOZk4HxwaBqNc1UIYrbO4ohorRCFKt4RljNoXGAD+ww7AGgBkoVV839zQEdL6lUlb0qvKXJ7GVOSZL9kclIxGylmcSseRJGJgdK93e3oaqvF7KAfWr1DZMa4D+FqLhMMz7VRLLf5JRQwjs1fpJ9jl4OUf6S/Wdp1hIbWr9+uYhuPwnq/z1M5AGVjAOHjvh8Qg0aGV8/RiNupYlE1KXUsKFtJdLGWD1h3QskGmlLikhbCnSLdLQL3WE9SyOhIPn7GtS8YqliHlXzPkie273YbKnZBwj4id9s9LPKe7MTA6Aeb0YaADU0BX57HsbxK43KZsF6iyqNt/M4twFnOSQSU6liMSTHPk6Pd02Rtha6VaFbrXxuijD9MVbuWDAX1vK4q9LQ0eSsWDTZGtI6uYh6a4dhCF9xJmyJbfR7V7nzQG8/3O3cDcsR9M0RzRGCFUA00vXUA1S9QxWkqrx/uPJ3cx6yMGL66XqHfOgq5fvsEroe6rcwWvSDKgc9uPrpO+UqlG+zrV9nNO+HFOwXrtL0DvpHeLqe3o826g7Rv5L0KwtqmUAA+ZhehbQLQuYrao9O8Yj6iiQ8wO4zJVeTTfdDlD7hm+Evy37gWe64hLr6eVfu+qwa+0tzL4VXOFey2wBndhIoxFW+uUNGAxO+E3NriRQmhVSbS5SR64Zy+fVD8+GfndiWnVuNBpqWmJjomBYLqkWrRtM2ZMRw8zF4bg55/AIuc9wWGBuEYQP8Y5y1yzhJ/huLHzC5T+3+hOJF67n5rr/EqZTKjsHG7szkbRrNiAEzHBkdE9OiAejqrKzWcnHZ9et984gfCUgChZBXSwRMQKifAY8kGIm5glUhQAPg86lSM8smJ5LZFA2ZaTOz5jBtGLKvzAlt0bRDvDlMN8bb6+Dx8i9ohZ9IgcZX1AY3gCDDuhzLeLS/CK0gZB8/aBhtITVhH4UhtPixHoIQICKPWD7k/12ZAC3nfvX57j9UTlzuDwTlmwqytv1KxtRKMV0acpayIDuKlqJpxQCfzmLlpD05GsteSaaTokk0szRMF8Ye04rhalB7faeuzBerPm3+go7zFcah8TlrA1cFrVqRg3+s/YTouC99n0qfT7JJzfWgW43TzST6uw3Qnv/yr+W9ft+k2aCc+54LEpXf/IayiXn+gK9bcqJD7S3TnBKofUkLBtP8saKfSeNe559NPTvvNU66Wmy5n74d0XMACBAtRYV7ny5Hi5duA3lsLe2nhXnKT7Q8dh5tjKaVf1CmyPOfhJ/myULK/MIUTc1WgSkyjSwk0SaFkzQSIEgo0w7DDk+MqZ2cGx2dR/7HmCacBhxn1qHHtDZweDh69ybk2f1vuJIDYmGMXLA41SIt8dmrcRIhGgq3jghPbf9X+e7dTUwnbRURkapRdPfaTXpKGhYr901PwwBjo5DA9+P7+7fFDbuC1otjtnkDeXYka6VSLIyQeqtSzVPD7j0YJRLCIZGlo3mV/hLpqTKJTLLeslUu9clShY8fX8C4XjGx0qry8gl2N3s0MytK7u93bfwmp5UDWLD7CeTCR+RJ5ImFhRMwu7KwgDwBVGE91dU9QpWxABzSuWics5yvRkZHyX92znLKdNUdBIWIjrEL1C/0aghAegc9nVVNFwAz7IHzMZEnFz6eQOLrv3TAY2OIDmOhA+bMhbZlPrUaTZ2PwIy8RacxszPN8v+VMpS4faM0RHKh94m+1BL1HBgDhiIkH8I5loZpudEoTIF3VH0p98ck2Kjmg+3tYmvqfecsU5Zplm7r99WxJASYV1ifcpSiTqH4ilMavtMpZ59pyqnL+hr1lMbH+ZQTX3NKwc9JSB9RU1785CmFD/oUUiqcS+qod6azj14oRZ5C+zwGMxAULiTxuEJMIyZMw/al4GOahVnNIc3ZVU9Bs/w/vcwVDEVa0RTNIofNwvroFPy+MF3H5K3jpbx0YLzn5kbXO7TQ3YAbvcVBT18zFPIINEBFIAEkBFAAPbdvkgJMFQ8G1ANQNU0J6HoIqAGkH+3nEvYFmQftM98bbB68t952EKBHBweqXQ0CPx3D/Nb088S6G9Zr/rpRMcxqR6xOWI7UpjKdft7drbG6ubbQwulXzG9fYVfEP1D3f7f3XQ9mgoC9RyZ+Ls9EGm58Zb/W5AMni0Ic5ZoTMzWsdMLq5uuP/93+7/rOLtou4HN4Y122tIEid24irpySjkxDLqbMsQWGIvd+mu0O52RIN8ktvpf9km2Az3G7rCQct8i9h07Sh+pJE9AsvafI3SBgz3nVotJQtXmHU2xSzMEZd+PpBF2ALgFVKrPLybWbA+Gu7DnbuiWNrLMtT0QChTPLFDeXAZg9972k02Mu4fIMlzpUuEtY9Qi41KHGXsKpOi4Z8nCXMHrSi35El4hziVqkw8wxCPg8NidEb0Y97CDODM793cd8QzR1NyWW6b8ulisGZ4gdqIdvXKft9jniFHEOBF9sY77ZLETPyZCKnUrrnlhPWT9Zt8LS9Q2COLcdgm+tgyA63sJ8wHb41CmRaZjeJeAGdfTWrT//FKCCsD3Y4xjpx8tbt4cp9HNfnTdi5adPD9h+PTDol/p699eOzvT8jz5UKOf48d9+A189CJtf13DxTjZktli7G4dPtiZXe12EHcvepi+2XJxe8QbheJGXn9w2fNLd6L5NQ3zSu2UwjXXBn9Ky+ryVcrOqX6J9OYq2wwA/u9GBtH3gqycas2Y58Ow36UsslzAOFxYktzIerQMWLG6Fb/U6NppxwrFALE8RAjKf/Jk0dcxpyZ7SPISi/H5xXnJpivSZzKf07ktmR+0KutikRsHC24lQ2ZEI1K4xKHFGNnTgRPff61yds33/tpeaYznhZpzm23uB/544JpTs0875JGYuUy+anU1elClhfuJ4twM1a+JNkXLUz92CWbSrvhxUAPlfb4si2C7x9x9KLAsW2QRGV0XGYMesGZ2WnQz6qiDU0Tcf9clWqrZsDYBWIrbtgBoo1rLEQj42NmK84EbutXjbXwAE+Asmq1hdzt2MVYxu566OdNQo9Y+87u61kKy7rm6bGJzs7laH0UdN56df1tXWpqXU1AQHGr+drfj+vZVgqAVGoSei20nT3qnL/Y6HgvV9xmHQYXrz0s3TzKOZ7wqW+/MksC1sxwzyhvDWk+XeTVXet6dZYyXdgd2HtwlzvS4eW7AXO8fuoT0+0DXwHhOOg0h7t4swRaVaVtrdNeMw4jDz5ODBcNnAwC2nAadpD2Sq+ln6yoIsVmRkmz0+Qps14bgd5g9FRFIszd8r1ezlBGtySX9k2+AWYRLALF0qZ9ZFfUmuRKrF3ORAJSsqMlDby8sdZ0D9PbDGEelg7ZOkqQzCMsN8Hn96bXyX6ma2bA5tZjBDzy0zm3RbGqMaeyrrVZMOpE2cScM01oCdNrxZ4yOUstdvOX4MINgbNXrvFkOlWDaPNh2kyjvavWEDVe+gp9Jy2vdCT9Cm/y5MWbN7ABiLs7DaRG1SXmLecVeyXEQVEHhRFmCg+lANzvsBWLDbzmX1if87EFs5OhYQnpD61DnJ4HpQB0Jhv/xHOeXnj5pwn0D5+5lNu8+YSe+KGfdpdEml2gGiIoXsKO2mtVmCyTrtrspuW/5R+Z8/rLIyUYmsxq1EKhMrPh6YZveAQob9HJ7JGFV8OWN7JuRRRre2783laqH1tbPUjDMZatNr1kK1iWWa8839FvvRVfCSa4YpK8OYQUmlpUkQ9a8XBeGBRtkCw1ViJysslLEc93pTlMbAvOVx8VRE4rJi22+z82TUJ7H4E6r/hyz5qvup6dvdRc67dzkWH/x2a6n7VWt7fyo8RVtvMKQHIT118MUbEJywb/JQhcMvYgx/Ch63vtWDN1XLA1KgaF+m8j37nYUy0i/F0FPnfzyrm3EKlepW0Tp7Lb81Bf6xf15ZPP7X+MkW0qvuzfzI/gzypNuH1maz6XbMhJ3a0CvLLYDF8iujxat267qYt5ld6+wiOIg1utu6NQ4EP22o7w8wgH/wlRw/woqbFD5lt/O2NItc6G06zL2t3D4Q9opLnHPRaMFPt2xvs1i3rY/cFmDQlcPJJLY1m/yWDBqSfY5wxO3HAXcCBOls+/rKXavFcN/jR32wCI8eBYG+R4+diatdnfv6ZlwmXHidexAr+vpWIGoRjSI8BFoLCIsA1NMubBpG6ZkB3c+KKTNr5dKKzzvmOkrKxIPmm+2Bv8LcxvlwL8cLcRz++BF5Anlc6HFAuBw+Dp9w0zMd0JudN5+b+eleaFK57qvsK8+/x28bhYPQ1i5sD5ykdovtMehiMU4J/CNJAsDOfZ473HxQ7CFSU6rfSoOz/rFa5pFpgROJfM6T7YhCsFAoZFCXhocGicbSWEvMavxyDhx1DHDvcaQKCgSo+vCCLH5EiUkaDXmcgXCcRTEEpU9UapIsNjmDFflQIirV+IhEqRssUEZpcMuDrMV4FTNhiWsiiMXUmCcRoW1DFK94W7UgJbS/MfEqmnPIh1/Lio0V3LZqkOBouwWN3Fgg2CG4M4p2j963lx3PdGZHyUEExiQfeCZ5tCrcXzhmbWVsa1y9c3VTV5NOs7QgJQaw4EXn4C9XVphzEAwguUdwxblIYh5Rsljib/FECKKWeDKPQSQlLh2EHn33g5WVSaIOefSon0KJJpZW+1b9OvpeHGRWZ/tPOw7/d+ezMvYwLYrVSEiHkiSICATtpstrQQRKgxD+0YpVQbGIKiqLfklgUhYFNQKeG97qw/2RjaAijwVpYK+0ulq2Lw3UVV3LCSGW244tAbuk0wlJYc9tq107Xx3bgWDUMHkVhYJkACBX5IEIX6sjK3giqgq9m9i0Ad3EQIL/ikqiMdX0NtMtOYxlKBQGi+SbVVY0xm1JPimkmZjBVjvK8+39vmIQEkLvJlqY4Q7G3tfXwZUORE17Gc1VUCXnkF+/TgLp/NfJwXxlzt+RX78qLn07daanjbSqabVpWfOmpxQW9s/zv8fFpaR+W5+5dqBt7HXzGmEpWDXJOmhLgXXC0e+x8clpk0s2GtRbY1Zm+NZn/5TCwf554WNs90XXZawbaJ18cAcvWwkmLaXmzqPfYuNT0sb4tlQHsNl9kSs9A1XPippcSTkeL1Bn2ER/CHRdlEGvR0XZrbx7nCKIz1BH2wR+0Hk1dlF3L2WtnMT7X8p55LdvI8KeTwj6+A3tEZGrOboFj+ITYFcFFakgKJBUhStM4KPwW4Y0OSd97w7vPY4x3YUgyOBwZfpZO8+S0mGZExbeZYo+sXf4ki9Yv6gGlcL9Od3te8lZOxO7RO6sIZ69jr69eaCbTeJSTCjXS74HR//MRaXUuF33xyP+RVKLkRVt26oRekQ/VVAVxVTkvwi8/3XwdENna7A2YdVSILOm5njt8QUVB4TJaqPMEIzSza7cBM6iHu2GUumi4MSActweJS4KGb2xvIxYjt2TRJbkhvLUiEm9wwSYerW4dOqMkhkWTlXfAKFnzqwPBW7mK9bYJe+5f+xyivslMDUesTgUBPfpo4I2jOh/Kc5zb9c4pWR3FHs0STySSzYNFXs1JCxe1BDVLl0Iqfsf21ZBrym4evbflJ7x//KvAeFeh6gton2prl60Ufj//5GjRAlBP5L/oPxxBSrqS0cm4n0ynggX1XheH/Gv5kKQIA6FxbrkZT34YgqJdleWqoGr70I45433roakHZ/X5bq8Nl1lsAOuFrIG7q4Lz56/2oMX9HZeT7YUymmpjzeiQSKuIMlPWxWahE7C5if5h08gCEeAabz9YIm1kB0RZVe9zg50mWz6uzGP3g8iofjA7M2OsdPBK+QJYHR+XWBUn8aFudhf0JtZ4+sJDNiEgL+n6i+JkIl0koiUFf4jL/WvGL77Qgqh1iSaOWOR+NSUvzNvpy/Lb42ag31rbGalZogm6/ufelcvP7YY4+uEWLmfaig44Xsib9HcucigNxO6IwlHSq6sfTn2uzHz848W6W89IxHO75bZuARsikpPMmugZUEyWt3Kv4BXIvrbjTs/Lt73nfZb4hmbs4m/2fuX8LrNeOJZKgDz6uPOhinde7f3vC9uX8Ld1/m7pKgESSnJ3udnkUIXR9drarbfpQzzolPQ6cOFi4hCwXTYUupSR4nFQOeQl4ansdBoGP+favRy1f52iJfGigLRKKxO7hxNp6alOOMAQBRXW1TzGD635ol0qM/c2Uyfcci9ABVnGhnV8cyvPGsdldgCQtjbTKvGNu/O/LBdaqNr7dQxKA7Fr0BfypUq2/g8t/jUu0oEJEnI/pbHpCOc02UXX1a6iMwSft24gX4oGHEEMRizUAOjbNTuoUFeIts0Ak0AaU6ILGO9UdsGdzeDnpE84EAyuEV4iGvjVFg1MtcBRqj4dlSW0EIILkEL9iJns/s6iGGfkcjrhMAdkOxJDrMMs/po+bEzkGS0JEj7YSov7p5mzTNVS+KdzaQ/ecV6QUpDiQZSgVWp1PBeQiJUrIVimdoOmQL3lElNgoqXQBFQeHFGEhQHLctAhKPdJOqTuFv0WzjSN/q3tbgZ+sxcnDn6HBh0oX4yzz25shZqhc5sh6uAWFLyiJVdFni/0IY628FBlPR0+KdTlU4qp6tO9+4qGClccSLaASScs3u1bqPQoZ7ViBxEbk+zHqHDrknhmStMFmWWZJI4TPYYNZGZtIfIZ/oMscgpAsR/+Yh8Yj4pKiYhBJ595/cOltWtJ/VlQfNyHcFsPbLahGbbEH7C9kQg+iSDyIs8a3s2/AcIit61li094fOjpMrUUQmyN/BkY9+34X8CUwEu5Iemjrb7Xw7zi7eetU+MKa0kMc23yO1WR8LpYL2nV7rzavi3JAQHUVtV+47zLukaZwuSwSez4jiP449a32nSlV7O2mF3XyNVr2kQsTtle2OGyq6H/U8vb5qEj+aQG/8stRvxCHfqAIWKk3YIaKe7NSJtC6w+joEZSd/5MdbmUSZxJfst9oWn3E+AyiE59qDtXcSFFEby+8CgtHgRC1++J9rx5Acr2ckdJ2k3Wisb6/Ci37QVYsuo8qiOColn9OLQEvO3v4KccbYrs5JJTJYeQb79Cz5LlLOOIPm3nWISQO4NikVREVlAmZ/7Wvd99UUk9eSfB3R7nAoQtV1pJBwQeZT+fOIu8uPZw4/a7RuOIDZmeSES4RoV1ISY6ol79I5TcB5EDXmSPb2QXkD/8IY9UZ5Q8lKwBLXl3qSfi5nFP1tehfhVnvHMulrCLLlqCQRwGm+Zv9lFM88YT0+0J+H/8KgHCB5oi8QJRr9PQSl3oTFF9B8+JmtPSoWZaJ0pppQjO8MuFW+0F8dUfVG+X2DgcfmdJZqbMy9MifT5x+J3jqb3HLPZG8T2Sw/ay0obnUa2SHf1ZhFi/lOJvqbkoY6E91IVsz/t7EXysSPDMRF96F9x8dlSojRN6tPJ2KmRchR2D9FFcBrYyWKJpe+RTEK0WUxNSXlClCOr0PQH7xfp0cR/GL+yRGgSWo8qRuej8S72kgdKCwWxjpXIYJeaRSZGH5hVKslk52ZZoa1qQGVzr5fv9+MN8Bv7JybmAljWuqeU/qCSk5HgvYw0HhPzpPofJ9N2ClKqSZYCQfkvLKSU0m7q9E+1Q1XYPxD0TxhloFBJb0WMu3NiRUEJzJOxJE05iB9DVLPxfqhAs0dHvlv1cm4WosQxJzkuYTDcSuMaZTcxiNhRokgAnd6/QHxIY+oX8PCPfK+dfv415j6ThHxFwkVY+T0RYRUfv9ZCjIi0ER4alNlo2ONV8YnTjgMOt+MTpEucQDA998QaXQRTG19GS2e1LL/xAuum4huoPaSY9M3czdZPuWlRVE9rvJSoDtIG5QWpcNZShu1nh8+2js52xk8Na6AufoWVU2GzlzvoSnjauw+xDFHbaMvRcziDds6HTGcSDjl/Gl7kanHNjZkMbx2VGib0j5PNunZNBpWW6yP8xwr20fba2gJ8MjAJ/pZpjulJblmMYDlE0fZuKwbbCosLeznaXgozJqazU8/E4Y4UOD6Z0R/J7+t5SUa0BRcJZ3e/upw2WdpNN6eaMroBC44YQwKAHKMAQLAdl6YY523STj2W73wv4UQR6fk7U2f6t35Gn5mFbXXuMiHHJz94kRl+68eQPIxcIsOzB56YgHuIGgSENxnp16zVNvvJ61jbJmpYJl3OrdisTH3rDl5XBBR0GN/OUE3tdnVUyB9nkKCA0yJ9F1mYAKdf7EVM3GK7k8Clt+Bu+aQnbEidEbLcVzO6ES+wge6D+v6x4U0ZfBaZeZv/QHK+ZMOk+9071AuSV4LbSFmvbjndGhi4IIYqMe00IJFLYhjAnq10HZjd6mcQNAiwWbm5Wdi+xuC3ZRZaN/JXx2g10KTNL5PbX8orLR3hOVPr758I8dz0vH9S8alpk2mBxvqJLdUh1b85wFivhioqoDalrihXI4iScLMKdX4FU0vMyxfkqxlTC5T1UESGJhxSLzIyIXkWVUl2XEL1g9KAjOKYSVZSNz8BH2dnPwJ8OCfAx1btDlB9DTVQxDyNpPBV9pmdnpv8m4N8aj2dSkOQh8DsrE/OIg/xlEJn5P3IN4Eh9Hlf8jvQ1QRHNQX2we8KrAJ3w5Mn4DVAObgb5ieRERhr7jIkqrJzb3VrDCgP8qogcLRY5K6Fu1euEneRu6DwUVT/gVP8oqVSUrvP0o/yYKf1hgcU9IzHzBMz33N6g/XOB7bxXGBE74enp+H9RArBdvxqSBaNwjfdA9ceSFfWqUhqyDrAosLIE0bzwHsukrvf2t4xIQNjlEHYOLf3GcM8kBprtVgY8tTCBHPBHVmYtehnAO7J33feME/ObjwTcI1VSTtOXc649mxAh6KhaSgd/8NMeN/58H1PqlWh7QfkhdUKhdZNW9VAq59nJ2ayE+YZ5UPG5ieGLwgvWfqMeA4hnaXAS0D64/VP4Az46fXzlgeU7TqKhdqCottOebCVPOqpW+VZNtKiAeatAsf0AjUVtJpB5g3LJFL5T1cEVW6LOTDXT4T1HIYwoeeegoCpI7VBkf2qPHAMfv8BeRQ+9uHDMWQbdHer5wp0YlOWU8bOjIzf/l////XMOX5k/ZGdSq9LLf32cW7svA9T+BOXp0SCE6gm4F/e2WmvCSQQ5NZyoL2mU2hEvoKNwnmhEX6FNFoFYbDzWMwrjO6aaxVRPuyaDlMf1LiLNB5Z2eirRXJvN57Q1dvbRcB3g+DsSlFstJYbGA+kLv89evRfthYPArXc2Gi3vEC/ZDsgiEtNjJEtT0rcvdxk+e7E0VqMLDVREAfskv0CJxDV0Wbm/VBSWakS6l0SuHu3x3uV0PZZCCWZ90ebIavAH2bMXkdOzZJpZJJJop07gMHoTMNDa3QadN4ANT1IXujcQbSmqyvO06ALoZQn6UAQHWthcWvo7NPiQOANuxe6/ecfAnTgq9Id18inBm0n9xXdUL795Rgthsa0i0NafFtKW3JrSiswfnqYUE8k+7eh+vHlIP+gy3kiF4gZgYO0cGO05V42OR470YmIIkWS4IYJC3I8fVOMZSNDTcNbhEMu3svvRflF3lO3sQhnQmqTxhjLTWxSvMVTZnh0OKJzwmKxYO+Ntmw0UUM45muuqI0rgxYvBjKiHJNB4dwpCBLd2d7/vtpd7HwwGahBQ45V3M/J1+IxtSFbDWmATFi3snlTcEoDmGj0K/JIve+R4lc80dAApXT6Zz0U7wM5niBwyuuzmdoJ5I17HYvfil4Ydd6xZ3nhzUhRXa9X8n1eBxCiGq4Q6kR9S7ALa8C9tZ4rp5XL4TDiOvV6s2bvu6YW4Usq/mqQtad6bkJGF2VEgyhQnIGMdlXellqw3XLdbSiSnqACDfhfC4pygv3jl2EUWU7Z5Sr7BjVobYSb4qweBco5Gon2Edl+uuRelEViS/o8033sVxTFaAixLLHccd1OqwiXLBkHFNbbJSV9+iQRO3bv8M78j+gBb+NKxvnP66z3dCTnu+9NPRDBcagFYrj/zse9VmVP4oirI65UldJPJy/pjCuzDswGx5KE8a13LSMb4gELFpw/3/cdDm3ue9rs9YcQG5eF9o5j/bW85meBIv2yrKmrgJFRDmKj/71FEvuNyV1kNvU2XVJOhx9JeAsbDWIzywsYtFCrMnRgR4vXgafQFuT5L1/AyRzW4n88VodlNFMxE7emj6Z2OLICvlTCXkeiYzayPYU1TFlldFSvwwoJpxiNCIct47/ulqY02wkDi0zUzdpERBa3hIkxvVNuT4x8WddxnDnpehx5w3tZnHe4k8OiIbgaQvRaZpXvFbY+clAu/9BQ3fChHMiBd6L9N5ks1x/I/d9X8arei10Oeumu5szXAZYBjmnA2Ppgyw0beON8QuQX1A2FhYIcJrCQCau9rECHlbWJVdak66SjBvE8M+4zOvhb8GHRx7ErBLXb4QvnkO2003ivoRu2N8ZwXndNZPuFc+0fXp1+j61FFLe3FweL6Ag67IrTHxaRG2uwFKdPWQHFVtWvtrln1dgDNQ0IKO/09Dygq9iG8PQwaXNu5Xl4wHtxoofnjUJvMM8CUoO5+SaFcfGFJvnc4FQMFKvVLhnntSHgNceOtyDWII4fD0eMbhYIKBvhcIY/HXJOmDF1PmQ3uAh6aTMm72rEjyzm9RoFN2GZfk7gJwAB3qfbry08C4o9PsuI5jBgcaBJIELC4OBHR3SwvpBD7l5baDf/6PkR1Ml1RGe2exURbo5/lu/sZZuFa5uD757fzdsXrnnuuxdMjma88fN7kxbkEJDqb2Ybxv9jvDan+FPSoEJ6Vd91vxtUvW4E+HfsNidP7lbjBf+KedWetu621YE8MewEeq/+vu/b0xEt6pb7LZR2mJGajgZ880M8dHJ6qLfn1yDwmcnqZqB7kPfPCYXHIdP4Wy9NUT3EEzEW+xHtC5v2//eFuP/+cmQMJh8+AcMRGGTUJf1+EEJraIWzYZTy28MnLXTmM0p59PB2msXoxx+QZ/a/sfmppxX3bO7x4/ZN1RIoNRWIgUQlCcR7JUAsPRXub7ei0JjaaEEAPZb6xHHCaYZCnXMadXpCpd52GjmfZAfNKVZ9Wzn1Ll1qoq0cQ9FwYtlxbBAtdSzqivCaw8BMBkJTX6+BiFJGaBgRmMJv/OPH54+g9U1ifWKkDkVvYGsDpDHUZ6KHnRcghOqIpvsRbqeHDEOn3SLuX+2r53bf0kPwzHLA8pnAw/K+W/x37KsI1BmcAXcGFTGg5NJbqAPUFvp9cLuswQpS7DY5vbnmBRnSW/TfHuN/pccFjFNuXIbeoYXBBVxGi4OewXVr2BJTgMYujWZdSLFdcvvKtnskeosEXFcjTVeq6Eu+qwchPd2N2wIGBieAQOm4u1eV351Q2CXjB6538pt+8r7K+FGW0nuvMCLberVjobosnB5tO6XczM+/2dOPVlWNsrvZEgDCbpoIuMl64muBMJySwfDlpkOuMP7PH7Hkhvn7z49Nr+2/Kv6PU+uHKKMC1IbzDvF4wJtmeQNelneWgP4AfAehBwDRttmfKeMXWwkqjRa/v6KvlqA0qL9e7LhO0QgHkM3IAS7dGB4Fxnoh/vKBzXOU8PH0BcwRysSN4VSzBmS+h3RIYgbmHNh92aEh2FgFHMdt45NfPc+QzZx42S7u+HzPHa6wUJhXovcfwLBqprtqB+rrhx/kmEe+/UeqQsn4amxu6iK3bbGRu+gboMLmrgKqUiEk8sBCc7thYDTZoyi5f3BBiFRxaAJNQWl6fVqwUMcAEUtE2fq9y2ipaRQVBedH8CyalvoD/dzNU7rYJv3xFNCYR9qtzzFgfNe+br8WOazfcXN3e+YwuYcOkG3VjYBfo25c4lLhWu1a4SIZN6y6yxkLK9pRiw6WRII4U9olMS5GHcRV4w6iJL3gtLfqHNQxOjjV5L5jP5zS4EhiK59Kd3gsCwVRwqbzZ6cCrG/84pP3JMwH3+EqXL5ft5ufT5VSEQd19GPf1iGsTTDYD9tqbV+DpaCfJWX1gPcYQV9jXDNeYNJkSaCfu7UZeTyXKJM5Kj7v95RTx7adFzaBKAmf2NeVrq6fDozm2TJIRgFve6TlFE2xxUax1S4ZE8u3UHJUca5ptACpF2WSW6nNC9eG52krT37myC675DZRZD050lb+DtSXBmnb/tgkywk+pJYDnCDe7sUkBnnInJUO3sJuFvU7LmOTQhfwB14sj7MX2Y/h8UZ5ebQskjUX6xFFUD+5ruQ/+TLIHQevZRVhbh23tJNNQ6+Y5tas+VoNjfJNMGuKDMx4cmtXA/YB24+Ku2qZdO8BHJD2rvaSxt/1E6r3c5cnZc88z0GrIFcJJ4GyKV5UnjEk7vFKfwsmufbwtoWZx9POTTKL5MtcSt4bYErIwSTE132kTybxbnbkRZ/3EI6TFMOC9ER02QiGMXEORLBhQeAgc6Q7QvnpnmnMygBXW07yRzEmTAcEnFKbqtc8lg2chHiu/5Pfl/rOutLrOMCVPRU66TZpu9CcHnngXBFblDLXHHWg+0p4XfQmYCAlCNLoFDiebubEjhsv9ej0MJxSwiREhAseHjNwg/i4gwN+0jnazisISAG9z3IgHHMsDD7cdJIvxDfdsR3P1s6iwzLZdz2N9jDwMO2KDy0Q7HSlFY6ECOfD3JkOloDUOkubJog37g66+MsbMenqid3syX1B4RNmDtAbmvmRVf1j2rkTQqbEDyU+68sS/RTqzIZTvugF+jl6uTZ23OlVG23l5M5hJNQ0mYl82yJMY6iAzpPMuCSqv22TiATxbX/R4nMCbW9NphE60LzL6BJvP+4yThA/R+oLCrmzZIg/Q/n+7n04JNXuNnXRjfrwkhQ5ZmpB0MQqAQ70uIpnxmygIA/09gE8c9LGMWbc5xE5xJEiaU6FZJCe2lzPRKNLjRIi1kdgKG3D/pvXgUiiUzzOxXX0DdH2Nsp/+Me2qce4uY0+IWK0ae5ANY0O94H6zSIUL7fj+m7j4ZekpofyJkmqhNiSHrR9NoxBcKklxJsR7yeR1dFD1ysfVbZRtuKvYVn6jQl2Pa1u4/1qD2QkiHdLcRWV9PXxjKQt8+sGSDomSomslSIOGPqIA/R5PtYImrcaC3Y0iGlMH3P1itsQka2VCWv2OtBAfKBfMD0E8VyEj3bzY8Dob+6OvpD/mzAUwDd1HPiKBDzz8kduCCA1fmybvXKohuz/E7Xt/NqLQ3wwQ/GJ6MjbD9Do8Mj+K0bH8wE4mkBmaP/YBVywiwD4mnkfeGYTGUDe3UnARwxaUNT3bdOUSL2KAEvg2M/AsPEjLAcn67r7ORAI/Jywwvy83LR6fT4MUw0BZUcBqlsx8CFUl3wEsgs+jOo9B+l+56OY+c9HowbYx1MHBpNDAqcwolpIQAsxbL+gi7VUsXU6bfqD/Sg0blfiZ/7HmLomvKQy0fWfaBgibOZ7f12aQhKr4WNwbCjFgov9gtej6PK3p/QWrY1H5vpwggZoIYbtFr6ssrX01tcp9sD/YD8KDcZOly/7H2PqJx5eHp9T+D75lmqnuhjneX9dUE0hjWWr58gHqoZSLDi92i94PQqH6m9PuytLaflH+ZH6qYGvfbvcNibL/0LBFGXZ2nkmeVe3x+vzA4gw+ZUMfVGhU1UqbazzQRjFSZrlRVnVTdv1wzjNy7rtx3ndz/v9AAjBP1aHn/mLxLONifSzNllxvCBKb2KWp2q68Twxettxf3b0AxSEUZykWV6UVd20XT+M07ys236c1/283w+AEIygGE6QFM2wHC+Ikqy8soeqG8/i3R3bcT0/CKM4SbO8KKu6abt+GKd5+YOw7u72h+PpfLne8AQiiUyh0ugMJovN4fL4AqFI7Pml25LJtbSv7tJB/tBMwRuzudgO1ByO07HlupMvSmhRD/15p/Xy3EgK4ySTuOEMGwFlnmxMMQiWMqEVQcaeaaMJkGXLsC7RmyVxI7Z6MM1fTrQoy++ic8ieSqsOSV/d8CmXp100JloyZFxpCH8cCFF9tPrMeIutGbpuo/tkB4J3Wl6oZ5jlk+ZsTNCcGr39RuF9xv7h1nxmweX15K+vJLegUOlwrvAZpqJ9aMKNd9OSb0O8UwvCKXhWWTKu+6c4Xjc79AOLJibjVAsaLlxwPNufYt4Re7a3FFttkQ2GsFyK6WbGWnMkFEBjBFBjm7AurDwns6iciBeuZOLjrlWpFu/gQ5vLXLxETJ/2LucldX+WyrJkeb5I48Nh8+ibQwqTj8ioOX1Sw4e6pLSiHJJIR7GdGrTnl93FqqwZSvFCOc6jMR6N5dRztiZcBXI4EOWu5pTdETV8r4xYPcYOqZ0M1Iz6PB8yFWBZcrN216hjIKir58345V60wkPuUoEinHFzwO7eDs2JsCdpqjIpZJ3zAr9r1TVRWbjEECDR7iMFSxH1k8bLJxVEHZgyUgCZBj6JAsu4Fawee5s5HT6ZfECmdIqKegsoOglC/0zJQAAFo07pPAWouhaIFniwH2U7ErVzgYyBSKpwE/LGq2t3rEQDYlJfXeokwGbtRWMagrd5S3FMmtEvfPV0RttXVhP00QgyNZWmULkKPDVwgXrMGUa6Nqdh0qBCyjYstQkmtAAjAXvZgIZJBi7b7v2FhBKtExYJ5a4Hu+d1oxRq/iK2eki0oPeEj1OWneh3JryGGVrlvdqOpOqOwGz6+CWn3u/T/a3IJ3FBevI1zIBdukX8BL4ds1y7rUtSRbnjDP1etwvSN1HUdbC5r8ddUqyiwiFBmxNv9RpmfXt10aJDAFX5oH5CNdHabugdixB1rUtLYdnmKXwcTy3yTOLZGQJzetKitZgpIPjoLzMF1Ton0NRLyhu6dNyiQUuG6GMlWO60RaOWzTX67usKiuFECGN5oxXp5rRsZAG14Eyuzsqi0lcsIXbhZXfE6EcNZIbQMe0oYAQgasNMBz3b7BUkHTFTg0RHoQhMlFZGGU/ejdeMfwpLflT1HFiEd7znbVfdav94mdP3O1MIyQDLftKTl4cVRG0qHVMl62E/A27D/FIprv6AhPMnZyCtkyiY2+6pcPhsG04nYIZDR726wQ2tPPykY/qi72XWgLJd/QA7GNW5ClDzf93Ax5/xDwF6LH+Ojcb7g0HTgZkhDLg1su2qLt5SbLB98Sv0n7jS8XkU1BIX6/wZHi1U+twvu9VQ3N3+DwAAAA==') format('woff2'),
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.woff?t=1596960292384') format('woff'),
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.ttf?t=1596960292384') format('truetype'),
+		/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.svg?t=1596960292384#iconfont') format('svg');
+}
+
+/* #endif */
+
+.u-iconfont {
+	position: relative;
+	display: flex;
+	font: normal normal normal 14px/1 "uicon-iconfont";
+	font-size: inherit;
+	text-rendering: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.u-iconfont::before {
+	display: flex;
+	align-items: center;
+}
+
+.uicon-en:before {
+	content: "\e70a";
+}
+
+.uicon-zh:before {
+	content: "\e692";
+}
+
+.uicon-level:before {
+	content: "\e693";
+}
+
+.uicon-woman:before {
+	content: "\e69c";
+}
+
+.uicon-man:before {
+	content: "\e697";
+}
+
+.uicon-column-line:before {
+	content: "\e68e";
+}
+
+.uicon-empty-page:before {
+	content: "\e627";
+}
+
+.uicon-empty-data:before {
+	content: "\e62f";
+}
+
+.uicon-empty-car:before {
+	content: "\e602";
+}
+
+.uicon-empty-order:before {
+	content: "\e639";
+}
+
+.uicon-empty-address:before {
+	content: "\e646";
+}
+
+.uicon-empty-message:before {
+	content: "\e6a9";
+}
+
+.uicon-empty-search:before {
+	content: "\e664";
+}
+
+.uicon-empty-favor:before {
+	content: "\e67c";
+}
+
+.uicon-empty-coupon:before {
+	content: "\e682";
+}
+
+.uicon-empty-history:before {
+	content: "\e684";
+}
+
+.uicon-empty-permission:before {
+	content: "\e686";
+}
+
+.uicon-empty-news:before {
+	content: "\e687";
+}
+
+.uicon-empty-wifi:before {
+	content: "\e688";
+}
+
+.uicon-empty-list:before {
+	content: "\e68b";
+}
+
+.uicon-arrow-left-double:before {
+	content: "\e68c";
+}
+
+.uicon-arrow-right-double:before {
+	content: "\e68d";
+}
+
+.uicon-red-packet:before {
+	content: "\e691";
+}
+
+.uicon-red-packet-fill:before {
+	content: "\e690";
+}
+
+.uicon-order:before {
+	content: "\e68f";
+}
+
+.uicon-nav-back-arrow:before {
+	content: "\e67f";
+}
+
+.uicon-nav-back:before {
+	content: "\e683";
+}
+
+.uicon-checkbox-mark:before {
+	content: "\e6a8";
+}
+
+.uicon-arrow-up-fill:before {
+	content: "\e6b0";
+}
+
+.uicon-arrow-down-fill:before {
+	content: "\e600";
+}
+
+.uicon-backspace:before {
+	content: "\e67b";
+}
+
+.uicon-android-circle-fill:before {
+	content: "\e67e";
+}
+
+.uicon-android-fill:before {
+	content: "\e67d";
+}
+
+.uicon-question:before {
+	content: "\e715";
+}
+
+.uicon-pause:before {
+	content: "\e8fa";
+}
+
+.uicon-close:before {
+	content: "\e685";
+}
+
+.uicon-volume-up:before {
+	content: "\e633";
+}
+
+.uicon-volume-off:before {
+	content: "\e644";
+}
+
+.uicon-info:before {
+	content: "\e653";
+}
+
+.uicon-error:before {
+	content: "\e6d3";
+}
+
+.uicon-lock-opened-fill:before {
+	content: "\e974";
+}
+
+.uicon-lock-fill:before {
+	content: "\e979";
+}
+
+.uicon-lock:before {
+	content: "\e97a";
+}
+
+.uicon-photo-fill:before {
+	content: "\e98b";
+}
+
+.uicon-photo:before {
+	content: "\e98d";
+}
+
+.uicon-account-fill:before {
+	content: "\e614";
+}
+
+.uicon-minus-people-fill:before {
+	content: "\e615";
+}
+
+.uicon-plus-people-fill:before {
+	content: "\e626";
+}
+
+.uicon-account:before {
+	content: "\e628";
+}
+
+.uicon-thumb-down-fill:before {
+	content: "\e726";
+}
+
+.uicon-thumb-down:before {
+	content: "\e727";
+}
+
+.uicon-thumb-up-fill:before {
+	content: "\e72f";
+}
+
+.uicon-thumb-up:before {
+	content: "\e733";
+}
+
+.uicon-person-delete-fill:before {
+	content: "\e66a";
+}
+
+.uicon-cut:before {
+	content: "\e948";
+}
+
+.uicon-fingerprint:before {
+	content: "\e955";
+}
+
+.uicon-home-fill:before {
+	content: "\e964";
+}
+
+.uicon-home:before {
+	content: "\e965";
+}
+
+.uicon-hourglass-half-fill:before {
+	content: "\e966";
+}
+
+.uicon-hourglass:before {
+	content: "\e967";
+}
+
+.uicon-lock-open:before {
+	content: "\e973";
+}
+
+.uicon-integral-fill:before {
+	content: "\e703";
+}
+
+.uicon-integral:before {
+	content: "\e704";
+}
+
+.uicon-coupon:before {
+	content: "\e8ae";
+}
+
+.uicon-coupon-fill:before {
+	content: "\e8c4";
+}
+
+.uicon-kefu-ermai:before {
+	content: "\e656";
+}
+
+.uicon-scan:before {
+	content: "\e662";
+}
+
+.uicon-rmb:before {
+	content: "\e608";
+}
+
+.uicon-rmb-circle-fill:before {
+	content: "\e657";
+}
+
+.uicon-rmb-circle:before {
+	content: "\e677";
+}
+
+.uicon-gift:before {
+	content: "\e65b";
+}
+
+.uicon-gift-fill:before {
+	content: "\e65c";
+}
+
+.uicon-bookmark-fill:before {
+	content: "\e63b";
+}
+
+.uicon-zhuanfa:before {
+	content: "\e60b";
+}
+
+.uicon-eye-off-outline:before {
+	content: "\e62b";
+}
+
+.uicon-eye-off:before {
+	content: "\e648";
+}
+
+.uicon-pause-circle:before {
+	content: "\e643";
+}
+
+.uicon-play-circle:before {
+	content: "\e647";
+}
+
+.uicon-pause-circle-fill:before {
+	content: "\e654";
+}
+
+.uicon-play-circle-fill:before {
+	content: "\e655";
+}
+
+.uicon-grid:before {
+	content: "\e673";
+}
+
+.uicon-play-right:before {
+	content: "\e610";
+}
+
+.uicon-play-left:before {
+	content: "\e66d";
+}
+
+.uicon-calendar:before {
+	content: "\e66e";
+}
+
+.uicon-rewind-right:before {
+	content: "\e66f";
+}
+
+.uicon-rewind-left:before {
+	content: "\e671";
+}
+
+.uicon-skip-forward-right:before {
+	content: "\e672";
+}
+
+.uicon-skip-back-left:before {
+	content: "\e674";
+}
+
+.uicon-play-left-fill:before {
+	content: "\e675";
+}
+
+.uicon-play-right-fill:before {
+	content: "\e676";
+}
+
+.uicon-grid-fill:before {
+	content: "\e678";
+}
+
+.uicon-rewind-left-fill:before {
+	content: "\e679";
+}
+
+.uicon-rewind-right-fill:before {
+	content: "\e67a";
+}
+
+.uicon-pushpin:before {
+	content: "\e7e3";
+}
+
+.uicon-star:before {
+	content: "\e65f";
+}
+
+.uicon-star-fill:before {
+	content: "\e669";
+}
+
+.uicon-server-fill:before {
+	content: "\e751";
+}
+
+.uicon-server-man:before {
+	content: "\e6bc";
+}
+
+.uicon-edit-pen:before {
+	content: "\e612";
+}
+
+.uicon-edit-pen-fill:before {
+	content: "\e66b";
+}
+
+.uicon-wifi:before {
+	content: "\e667";
+}
+
+.uicon-wifi-off:before {
+	content: "\e668";
+}
+
+.uicon-file-text:before {
+	content: "\e663";
+}
+
+.uicon-file-text-fill:before {
+	content: "\e665";
+}
+
+.uicon-more-dot-fill:before {
+	content: "\e630";
+}
+
+.uicon-minus:before {
+	content: "\e618";
+}
+
+.uicon-minus-circle:before {
+	content: "\e61b";
+}
+
+.uicon-plus:before {
+	content: "\e62d";
+}
+
+.uicon-plus-circle:before {
+	content: "\e62e";
+}
+
+.uicon-minus-circle-fill:before {
+	content: "\e652";
+}
+
+.uicon-plus-circle-fill:before {
+	content: "\e661";
+}
+
+.uicon-email:before {
+	content: "\e611";
+}
+
+.uicon-email-fill:before {
+	content: "\e642";
+}
+
+.uicon-phone:before {
+	content: "\e622";
+}
+
+.uicon-phone-fill:before {
+	content: "\e64f";
+}
+
+.uicon-clock:before {
+	content: "\e60f";
+}
+
+.uicon-car:before {
+	content: "\e60c";
+}
+
+.uicon-car-fill:before {
+	content: "\e636";
+}
+
+.uicon-warning:before {
+	content: "\e694";
+}
+
+.uicon-warning-fill:before {
+	content: "\e64d";
+}
+
+.uicon-search:before {
+	content: "\e62a";
+}
+
+.uicon-baidu-circle-fill:before {
+	content: "\e680";
+}
+
+.uicon-baidu:before {
+	content: "\e681";
+}
+
+.uicon-facebook:before {
+	content: "\e689";
+}
+
+.uicon-facebook-circle-fill:before {
+	content: "\e68a";
+}
+
+.uicon-qzone:before {
+	content: "\e695";
+}
+
+.uicon-qzone-circle-fill:before {
+	content: "\e696";
+}
+
+.uicon-moments-circel-fill:before {
+	content: "\e69a";
+}
+
+.uicon-moments:before {
+	content: "\e69b";
+}
+
+.uicon-qq-circle-fill:before {
+	content: "\e6a0";
+}
+
+.uicon-qq-fill:before {
+	content: "\e6a1";
+}
+
+.uicon-weibo:before {
+	content: "\e6a4";
+}
+
+.uicon-weibo-circle-fill:before {
+	content: "\e6a5";
+}
+
+.uicon-taobao:before {
+	content: "\e6a6";
+}
+
+.uicon-taobao-circle-fill:before {
+	content: "\e6a7";
+}
+
+.uicon-twitter:before {
+	content: "\e6aa";
+}
+
+.uicon-twitter-circle-fill:before {
+	content: "\e6ab";
+}
+
+.uicon-weixin-circle-fill:before {
+	content: "\e6b1";
+}
+
+.uicon-weixin-fill:before {
+	content: "\e6b2";
+}
+
+.uicon-zhifubao-circle-fill:before {
+	content: "\e6b8";
+}
+
+.uicon-zhifubao:before {
+	content: "\e6b9";
+}
+
+.uicon-zhihu:before {
+	content: "\e6ba";
+}
+
+.uicon-zhihu-circle-fill:before {
+	content: "\e709";
+}
+
+.uicon-list:before {
+	content: "\e650";
+}
+
+.uicon-list-dot:before {
+	content: "\e616";
+}
+
+.uicon-setting:before {
+	content: "\e61f";
+}
+
+.uicon-bell:before {
+	content: "\e609";
+}
+
+.uicon-bell-fill:before {
+	content: "\e640";
+}
+
+.uicon-attach:before {
+	content: "\e632";
+}
+
+.uicon-shopping-cart:before {
+	content: "\e621";
+}
+
+.uicon-shopping-cart-fill:before {
+	content: "\e65d";
+}
+
+.uicon-tags:before {
+	content: "\e629";
+}
+
+.uicon-share:before {
+	content: "\e631";
+}
+
+.uicon-question-circle-fill:before {
+	content: "\e666";
+}
+
+.uicon-question-circle:before {
+	content: "\e625";
+}
+
+.uicon-error-circle:before {
+	content: "\e624";
+}
+
+.uicon-checkmark-circle:before {
+	content: "\e63d";
+}
+
+.uicon-close-circle:before {
+	content: "\e63f";
+}
+
+.uicon-info-circle:before {
+	content: "\e660";
+}
+
+.uicon-md-person-add:before {
+	content: "\e6e4";
+}
+
+.uicon-md-person-fill:before {
+	content: "\e6ea";
+}
+
+.uicon-bag-fill:before {
+	content: "\e617";
+}
+
+.uicon-bag:before {
+	content: "\e619";
+}
+
+.uicon-chat-fill:before {
+	content: "\e61e";
+}
+
+.uicon-chat:before {
+	content: "\e620";
+}
+
+.uicon-more-circle:before {
+	content: "\e63e";
+}
+
+.uicon-more-circle-fill:before {
+	content: "\e645";
+}
+
+.uicon-volume:before {
+	content: "\e66c";
+}
+
+.uicon-volume-fill:before {
+	content: "\e670";
+}
+
+.uicon-reload:before {
+	content: "\e788";
+}
+
+.uicon-camera:before {
+	content: "\e7d7";
+}
+
+.uicon-heart:before {
+	content: "\e7df";
+}
+
+.uicon-heart-fill:before {
+	content: "\e851";
+}
+
+.uicon-minus-square-fill:before {
+	content: "\e855";
+}
+
+.uicon-plus-square-fill:before {
+	content: "\e856";
+}
+
+.uicon-pushpin-fill:before {
+	content: "\e86e";
+}
+
+.uicon-camera-fill:before {
+	content: "\e870";
+}
+
+.uicon-setting-fill:before {
+	content: "\e872";
+}
+
+.uicon-google:before {
+	content: "\e87a";
+}
+
+.uicon-ie:before {
+	content: "\e87b";
+}
+
+.uicon-apple-fill:before {
+	content: "\e881";
+}
+
+.uicon-chrome-circle-fill:before {
+	content: "\e885";
+}
+
+.uicon-github-circle-fill:before {
+	content: "\e887";
+}
+
+.uicon-IE-circle-fill:before {
+	content: "\e889";
+}
+
+.uicon-google-circle-fill:before {
+	content: "\e88a";
+}
+
+.uicon-arrow-down:before {
+	content: "\e60d";
+}
+
+.uicon-arrow-left:before {
+	content: "\e60e";
+}
+
+.uicon-map:before {
+	content: "\e61d";
+}
+
+.uicon-man-add-fill:before {
+	content: "\e64c";
+}
+
+.uicon-tags-fill:before {
+	content: "\e651";
+}
+
+.uicon-arrow-leftward:before {
+	content: "\e601";
+}
+
+.uicon-arrow-rightward:before {
+	content: "\e603";
+}
+
+.uicon-arrow-downward:before {
+	content: "\e604";
+}
+
+.uicon-arrow-right:before {
+	content: "\e605";
+}
+
+.uicon-arrow-up:before {
+	content: "\e606";
+}
+
+.uicon-arrow-upward:before {
+	content: "\e607";
+}
+
+.uicon-bookmark:before {
+	content: "\e60a";
+}
+
+.uicon-eye:before {
+	content: "\e613";
+}
+
+.uicon-man-delete:before {
+	content: "\e61a";
+}
+
+.uicon-man-add:before {
+	content: "\e61c";
+}
+
+.uicon-trash:before {
+	content: "\e623";
+}
+
+.uicon-error-circle-fill:before {
+	content: "\e62c";
+}
+
+.uicon-calendar-fill:before {
+	content: "\e634";
+}
+
+.uicon-checkmark-circle-fill:before {
+	content: "\e635";
+}
+
+.uicon-close-circle-fill:before {
+	content: "\e637";
+}
+
+.uicon-clock-fill:before {
+	content: "\e638";
+}
+
+.uicon-checkmark:before {
+	content: "\e63a";
+}
+
+.uicon-download:before {
+	content: "\e63c";
+}
+
+.uicon-eye-fill:before {
+	content: "\e641";
+}
+
+.uicon-mic-off:before {
+	content: "\e649";
+}
+
+.uicon-mic:before {
+	content: "\e64a";
+}
+
+.uicon-info-circle-fill:before {
+	content: "\e64b";
+}
+
+.uicon-map-fill:before {
+	content: "\e64e";
+}
+
+.uicon-trash-fill:before {
+	content: "\e658";
+}
+
+.uicon-volume-off-fill:before {
+	content: "\e659";
+}
+
+.uicon-volume-up-fill:before {
+	content: "\e65a";
+}
+
+.uicon-share-fill:before {
+	content: "\e65e";
+}
diff --git a/uview-ui/index.js b/uview-ui/index.js
new file mode 100644
index 0000000..d38a3bf
--- /dev/null
+++ b/uview-ui/index.js
@@ -0,0 +1,141 @@
+// 引入全局mixin
+import mixin from './libs/mixin/mixin.js'
+// 引入关于是否mixin集成小程序分享的配置
+// import wxshare from './libs/mixin/mpShare.js'
+// 全局挂载引入http相关请求拦截插件
+import http from './libs/request'
+
+function wranning(str) {
+	// 开发环境进行信息输出,主要是一些报错信息
+	// 这个环境的来由是在程序编写时候,点击hx编辑器运行调试代码的时候,详见:
+	// 	https://uniapp.dcloud.io/frame?id=%e5%bc%80%e5%8f%91%e7%8e%af%e5%a2%83%e5%92%8c%e7%94%9f%e4%ba%a7%e7%8e%af%e5%a2%83
+	if (process.env.NODE_ENV === 'development') {
+		console.warn(str)
+	}
+}
+
+// 尝试判断在根目录的/store中是否有$u.mixin.js，此文件uView默认为需要挂在到全局的vuex的state变量
+// HX2.6.11版本,放到try中,控制台依然会警告,暂时不用此方式，
+// let vuexStore = {};
+// try {
+// 	vuexStore = require("@/store/$u.mixin.js");
+// } catch (e) {
+// 	//TODO handle the exception
+// }
+
+// post类型对象参数转为get类型url参数
+import queryParams from './libs/function/queryParams.js'
+// 路由封装
+import route from './libs/function/route.js'
+// 时间格式化
+import timeFormat from './libs/function/timeFormat.js'
+// 时间戳格式化,返回多久之前
+import timeFrom from './libs/function/timeFrom.js'
+// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
+import colorGradient from './libs/function/colorGradient.js'
+// 生成全局唯一guid字符串
+import guid from './libs/function/guid.js'
+// 主题相关颜色,info|success|warning|primary|default|error,此颜色已在uview.scss中定义,但是为js中也能使用,故也定义一份
+import color from './libs/function/color.js'
+// 根据type获取图标名称
+import type2icon from './libs/function/type2icon.js'
+// 打乱数组的顺序
+import randomArray from './libs/function/randomArray.js'
+// 对象和数组的深度克隆
+import deepClone from './libs/function/deepClone.js'
+// 对象深度拷贝
+import deepMerge from './libs/function/deepMerge.js'
+// 添加单位
+import addUnit from './libs/function/addUnit.js'
+
+// 规则检验
+import test from './libs/function/test.js'
+// 随机数
+import random from './libs/function/random.js'
+// 去除空格
+import trim from './libs/function/trim.js'
+// toast提示，对uni.showToast的封装
+import toast from './libs/function/toast.js'
+// 获取父组件参数
+import getParent from './libs/function/getParent.js'
+// 获取整个父组件
+import $parent from './libs/function/$parent.js'
+// 获取sys()和os()工具方法
+// 获取设备信息，挂载到$u的sys()(system的缩写)属性中，
+// 同时把安卓和ios平台的名称"ios"和"android"挂到$u.os()中，方便取用
+import {sys, os} from './libs/function/sys.js'
+// 防抖方法
+import debounce from './libs/function/debounce.js'
+// 节流方法
+import throttle from './libs/function/throttle.js'
+
+
+// 配置信息
+import config from './libs/config/config.js'
+// 各个需要fixed的地方的z-index配置文件
+import zIndex from './libs/config/zIndex.js'
+
+const $u = {
+	queryParams: queryParams,
+	route: route,
+	timeFormat: timeFormat,
+	date: timeFormat, // 另名date
+	timeFrom,
+	colorGradient: colorGradient.colorGradient,
+	colorToRgba: colorGradient.colorToRgba,
+	guid,
+	color,
+	sys,
+	os,
+	type2icon,
+	randomArray,
+	wranning,
+	get: http.get,
+	post: http.post,
+	put: http.put,
+	'delete': http.delete,
+	hexToRgb: colorGradient.hexToRgb,
+	rgbToHex: colorGradient.rgbToHex,
+	test,
+	random,
+	deepClone,
+	deepMerge,
+	getParent,
+	$parent,
+	addUnit,
+	trim,
+	type: ['primary', 'success', 'error', 'warning', 'info'],
+	http,
+	toast,
+	config, // uView配置信息相关，比如版本号
+	zIndex,
+	debounce,
+	throttle,
+}
+
+// $u挂载到uni对象上
+uni.$u = $u
+
+const install = Vue => {
+	Vue.mixin(mixin) 
+	if (Vue.prototype.openShare) {
+		Vue.mixin(mpShare);
+	}
+	// Vue.mixin(vuexStore);
+	// 时间格式化，同时两个名称，date和timeFormat
+	Vue.filter('timeFormat', (timestamp, format) => {
+		return timeFormat(timestamp, format)
+	})
+	Vue.filter('date', (timestamp, format) => {
+		return timeFormat(timestamp, format)
+	})
+	// 将多久以前的方法，注入到全局过滤器
+	Vue.filter('timeFrom', (timestamp, format) => {
+		return timeFrom(timestamp, format)
+	})
+	Vue.prototype.$u = $u
+}
+
+export default {
+	install
+}
\ No newline at end of file
diff --git a/uview-ui/index.scss b/uview-ui/index.scss
new file mode 100644
index 0000000..84daa72
--- /dev/null
+++ b/uview-ui/index.scss
@@ -0,0 +1,23 @@
+// 引入公共基础类
+@import "./libs/css/common.scss";
+@import "./libs/css/color.scss";
+
+// 非nvue的样式
+/* #ifndef APP-NVUE */
+@import "./libs/css/style.vue.scss";
+/* #endif */
+
+// nvue的特有样式
+/* #ifdef APP-NVUE */
+@import "./libs/css/style.nvue.scss";
+/* #endif */
+
+// 小程序特有的样式
+/* #ifdef MP */
+@import "./libs/css/style.mp.scss";
+/* #endif */
+
+// H5特有的样式
+/* #ifdef H5 */
+@import "./libs/css/style.h5.scss";
+/* #endif */
\ No newline at end of file
diff --git a/uview-ui/libs/config/config.js b/uview-ui/libs/config/config.js
new file mode 100644
index 0000000..ac3c65e
--- /dev/null
+++ b/uview-ui/libs/config/config.js
@@ -0,0 +1,15 @@
+// 此版本发布于2020-12-17
+let version = '1.8.3';
+
+export default {
+	v: version,
+	version: version,
+	// 主题名称
+	type: [
+		'primary',
+		'success',
+		'info',
+		'error',
+		'warning'
+	]
+}
\ No newline at end of file
diff --git a/uview-ui/libs/config/zIndex.js b/uview-ui/libs/config/zIndex.js
new file mode 100644
index 0000000..d60e5bd
--- /dev/null
+++ b/uview-ui/libs/config/zIndex.js
@@ -0,0 +1,20 @@
+// uniapp在H5中各API的z-index值如下：
+/**
+ * actionsheet: 999
+ * modal: 999
+ * navigate: 998
+ * tabbar: 998
+ * toast: 999
+ */
+
+export default {
+	toast: 10090,
+	noNetwork: 10080,
+	// popup包含popup，actionsheet，keyboard，picker的值
+	popup: 10075,
+	mask: 10070,
+	navbar: 980,
+	topTips: 975,
+	sticky: 970,
+	indexListSticky: 965,
+}
\ No newline at end of file
diff --git a/uview-ui/libs/css/color.scss b/uview-ui/libs/css/color.scss
new file mode 100644
index 0000000..279bc40
--- /dev/null
+++ b/uview-ui/libs/css/color.scss
@@ -0,0 +1,155 @@
+.u-type-primary-light {
+	color: $u-type-primary-light;
+}
+
+.u-type-warning-light {
+	color: $u-type-warning-light;
+}
+
+.u-type-success-light {
+	color: $u-type-success-light;
+}
+
+.u-type-error-light {
+	color: $u-type-error-light;
+}
+
+.u-type-info-light {
+	color: $u-type-info-light;
+}
+
+.u-type-primary-light-bg {
+	background-color: $u-type-primary-light;
+}
+
+.u-type-warning-light-bg {
+	background-color: $u-type-warning-light;
+}
+
+.u-type-success-light-bg {
+	background-color: $u-type-success-light;
+}
+
+.u-type-error-light-bg {
+	background-color: $u-type-error-light;
+}
+
+.u-type-info-light-bg {
+	background-color: $u-type-info-light;
+}
+
+.u-type-primary-dark {
+	color: $u-type-primary-dark;
+}
+
+.u-type-warning-dark {
+	color: $u-type-warning-dark;
+}
+
+.u-type-success-dark {
+	color: $u-type-success-dark;
+}
+
+.u-type-error-dark {
+	color: $u-type-error-dark;
+}
+
+.u-type-info-dark {
+	color: $u-type-info-dark;
+}
+
+.u-type-primary-dark-bg {
+	background-color: $u-type-primary-dark;
+}
+
+.u-type-warning-dark-bg {
+	background-color: $u-type-warning-dark;
+}
+
+.u-type-success-dark-bg {
+	background-color: $u-type-success-dark;
+}
+
+.u-type-error-dark-bg {
+	background-color: $u-type-error-dark;
+}
+
+.u-type-info-dark-bg {
+	background-color: $u-type-info-dark;
+}
+
+.u-type-primary-disabled {
+	color: $u-type-primary-disabled;
+}
+
+.u-type-warning-disabled {
+	color: $u-type-warning-disabled;
+}
+
+.u-type-success-disabled {
+	color: $u-type-success-disabled;
+}
+
+.u-type-error-disabled {
+	color: $u-type-error-disabled;
+}
+
+.u-type-info-disabled {
+	color: $u-type-info-disabled;
+}
+
+.u-type-primary {
+	color: $u-type-primary;
+}
+
+.u-type-warning {
+	color: $u-type-warning;
+}
+
+.u-type-success {
+	color: $u-type-success;
+}
+
+.u-type-error {
+	color: $u-type-error;
+}
+
+.u-type-info {
+	color: $u-type-info;
+}
+
+.u-type-primary-bg {
+	background-color: $u-type-primary;
+}
+
+.u-type-warning-bg {
+	background-color: $u-type-warning;
+}
+
+.u-type-success-bg {
+	background-color: $u-type-success;
+}
+
+.u-type-error-bg {
+	background-color: $u-type-error;
+}
+
+.u-type-info-bg {
+	background-color: $u-type-info;
+}
+
+.u-main-color {
+	color: $u-main-color;
+}
+
+.u-content-color {
+	color: $u-content-color;
+}
+
+.u-tips-color {
+	color: $u-tips-color;
+}
+
+.u-light-color {
+	color: $u-light-color;
+}
diff --git a/uview-ui/libs/css/common.scss b/uview-ui/libs/css/common.scss
new file mode 100644
index 0000000..29eb7f4
--- /dev/null
+++ b/uview-ui/libs/css/common.scss
@@ -0,0 +1,176 @@
+.u-relative,
+.u-rela {
+	position: relative;
+}
+
+.u-absolute,
+.u-abso {
+	position: absolute;
+}
+
+// nvue不能用标签命名样式，不能放在微信组件中，否则微信开发工具会报警告，无法使用标签名当做选择器
+/* #ifndef APP-NVUE */
+image {
+	display: inline-block;
+}
+
+// 在weex，也即nvue中，所有元素默认为border-box
+view,
+text {
+	box-sizing: border-box;
+}
+/* #endif */
+
+.u-font-xs {
+	font-size: 22rpx;
+}
+
+.u-font-sm {
+	font-size: 26rpx;
+}
+
+.u-font-md {
+	font-size: 28rpx;
+}
+
+.u-font-lg {
+	font-size: 30rpx;
+}
+
+.u-font-xl {
+	font-size: 34rpx;
+}
+
+.u-flex {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+}
+
+.u-flex-wrap {
+	flex-wrap: wrap;
+}
+
+.u-flex-nowrap {
+	flex-wrap: nowrap;
+}
+
+.u-col-center {
+	align-items: center;
+}
+
+.u-col-top {
+	align-items: flex-start;
+}
+
+.u-col-bottom {
+	align-items: flex-end;
+}
+
+.u-row-center {
+	justify-content: center;
+}
+
+.u-row-left {
+	justify-content: flex-start;
+}
+
+.u-row-right {
+	justify-content: flex-end;
+}
+
+.u-row-between {
+	justify-content: space-between;
+}
+
+.u-row-around {
+	justify-content: space-around;
+}
+
+.u-text-left {
+	text-align: left;
+}
+
+.u-text-center {
+	text-align: center;
+}
+
+.u-text-right {
+	text-align: right;
+}
+
+.u-flex-col {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+// 定义flex等分
+@for $i from 0 through 12 {
+	.u-flex-#{$i} {
+		flex: $i;
+	}
+}
+
+// 定义字体(px)单位，小于20都为px单位字体
+@for $i from 9 to 20 {
+	.u-font-#{$i} {
+		font-size: $i + px;
+	}
+}
+
+// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+@for $i from 20 through 40 {
+	.u-font-#{$i} {
+		font-size: $i + rpx;
+	}
+}
+
+// 定义内外边距，历遍1-80
+@for $i from 0 through 80 {
+	// 只要双数和能被5除尽的数
+	@if $i % 2 == 0 or $i % 5 == 0 {
+		// 得出：u-margin-30或者u-m-30
+		.u-margin-#{$i}, .u-m-#{$i} {
+			margin: $i + rpx!important;
+		}
+		
+		// 得出：u-padding-30或者u-p-30
+		.u-padding-#{$i}, .u-p-#{$i} {
+			padding: $i + rpx!important;
+		}
+		
+		@each $short, $long in l left, t top, r right, b bottom {
+			// 缩写版，结果如： u-m-l-30
+			// 定义外边距
+			.u-m-#{$short}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-p-#{$short}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+			
+			// 完整版，结果如：u-margin-left-30
+			// 定义外边距
+			.u-margin-#{$long}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-padding-#{$long}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+		}
+	}
+}
+
+// 重置nvue的默认关于flex的样式
+.u-reset-nvue {
+	flex-direction: row;
+	align-items: center;
+}
\ No newline at end of file
diff --git a/uview-ui/libs/css/style.components.scss b/uview-ui/libs/css/style.components.scss
new file mode 100644
index 0000000..6835876
--- /dev/null
+++ b/uview-ui/libs/css/style.components.scss
@@ -0,0 +1,7 @@
+// 定义混入指令，用于在非nvue环境下的flex定义，因为nvue没有display属性，会报错
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
\ No newline at end of file
diff --git a/uview-ui/libs/css/style.h5.scss b/uview-ui/libs/css/style.h5.scss
new file mode 100644
index 0000000..62839eb
--- /dev/null
+++ b/uview-ui/libs/css/style.h5.scss
@@ -0,0 +1,8 @@
+/* H5的时候，隐藏滚动条 */
+::-webkit-scrollbar {
+	display: none;  
+	width: 0 !important;  
+	height: 0 !important;  
+	-webkit-appearance: none;  
+	background: transparent;  
+}
diff --git a/uview-ui/libs/css/style.mp.scss b/uview-ui/libs/css/style.mp.scss
new file mode 100644
index 0000000..ca1d3e0
--- /dev/null
+++ b/uview-ui/libs/css/style.mp.scss
@@ -0,0 +1,72 @@
+/* start--微信小程序编译后页面有组件名的元素，特别处理--start */
+/* #ifdef MP-WEIXIN || MP-QQ */
+u-td, u-th {
+	flex: 1;
+	align-self: stretch;
+}
+
+.u-td {
+	height: 100%;
+}
+
+u-icon {
+	display: inline-flex;
+	align-items: center;
+}
+
+// 各家小程序宫格组件外层设置为100%，避免受到父元素display: flex;的影响
+u-grid {
+	width: 100%;
+	flex: 0 0 100%;
+}
+
+// 避免小程序线条组件因为父组件display: flex;而失效
+u-line {
+	flex: 1;
+}
+
+u-switch {
+	display: inline-flex;
+	align-items: center;
+}
+
+u-dropdown {
+	flex: 1;
+}
+/* #endif */
+/* end-微信小程序编译后页面有组件名的元素，特别处理--end */
+
+
+/* #ifdef MP-QQ || MP-TOUTIAO */
+// 需要做这一切额外的兼容，都是因为TX的无能
+u-icon {
+	line-height: 0;
+}
+/* #endif */
+
+/* start--头条小程序编译后页面有组件名的元素，特别处理--start */
+// 由于头条小程序不支持直接组件名形式写样式，目前只能在写组件的时候给组件加上对应的类名
+/* #ifdef MP-TOUTIAO */
+.u-td, .u-th, .u-tr {
+	flex: 1;
+	align-self: stretch;
+}
+
+.u-row, .u-col {
+	flex: 1;
+	align-self: stretch;
+}
+
+// 避免小程序线条组件因为父组件display: flex;而失效
+.u-line {
+	flex: 1;
+}
+
+.u-dropdown {
+	flex: 1;
+}
+/* #endif */
+/* end-头条小程序编译后页面有组件名的元素，特别处理--end */
+
+
+
diff --git a/uview-ui/libs/css/style.nvue.scss b/uview-ui/libs/css/style.nvue.scss
new file mode 100644
index 0000000..4a6192a
--- /dev/null
+++ b/uview-ui/libs/css/style.nvue.scss
@@ -0,0 +1,3 @@
+.nvue {
+	font-size: 24rpx;
+}
\ No newline at end of file
diff --git a/uview-ui/libs/css/style.vue.scss b/uview-ui/libs/css/style.vue.scss
new file mode 100644
index 0000000..1ab3707
--- /dev/null
+++ b/uview-ui/libs/css/style.vue.scss
@@ -0,0 +1,175 @@
+page {
+	color: $u-main-color;
+	font-size: 28rpx;
+}
+
+/* start--去除webkit的默认样式--start */
+.u-fix-ios-appearance {
+	-webkit-appearance:none;
+}
+/* end--去除webkit的默认样式--end */
+
+/* start--icon图标外层套一个view，让其达到更好的垂直居中的效果--start */
+.u-icon-wrap {
+	display: flex;
+	align-items: center;
+}
+/* end-icon图标外层套一个view，让其达到更好的垂直居中的效果--end */
+
+/* start--iPhoneX底部安全区定义--start */
+.safe-area-inset-bottom {
+  padding-bottom: 0;  
+  padding-bottom: constant(safe-area-inset-bottom);  
+  padding-bottom: env(safe-area-inset-bottom);  
+} 
+/* end-iPhoneX底部安全区定义--end */
+
+/* start--各种hover点击反馈相关的类名-start */
+.u-hover-class {
+	// background-color: #f7f8f9!important;
+	opacity: 0.6;
+}
+
+.u-cell-hover {
+	background-color: #f7f8f9!important;
+}
+/* end--各种hover点击反馈相关的类名--end */
+
+/* start--文本行数限制--start */
+.u-line-1 {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.u-line-2 {
+    -webkit-line-clamp: 2;
+}
+
+.u-line-3 {
+    -webkit-line-clamp: 3;
+}
+
+.u-line-4 {
+    -webkit-line-clamp: 4;
+}
+
+.u-line-5 {
+    -webkit-line-clamp: 5;
+}
+
+.u-line-2, .u-line-3, .u-line-4, .u-line-5 {
+    overflow: hidden;
+	word-break: break-all;
+    text-overflow: ellipsis; 
+    display: -webkit-box; // 弹性伸缩盒
+    -webkit-box-orient: vertical; // 设置伸缩盒子元素排列方式
+}
+
+/* end--文本行数限制--end */
+
+
+/* start--Retina 屏幕下的 1px 边框--start */
+.u-border,
+.u-border-bottom,
+.u-border-left,
+.u-border-right,
+.u-border-top,
+.u-border-top-bottom {
+	position: relative
+}
+
+.u-border-bottom:after,
+.u-border-left:after,
+.u-border-right:after,
+.u-border-top-bottom:after,
+.u-border-top:after,
+.u-border:after {
+	/* #ifndef APP-NVUE */
+	content: ' ';
+	/* #endif */
+	position: absolute;
+	left: 0;
+	top: 0;
+	pointer-events: none;
+	box-sizing: border-box;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	// 多加0.1%，能解决有时候边框缺失的问题
+	width: 199.8%;
+	height: 199.7%;
+	transform: scale(0.5, 0.5);
+	border: 0 solid $u-border-color;
+	z-index: 2;
+}
+
+.u-border-top:after {
+	border-top-width: 1px
+}
+
+.u-border-left:after {
+	border-left-width: 1px
+}
+
+.u-border-right:after {
+	border-right-width: 1px
+}
+
+.u-border-bottom:after {
+	border-bottom-width: 1px
+}
+
+.u-border-top-bottom:after {
+	border-width: 1px 0
+}
+
+.u-border:after {
+	border-width: 1px
+}
+/* end--Retina 屏幕下的 1px 边框--end */
+
+
+/* start--clearfix--start */
+.u-clearfix:after,
+.clearfix:after {
+	/* #ifndef APP-NVUE */
+	content: '';
+	/* #endif */
+	display: table;
+	clear: both
+}
+/* end--clearfix--end */
+
+/* start--高斯模糊tabbar底部处理--start */
+.u-blur-effect-inset {
+	width: 750rpx;  
+	height: var(--window-bottom);   
+	background-color: #FFFFFF;  
+}
+/* end--高斯模糊tabbar底部处理--end */
+
+/* start--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--start */
+/* #ifdef H5 */
+uni-toast {
+    z-index: 10090;
+}
+uni-toast .uni-toast {
+   z-index: 10090;
+}
+/* #endif */
+/* end--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--end */
+
+/* start--去除button的所有默认样式--start */
+.u-reset-button {
+	padding: 0;
+	font-size: inherit;
+	line-height: inherit;
+	background-color: transparent;
+	color: inherit;
+}
+
+.u-reset-button::after {
+   border: none;
+}
+/* end--去除button的所有默认样式--end */
+
diff --git a/uview-ui/libs/function/$parent.js b/uview-ui/libs/function/$parent.js
new file mode 100644
index 0000000..80515c4
--- /dev/null
+++ b/uview-ui/libs/function/$parent.js
@@ -0,0 +1,18 @@
+// 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+// this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+// 这里默认值等于undefined有它的含义，因为最顶层元素(组件)的$parent就是undefined，意味着不传name
+// 值(默认为undefined)，就是查找最顶层的$parent
+export default function $parent(name = undefined) {
+	let parent = this.$parent;
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options && parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent;
+		} else {
+			return parent;
+		}
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/uview-ui/libs/function/addUnit.js b/uview-ui/libs/function/addUnit.js
new file mode 100644
index 0000000..247fae2
--- /dev/null
+++ b/uview-ui/libs/function/addUnit.js
@@ -0,0 +1,8 @@
+import validation from './test.js';
+
+// 添加单位，如果有rpx，%，px等单位结尾或者值为auto，直接返回，否则加上rpx单位结尾
+export default function addUnit(value = 'auto', unit = 'rpx') {
+    value = String(value);
+	// 用uView内置验证规则中的number判断是否为数值
+    return validation.number(value) ? `${value}${unit}` : value;
+}
\ No newline at end of file
diff --git a/uview-ui/libs/function/bem.js b/uview-ui/libs/function/bem.js
new file mode 100644
index 0000000..05d1a36
--- /dev/null
+++ b/uview-ui/libs/function/bem.js
@@ -0,0 +1,5 @@
+function bem(name, conf) {
+  
+}
+
+module.exports.bem = bem;
diff --git a/uview-ui/libs/function/color.js b/uview-ui/libs/function/color.js
new file mode 100644
index 0000000..dafb8c1
--- /dev/null
+++ b/uview-ui/libs/function/color.js
@@ -0,0 +1,37 @@
+// 为了让用户能够自定义主题，会逐步弃用此文件，各颜色通过css提供
+// 为了给某些特殊场景使用和向后兼容，无需删除此文件(2020-06-20)
+let color = {
+	primary: "#2979ff",
+	primaryDark: "#2b85e4",
+	primaryDisabled: "#a0cfff",
+	primaryLight: "#ecf5ff",
+	bgColor: "#f3f4f6",
+	
+	info: "#909399",
+	infoDark: "#82848a",
+	infoDisabled: "#c8c9cc",
+	infoLight: "#f4f4f5",
+	
+	warning: "#ff9900",
+	warningDark: "#f29100",
+	warningDisabled: "#fcbd71",
+	warningLight: "#fdf6ec",
+	
+	error: "#fa3534",
+	errorDark: "#dd6161",
+	errorDisabled: "#fab6b6",
+	errorLight: "#fef0f0",
+	
+	success: "#19be6b",
+	successDark: "#18b566",
+	successDisabled: "#71d5a1",
+	successLight: "#dbf1e1",
+	
+	mainColor: "#303133",
+	contentColor: "#606266",
+	tipsColor: "#909399",
+	lightColor: "#c0c4cc",
+	borderColor: "#e4e7ed"
+}
+
+export default color;
\ No newline at end of file
diff --git a/uview-ui/libs/function/colorGradient.js b/uview-ui/libs/function/colorGradient.js
new file mode 100644
index 0000000..eca30a2
--- /dev/null
+++ b/uview-ui/libs/function/colorGradient.js
@@ -0,0 +1,134 @@
+/**
+ * 求两个颜色之间的渐变值
+ * @param {string} startColor 开始的颜色
+ * @param {string} endColor 结束的颜色
+ * @param {number} step 颜色等分的份额
+ * */
+function colorGradient(startColor = 'rgb(0, 0, 0)', endColor = 'rgb(255, 255, 255)', step = 10) {
+	let startRGB = hexToRgb(startColor, false); //转换为rgb数组模式
+	let startR = startRGB[0];
+	let startG = startRGB[1];
+	let startB = startRGB[2];
+
+	let endRGB = hexToRgb(endColor, false);
+	let endR = endRGB[0];
+	let endG = endRGB[1];
+	let endB = endRGB[2];
+
+	let sR = (endR - startR) / step; //总差值
+	let sG = (endG - startG) / step;
+	let sB = (endB - startB) / step;
+	let colorArr = [];
+	for (let i = 0; i < step; i++) {
+		//计算每一步的hex值 
+		let hex = rgbToHex('rgb(' + Math.round((sR * i + startR)) + ',' + Math.round((sG * i + startG)) + ',' + Math.round((sB *
+			i + startB)) + ')');
+		colorArr.push(hex);
+	}
+	return colorArr;
+}
+
+// 将hex表示方式转换为rgb表示方式(这里返回rgb数组模式)
+function hexToRgb(sColor, str = true) {
+	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+	sColor = sColor.toLowerCase();
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4) {
+			let sColorNew = "#";
+			for (let i = 1; i < 4; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1));
+			}
+			sColor = sColorNew;
+		}
+		//处理六位的颜色值
+		let sColorChange = [];
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2)));
+		}
+		if(!str) {
+			return sColorChange;
+		} else {
+			return `rgb(${sColorChange[0]},${sColorChange[1]},${sColorChange[2]})`;
+		}
+	} else if (/^(rgb|RGB)/.test(sColor)) {
+		let arr = sColor.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",")
+		return arr.map(val => Number(val));
+	} else {
+		return sColor;
+	}
+};
+
+// 将rgb表示方式转换为hex表示方式
+function rgbToHex(rgb) {
+	let _this = rgb;
+	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+	if (/^(rgb|RGB)/.test(_this)) {
+		let aColor = _this.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",");
+		let strHex = "#";
+		for (let i = 0; i < aColor.length; i++) {
+			let hex = Number(aColor[i]).toString(16);
+			hex = String(hex).length == 1 ? 0 + '' + hex : hex; // 保证每个rgb的值为2位
+			if (hex === "0") {
+				hex += hex;
+			}
+			strHex += hex;
+		}
+		if (strHex.length !== 7) {
+			strHex = _this;
+		}
+		return strHex;
+	} else if (reg.test(_this)) {
+		let aNum = _this.replace(/#/, "").split("");
+		if (aNum.length === 6) {
+			return _this;
+		} else if (aNum.length === 3) {
+			let numHex = "#";
+			for (let i = 0; i < aNum.length; i += 1) {
+				numHex += (aNum[i] + aNum[i]);
+			}
+			return numHex;
+		}
+	} else {
+		return _this;
+	}
+}
+
+
+/**
+* JS颜色十六进制转换为rgb或rgba,返回的格式为 rgba（255，255，255，0.5）字符串
+* sHex为传入的十六进制的色值
+* alpha为rgba的透明度
+*/
+function colorToRgba(color, alpha = 0.3) {
+	color = rgbToHex(color)
+	// 十六进制颜色值的正则表达式
+	var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+	/* 16进制颜色转为RGB格式 */
+	let sColor = color.toLowerCase()
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4) {
+			var sColorNew = '#'
+			for (let i = 1; i < 4; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+			}
+			sColor = sColorNew
+		}
+		// 处理六位的颜色值
+		var sColorChange = []
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
+		}
+		// return sColorChange.join(',')
+		return 'rgba(' + sColorChange.join(',') + ',' + alpha + ')'
+	} 
+	else {
+		return sColor
+	}
+}
+
+export default {
+	colorGradient,
+	hexToRgb,
+	rgbToHex,
+	colorToRgba
+}
\ No newline at end of file
diff --git a/uview-ui/libs/function/debounce.js b/uview-ui/libs/function/debounce.js
new file mode 100644
index 0000000..4f1027b
--- /dev/null
+++ b/uview-ui/libs/function/debounce.js
@@ -0,0 +1,29 @@
+let timeout = null;
+
+/**
+ * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数
+ * 
+ * @param {Function} func 要执行的回调函数 
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行 
+ * @return null
+ */
+function debounce(func, wait = 500, immediate = false) {
+	// 清除定时器
+	if (timeout !== null) clearTimeout(timeout);
+	// 立即执行，此类情况一般用不到
+	if (immediate) {
+		var callNow = !timeout;
+		timeout = setTimeout(function() {
+			timeout = null;
+		}, wait);
+		if (callNow) typeof func === 'function' && func();
+	} else {
+		// 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法
+		timeout = setTimeout(function() {
+			typeof func === 'function' && func();
+		}, wait);
+	}
+}
+
+export default debounce
diff --git a/uview-ui/libs/function/deepClone.js b/uview-ui/libs/function/deepClone.js
new file mode 100644
index 0000000..3db999a
--- /dev/null
+++ b/uview-ui/libs/function/deepClone.js
@@ -0,0 +1,23 @@
+// 判断arr是否为一个数组，返回一个bool值
+function isArray (arr) {
+    return Object.prototype.toString.call(arr) === '[object Array]';
+}
+
+// 深度克隆
+function deepClone (obj) {
+	// 对常见的“非”值，直接返回原来值
+	if([null, undefined, NaN, false].includes(obj)) return obj;
+    if(typeof obj !== "object" && typeof obj !== 'function') {
+		//原始类型直接返回
+        return obj;
+    }
+    var o = isArray(obj) ? [] : {};
+    for(let i in obj) {
+        if(obj.hasOwnProperty(i)){
+            o[i] = typeof obj[i] === "object" ? deepClone(obj[i]) : obj[i];
+        }
+    }
+    return o;
+}
+
+export default deepClone;
diff --git a/uview-ui/libs/function/deepMerge.js b/uview-ui/libs/function/deepMerge.js
new file mode 100644
index 0000000..81d2d18
--- /dev/null
+++ b/uview-ui/libs/function/deepMerge.js
@@ -0,0 +1,30 @@
+import deepClone from "./deepClone";
+
+// JS对象深度合并
+function deepMerge(target = {}, source = {}) {
+	target = deepClone(target);
+	if (typeof target !== 'object' || typeof source !== 'object') return false;
+	for (var prop in source) {
+		if (!source.hasOwnProperty(prop)) continue;
+		if (prop in target) {
+			if (typeof target[prop] !== 'object') {
+				target[prop] = source[prop];
+			} else {
+				if (typeof source[prop] !== 'object') {
+					target[prop] = source[prop];
+				} else {
+					if (target[prop].concat && source[prop].concat) {
+						target[prop] = target[prop].concat(source[prop]);
+					} else {
+						target[prop] = deepMerge(target[prop], source[prop]);
+					}
+				}
+			}
+		} else {
+			target[prop] = source[prop];
+		}
+	}
+	return target;
+}
+
+export default deepMerge;
\ No newline at end of file
diff --git a/uview-ui/libs/function/getParent.js b/uview-ui/libs/function/getParent.js
new file mode 100644
index 0000000..9cb45c4
--- /dev/null
+++ b/uview-ui/libs/function/getParent.js
@@ -0,0 +1,47 @@
+// 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+// this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+export default function getParent(name, keys) {
+	let parent = this.$parent;
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent;
+		} else {
+			let data = {};
+			// 判断keys是否数组，如果传过来的是一个数组，那么直接使用数组元素值当做键值去父组件寻找
+			if(Array.isArray(keys)) {
+				keys.map(val => {
+					data[val] = parent[val] ? parent[val] : '';
+				})
+			} else {
+				// 历遍传过来的对象参数
+				for(let i in keys) {
+					// 如果子组件有此值则用，无此值则用父组件的值
+					// 判断是否空数组，如果是，则用父组件的值，否则用子组件的值
+					if(Array.isArray(keys[i])) {
+						if(keys[i].length) {
+							data[i] = keys[i];
+						} else {
+							data[i] = parent[i];
+						}
+					} else if(keys[i].constructor === Object) {
+						// 判断是否对象，如果是对象，且有属性，那么使用子组件的值，否则使用父组件的值
+						if(Object.keys(keys[i]).length) {
+							data[i] = keys[i];
+						} else {
+							data[i] = parent[i];
+						}
+					} else {
+						// 只要子组件有传值，即使是false值，也是“传值”了，也需要覆盖父组件的同名参数
+						data[i] = (keys[i] || keys[i] === false) ? keys[i] : parent[i];
+					}
+				}
+			}
+			return data;
+		}
+	}
+
+	return {};
+}
\ No newline at end of file
diff --git a/uview-ui/libs/function/guid.js b/uview-ui/libs/function/guid.js
new file mode 100644
index 0000000..8497664
--- /dev/null
+++ b/uview-ui/libs/function/guid.js
@@ -0,0 +1,41 @@
+/**
+ * 本算法来源于简书开源代码，详见：https://www.jianshu.com/p/fdbf293d0a85
+ * 全局唯一标识符（uuid，Globally Unique Identifier）,也称作 uuid(Universally Unique IDentifier) 
+ * 一般用于多个组件之间,给它一个唯一的标识符,或者v-for循环的时候,如果使用数组的index可能会导致更新列表出现问题
+ * 最可能的情况是左滑删除item或者对某条信息流"不喜欢"并去掉它的时候,会导致组件内的数据可能出现错乱
+ * v-for的时候,推荐使用后端返回的id而不是循环的index
+ * @param {Number} len uuid的长度
+ * @param {Boolean} firstU 将返回的首字母置为"u"
+ * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ */
+function guid(len = 32, firstU = true, radix = null) {
+	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	let uuid = [];
+	radix = radix || chars.length;
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+	} else {
+		let r;
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+		uuid[14] = '4';
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16;
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift();
+		return 'u' + uuid.join('');
+	} else {
+		return uuid.join('');
+	}
+}
+
+export default guid;
diff --git a/uview-ui/libs/function/md5.js b/uview-ui/libs/function/md5.js
new file mode 100644
index 0000000..8d541a1
--- /dev/null
+++ b/uview-ui/libs/function/md5.js
@@ -0,0 +1,385 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = "";  /* base-64 pad character. "=" for strict RFC compliance   */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s)    { return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
+function b64_md5(s)    { return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
+function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
+function hex_hmac_md5(k, d)
+  { return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function b64_hmac_md5(k, d)
+  { return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function any_hmac_md5(k, d, e)
+  { return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+  return hex_md5("abc").toLowerCase() == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of a raw string
+ */
+function rstr_md5(s)
+{
+  return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data (raw strings)
+ */
+function rstr_hmac_md5(key, data)
+{
+  var bkey = rstr2binl(key);
+  if(bkey.length > 16) bkey = binl_md5(bkey, key.length * 8);
+
+  var ipad = Array(16), opad = Array(16);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  var hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
+  return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
+}
+
+/*
+ * Convert a raw string to a hex string
+ */
+function rstr2hex(input)
+{
+  try { hexcase } catch(e) { hexcase=0; }
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var output = "";
+  var x;
+  for(var i = 0; i < input.length; i++)
+  {
+    x = input.charCodeAt(i);
+    output += hex_tab.charAt((x >>> 4) & 0x0F)
+           +  hex_tab.charAt( x        & 0x0F);
+  }
+  return output;
+}
+
+/*
+ * Convert a raw string to a base-64 string
+ */
+function rstr2b64(input)
+{
+  try { b64pad } catch(e) { b64pad=''; }
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var output = "";
+  var len = input.length;
+  for(var i = 0; i < len; i += 3)
+  {
+    var triplet = (input.charCodeAt(i) << 16)
+                | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
+                | (i + 2 < len ? input.charCodeAt(i+2)      : 0);
+    for(var j = 0; j < 4; j++)
+    {
+      if(i * 8 + j * 6 > input.length * 8) output += b64pad;
+      else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
+    }
+  }
+  return output;
+}
+
+/*
+ * Convert a raw string to an arbitrary string encoding
+ */
+function rstr2any(input, encoding)
+{
+  var divisor = encoding.length;
+  var i, j, q, x, quotient;
+
+  /* Convert to an array of 16-bit big-endian values, forming the dividend */
+  var dividend = Array(Math.ceil(input.length / 2));
+  for(i = 0; i < dividend.length; i++)
+  {
+    dividend[i] = (input.charCodeAt(i * 2) << 8) | input.charCodeAt(i * 2 + 1);
+  }
+
+  /*
+   * Repeatedly perform a long division. The binary array forms the dividend,
+   * the length of the encoding is the divisor. Once computed, the quotient
+   * forms the dividend for the next step. All remainders are stored for later
+   * use.
+   */
+  var full_length = Math.ceil(input.length * 8 /
+                                    (Math.log(encoding.length) / Math.log(2)));
+  var remainders = Array(full_length);
+  for(j = 0; j < full_length; j++)
+  {
+    quotient = Array();
+    x = 0;
+    for(i = 0; i < dividend.length; i++)
+    {
+      x = (x << 16) + dividend[i];
+      q = Math.floor(x / divisor);
+      x -= q * divisor;
+      if(quotient.length > 0 || q > 0)
+        quotient[quotient.length] = q;
+    }
+    remainders[j] = x;
+    dividend = quotient;
+  }
+
+  /* Convert the remainders to the output string */
+  var output = "";
+  for(i = remainders.length - 1; i >= 0; i--)
+    output += encoding.charAt(remainders[i]);
+
+  return output;
+}
+
+/*
+ * Encode a string as utf-8.
+ * For efficiency, this assumes the input is valid utf-16.
+ */
+function str2rstr_utf8(input)
+{
+  var output = "";
+  var i = -1;
+  var x, y;
+
+  while(++i < input.length)
+  {
+    /* Decode utf-16 surrogate pairs */
+    x = input.charCodeAt(i);
+    y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0;
+    if(0xD800 <= x && x <= 0xDBFF && 0xDC00 <= y && y <= 0xDFFF)
+    {
+      x = 0x10000 + ((x & 0x03FF) << 10) + (y & 0x03FF);
+      i++;
+    }
+
+    /* Encode output as utf-8 */
+    if(x <= 0x7F)
+      output += String.fromCharCode(x);
+    else if(x <= 0x7FF)
+      output += String.fromCharCode(0xC0 | ((x >>> 6 ) & 0x1F),
+                                    0x80 | ( x         & 0x3F));
+    else if(x <= 0xFFFF)
+      output += String.fromCharCode(0xE0 | ((x >>> 12) & 0x0F),
+                                    0x80 | ((x >>> 6 ) & 0x3F),
+                                    0x80 | ( x         & 0x3F));
+    else if(x <= 0x1FFFFF)
+      output += String.fromCharCode(0xF0 | ((x >>> 18) & 0x07),
+                                    0x80 | ((x >>> 12) & 0x3F),
+                                    0x80 | ((x >>> 6 ) & 0x3F),
+                                    0x80 | ( x         & 0x3F));
+  }
+  return output;
+}
+
+/*
+ * Encode a string as utf-16
+ */
+function str2rstr_utf16le(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length; i++)
+    output += String.fromCharCode( input.charCodeAt(i)        & 0xFF,
+                                  (input.charCodeAt(i) >>> 8) & 0xFF);
+  return output;
+}
+
+function str2rstr_utf16be(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length; i++)
+    output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xFF,
+                                   input.charCodeAt(i)        & 0xFF);
+  return output;
+}
+
+/*
+ * Convert a raw string to an array of little-endian words
+ * Characters >255 have their high-byte silently ignored.
+ */
+function rstr2binl(input)
+{
+  var output = Array(input.length >> 2);
+  for(var i = 0; i < output.length; i++)
+    output[i] = 0;
+  for(var i = 0; i < input.length * 8; i += 8)
+    output[i>>5] |= (input.charCodeAt(i / 8) & 0xFF) << (i%32);
+  return output;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2rstr(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length * 32; i += 8)
+    output += String.fromCharCode((input[i>>5] >>> (i % 32)) & 0xFF);
+  return output;
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length.
+ */
+function binl_md5(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << ((len) % 32);
+  x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+
+  for(var i = 0; i < x.length; i += 16)
+  {
+    var olda = a;
+    var oldb = b;
+    var oldc = c;
+    var oldd = d;
+
+    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
+    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
+    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
+    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
+    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
+
+    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
+    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
+    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
+    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
+    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
+    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
+    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
+    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
+    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
+    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
+    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
+    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
+    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
+    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
+    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
+    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+    a = safe_add(a, olda);
+    b = safe_add(b, oldb);
+    c = safe_add(c, oldc);
+    d = safe_add(d, oldd);
+  }
+  return Array(a, b, c, d);
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t)
+{
+  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t)
+{
+  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t)
+{
+  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+  return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+module.exports = {
+	md5 : function(str){
+		return hex_md5(str);
+	}
+}
\ No newline at end of file
diff --git a/uview-ui/libs/function/queryParams.js b/uview-ui/libs/function/queryParams.js
new file mode 100644
index 0000000..81c7e5e
--- /dev/null
+++ b/uview-ui/libs/function/queryParams.js
@@ -0,0 +1,58 @@
+/**
+ * 对象转url参数
+ * @param {*} data,对象
+ * @param {*} isPrefix,是否自动加上"?"
+ */
+function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
+	let prefix = isPrefix ? '?' : ''
+	let _result = []
+	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets';
+	for (let key in data) {
+		let value = data[key]
+		// 去掉为空的参数
+		if (['', undefined, null].indexOf(value) >= 0) {
+			continue;
+		}
+		// 如果值为数组，另行处理
+		if (value.constructor === Array) {
+			// e.g. {ids: [1, 2, 3]}
+			switch (arrayFormat) {
+				case 'indices':
+					// 结果: ids[0]=1&ids[1]=2&ids[2]=3
+					for (let i = 0; i < value.length; i++) {
+						_result.push(key + '[' + i + ']=' + value[i])
+					}
+					break;
+				case 'brackets':
+					// 结果: ids[]=1&ids[]=2&ids[]=3
+					value.forEach(_value => {
+						_result.push(key + '[]=' + _value)
+					})
+					break;
+				case 'repeat':
+					// 结果: ids=1&ids=2&ids=3
+					value.forEach(_value => {
+						_result.push(key + '=' + _value)
+					})
+					break;
+				case 'comma':
+					// 结果: ids=1,2,3
+					let commaStr = "";
+					value.forEach(_value => {
+						commaStr += (commaStr ? "," : "") + _value;
+					})
+					_result.push(key + '=' + commaStr)
+					break;
+				default:
+					value.forEach(_value => {
+						_result.push(key + '[]=' + _value)
+					})
+			}
+		} else {
+			_result.push(key + '=' + value)
+		}
+	}
+	return _result.length ? prefix + _result.join('&') : ''
+}
+
+export default queryParams;
diff --git a/uview-ui/libs/function/random.js b/uview-ui/libs/function/random.js
new file mode 100644
index 0000000..e155279
--- /dev/null
+++ b/uview-ui/libs/function/random.js
@@ -0,0 +1,10 @@
+function random(min, max) {
+	if (min >= 0 && max > 0 && max >= min) {
+		let gab = max - min + 1;
+		return Math.floor(Math.random() * gab + min);
+	} else {
+		return 0;
+	}
+}
+
+export default random;
diff --git a/uview-ui/libs/function/randomArray.js b/uview-ui/libs/function/randomArray.js
new file mode 100644
index 0000000..590a048
--- /dev/null
+++ b/uview-ui/libs/function/randomArray.js
@@ -0,0 +1,7 @@
+// 打乱数组
+function randomArray(array = []) {
+	// 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.05大于或者小于0
+	return array.sort(() => Math.random() - 0.5);
+}
+
+export default randomArray
diff --git a/uview-ui/libs/function/route.js b/uview-ui/libs/function/route.js
new file mode 100644
index 0000000..28a81b7
--- /dev/null
+++ b/uview-ui/libs/function/route.js
@@ -0,0 +1,122 @@
+/**
+ * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
+ * 并且带有路由拦截功能
+ */
+
+class Router {
+	constructor() {
+		// 原始属性定义
+		this.config = {
+			type: 'navigateTo',
+			url: '',
+			delta: 1, // navigateBack页面后退时,回退的层数
+			params: {}, // 传递的参数
+			animationType: 'pop-in', // 窗口动画,只在APP有效
+			animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
+			intercept: false, // 是否需要拦截
+		}
+		// 因为route方法是需要对外赋值给另外的对象使用，同时route内部有使用this，会导致route失去上下文
+		// 这里在构造函数中进行this绑定
+		this.route = this.route.bind(this)
+	}
+
+	// 判断url前面是否有"/"，如果没有则加上，否则无法跳转
+	addRootPath(url) {
+		return url[0] === '/' ? url : `/${url}`
+	}
+
+	// 整合路由参数
+	mixinParam(url, params) {
+		url = url && this.addRootPath(url)
+		
+		// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+		// 如果有url中有get参数，转换后无需带上"?"
+		let query = ''
+		if (/.*\/.*\?.*=.*/.test(url)) {
+			// object对象转为get类型的参数
+			query = uni.$u.queryParams(params, false);
+			// 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
+			return url += "&" + query
+		} else {
+			// 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
+			query = uni.$u.queryParams(params);
+			return url += query
+		}
+	}
+
+	// 对外的方法名称
+	async route(options = {}, params = {}) {
+		// 合并用户的配置和内部的默认配置
+		let mergeConfig = {}
+
+		if (typeof options === 'string') {
+			// 如果options为字符串，则为route(url, params)的形式
+			mergeConfig.url = this.mixinParam(options, params)
+			mergeConfig.type = 'navigateTo'
+		} else {
+			mergeConfig = uni.$u.deepClone(options, this.config)
+			// 否则正常使用mergeConfig中的url和params进行拼接
+			mergeConfig.url = this.mixinParam(options.url, options.params)
+		}
+		
+		if(params.intercept) {
+			this.config.intercept = params.intercept
+		}
+		// params参数也带给拦截器
+		mergeConfig.params = params
+		// 合并内外部参数
+		mergeConfig = uni.$u.deepMerge(this.config, mergeConfig)
+		// 判断用户是否定义了拦截器
+		if (typeof uni.$u.routeIntercept === 'function') {
+			// 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
+			const isNext = await new Promise((resolve, reject) => {
+				uni.$u.routeIntercept(mergeConfig, resolve)
+			})
+			// 如果isNext为true，则执行路由跳转
+			isNext && this.openPage(mergeConfig)
+		} else {
+			this.openPage(mergeConfig)
+		}
+	}
+
+	// 执行路由跳转
+	openPage(config) {
+		// 解构参数
+		const {
+			url,
+			type,
+			delta,
+			animationType,
+			animationDuration
+		} = config
+		if (config.type == 'navigateTo' || config.type == 'to') {
+			uni.navigateTo({
+				url,
+				animationType,
+				animationDuration
+			});
+		}
+		if (config.type == 'redirectTo' || config.type == 'redirect') {
+			uni.redirectTo({
+				url
+			});
+		}
+		if (config.type == 'switchTab' || config.type == 'tab') {
+			uni.switchTab({
+				url
+			});
+		}
+		if (config.type == 'reLaunch' || config.type == 'launch') {
+			uni.reLaunch({
+				url
+			});
+		}
+		if (config.type == 'navigateBack' || config.type == 'back') {
+			uni.navigateBack({
+				delta
+			});
+		}
+	}
+}
+
+export default (new Router()).route
\ No newline at end of file
diff --git a/uview-ui/libs/function/sys.js b/uview-ui/libs/function/sys.js
new file mode 100644
index 0000000..00f6a28
--- /dev/null
+++ b/uview-ui/libs/function/sys.js
@@ -0,0 +1,9 @@
+export function os() {
+	return uni.getSystemInfoSync().platform;
+};
+
+export function sys() {
+	return uni.getSystemInfoSync();
+}
+
+
diff --git a/uview-ui/libs/function/test.js b/uview-ui/libs/function/test.js
new file mode 100644
index 0000000..1fde462
--- /dev/null
+++ b/uview-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
+}
diff --git a/uview-ui/libs/function/throttle.js b/uview-ui/libs/function/throttle.js
new file mode 100644
index 0000000..ad830b2
--- /dev/null
+++ b/uview-ui/libs/function/throttle.js
@@ -0,0 +1,32 @@
+let timer, flag;
+/**
+ * 节流原理：在一定时间内，只能触发一次
+ * 
+ * @param {Function} func 要执行的回调函数 
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function throttle(func, wait = 500, immediate = true) {
+	if (immediate) {
+		if (!flag) {
+			flag = true;
+			// 如果是立即执行，则在wait毫秒内开始时执行
+			typeof func === 'function' && func();
+			timer = setTimeout(() => {
+				flag = false;
+			}, wait);
+		}
+	} else {
+		if (!flag) {
+			flag = true
+			// 如果是非立即执行，则在wait毫秒内的结束处执行
+			timer = setTimeout(() => {
+				flag = false
+				typeof func === 'function' && func();
+			}, wait);
+		}
+		
+	}
+};
+export default throttle
diff --git a/uview-ui/libs/function/timeFormat.js b/uview-ui/libs/function/timeFormat.js
new file mode 100644
index 0000000..0372f2f
--- /dev/null
+++ b/uview-ui/libs/function/timeFormat.js
@@ -0,0 +1,51 @@
+// padStart 的 polyfill，因为某些机型或情况，还无法支持es7的padStart，比如电脑版的微信小程序
+// 所以这里做一个兼容polyfill的兼容处理
+if (!String.prototype.padStart) {
+	// 为了方便表示这里 fillString 用了ES6 的默认参数，不影响理解
+	String.prototype.padStart = function(maxLength, fillString = ' ') {
+		if (Object.prototype.toString.call(fillString) !== "[object String]") throw new TypeError(
+			'fillString must be String')
+		let str = this
+		// 返回 String(str) 这里是为了使返回的值是字符串字面量，在控制台中更符合直觉
+		if (str.length >= maxLength) return String(str)
+
+		let fillLength = maxLength - str.length,
+			times = Math.ceil(fillLength / fillString.length)
+		while (times >>= 1) {
+			fillString += fillString
+			if (times === 1) {
+				fillString += fillString
+			}
+		}
+		return fillString.slice(0, fillLength) + str;
+	}
+}
+
+// 其他更多是格式化有如下:
+// yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合
+function timeFormat(dateTime = null, fmt = 'yyyy-mm-dd') {
+	// 如果为null,则格式化当前时间
+	if (!dateTime) dateTime = Number(new Date());
+	// 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式
+	if (dateTime.toString().length == 10) dateTime *= 1000;
+	let date = new Date(dateTime);
+	let ret;
+	let opt = {
+		"y+": date.getFullYear().toString(), // 年
+		"m+": (date.getMonth() + 1).toString(), // 月
+		"d+": date.getDate().toString(), // 日
+		"h+": date.getHours().toString(), // 时
+		"M+": date.getMinutes().toString(), // 分
+		"s+": date.getSeconds().toString() // 秒
+		// 有其他格式化字符需求可以继续添加，必须转化成字符串
+	};
+	for (let k in opt) {
+		ret = new RegExp("(" + k + ")").exec(fmt);
+		if (ret) {
+			fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+		};
+	};
+	return fmt;
+}
+
+export default timeFormat
diff --git a/uview-ui/libs/function/timeFrom.js b/uview-ui/libs/function/timeFrom.js
new file mode 100644
index 0000000..68cd990
--- /dev/null
+++ b/uview-ui/libs/function/timeFrom.js
@@ -0,0 +1,47 @@
+import timeFormat from '../../libs/function/timeFormat.js';
+
+/**
+ * 时间戳转为多久之前
+ * @param String timestamp 时间戳
+ * @param String | Boolean format 如果为时间格式字符串，超出一定时间范围，返回固定的时间格式；
+ * 如果为布尔值false，无论什么时间，都返回多久以前的格式
+ */
+function timeFrom(dateTime = null, format = 'yyyy-mm-dd') {
+	// 如果为null,则格式化当前时间
+	if (!dateTime) dateTime = Number(new Date());
+	// 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式
+	if (dateTime.toString().length == 10) dateTime *= 1000;
+	let timestamp = + new Date(Number(dateTime));
+
+	let timer = (Number(new Date()) - timestamp) / 1000;
+	// 如果小于5分钟,则返回"刚刚",其他以此类推
+	let tips = '';
+	switch (true) {
+		case timer < 300:
+			tips = '刚刚';
+			break;
+		case timer >= 300 && timer < 3600:
+			tips = parseInt(timer / 60) + '分钟前';
+			break;
+		case timer >= 3600 && timer < 86400:
+			tips = parseInt(timer / 3600) + '小时前';
+			break;
+		case timer >= 86400 && timer < 2592000:
+			tips = parseInt(timer / 86400) + '天前';
+			break;
+		default:
+			// 如果format为false，则无论什么时间戳，都显示xx之前
+			if(format === false) {
+				if(timer >= 2592000 && timer < 365 * 86400) {
+					tips = parseInt(timer / (86400 * 30)) + '个月前';
+				} else {
+					tips = parseInt(timer / (86400 * 365)) + '年前';
+				}
+			} else {
+				tips = timeFormat(timestamp, format);
+			}
+	}
+	return tips;
+}
+
+export default timeFrom;
diff --git a/uview-ui/libs/function/toast.js b/uview-ui/libs/function/toast.js
new file mode 100644
index 0000000..91afa73
--- /dev/null
+++ b/uview-ui/libs/function/toast.js
@@ -0,0 +1,9 @@
+function toast(title, duration = 1500) {
+	uni.showToast({
+		title: title,
+		icon: 'none',
+		duration: duration
+	})
+}
+
+export default toast
diff --git a/uview-ui/libs/function/trim.js b/uview-ui/libs/function/trim.js
new file mode 100644
index 0000000..72adc37
--- /dev/null
+++ b/uview-ui/libs/function/trim.js
@@ -0,0 +1,15 @@
+function trim(str, pos = 'both') {
+	if (pos == 'both') {
+		return str.replace(/^\s+|\s+$/g, "");
+	} else if (pos == "left") {
+		return str.replace(/^\s*/, '');
+	} else if (pos == 'right') {
+		return str.replace(/(\s*$)/g, "");
+	} else if (pos == 'all') {
+		return str.replace(/\s+/g, "");
+	} else {
+		return str;
+	}
+}
+
+export default trim
diff --git a/uview-ui/libs/function/type2icon.js b/uview-ui/libs/function/type2icon.js
new file mode 100644
index 0000000..23cb40e
--- /dev/null
+++ b/uview-ui/libs/function/type2icon.js
@@ -0,0 +1,35 @@
+/**
+ * 根据主题type值,获取对应的图标
+ * @param String type 主题名称,primary|info|error|warning|success
+ * @param String fill 是否使用fill填充实体的图标  
+ */
+function type2icon(type = 'success', fill = false) {
+	// 如果非预置值,默认为success
+	if (['primary', 'info', 'error', 'warning', 'success'].indexOf(type) == -1) type = 'success';
+	let iconName = '';
+	// 目前(2019-12-12),info和primary使用同一个图标
+	switch (type) {
+		case 'primary':
+			iconName = 'info-circle';
+			break;
+		case 'info':
+			iconName = 'info-circle';
+			break;
+		case 'error':
+			iconName = 'close-circle';
+			break;
+		case 'warning':
+			iconName = 'error-circle';
+			break;
+		case 'success':
+			iconName = 'checkmark-circle';
+			break;
+		default:
+			iconName = 'checkmark-circle';
+	}
+	// 是否是实体类型,加上-fill,在icon组件库中,实体的类名是后面加-fill的
+	if (fill) iconName += '-fill';
+	return iconName;
+}
+
+export default type2icon
diff --git a/uview-ui/libs/mixin/mixin.js b/uview-ui/libs/mixin/mixin.js
new file mode 100644
index 0000000..e388986
--- /dev/null
+++ b/uview-ui/libs/mixin/mixin.js
@@ -0,0 +1,64 @@
+module.exports = {
+	data() {
+		return {}
+	},
+	onLoad() {
+		// getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		this.$u.getRect = this.$uGetRect
+	},
+	methods: {
+		// 查询节点信息
+		// 目前此方法在支付宝小程序中无法获取组件跟接点的尺寸，为支付宝的bug(2020-07-21)
+		// 解决办法为在组件根部再套一个没有任何作用的view元素
+		$uGetRect(selector, all) {
+			return new Promise(resolve => {
+				uni.createSelectorQuery().
+				in(this)[all ? 'selectAll' : 'select'](selector)
+					.boundingClientRect(rect => {
+						if (all && Array.isArray(rect) && rect.length) {
+							resolve(rect)
+						}
+						if (!all && rect) {
+							resolve(rect)
+						}
+					})
+					.exec()
+			})
+		},
+		getParentData(parentName = '') {
+			// 避免在created中去定义parent变量
+			if(!this.parent) this.parent = false;
+			// 这里的本质原理是，通过获取父组件实例(也即u-radio-group的this)
+			// 将父组件this中对应的参数，赋值给本组件(u-radio的this)的parentData对象中对应的属性
+			// 之所以需要这么做，是因为所有端中，头条小程序不支持通过this.parent.xxx去监听父组件参数的变化
+			this.parent = this.$u.$parent.call(this, parentName);
+			if(this.parent) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map(key => {
+					this.parentData[key] = this.parent[key];
+				});
+			}
+		},
+		// 阻止事件冒泡
+		preventEvent(e) {
+			e && e.stopPropagation && e.stopPropagation()
+		}
+	},
+	onReachBottom() {
+		uni.$emit('uOnReachBottom')
+	},
+	beforeDestroy() {
+		// 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+		// 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+		if(this.parent && uni.$u.test.array(this.parent.children)) {
+			// 组件销毁时，移除父组件中的children数组中对应的实例
+			const childrenList = this.parent.children
+			childrenList.map((child, index) => {
+				// 如果相等，则移除
+				if(child === this) {
+					childrenList.splice(index, 1)
+				}
+			})
+		}
+	}
+}
diff --git a/uview-ui/libs/mixin/mpShare.js b/uview-ui/libs/mixin/mpShare.js
new file mode 100644
index 0000000..057d369
--- /dev/null
+++ b/uview-ui/libs/mixin/mpShare.js
@@ -0,0 +1,18 @@
+module.exports = {
+	onLoad() {
+		// 设置默认的转发参数
+		this.$u.mpShare = {
+			title: '', // 默认为小程序名称
+			path: '', // 默认为当前页面路径
+			imageUrl: '' // 默认为当前页面的截图
+		}
+	},
+	onShareAppMessage() {
+		return this.$u.mpShare
+	},
+	// #ifdef MP-WEIXIN
+	onShareTimeline() {
+		return this.$u.mpShare
+	}
+	// #endif
+}
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
new file mode 100644
index 0000000..1f5f471
--- /dev/null
+++ b/uview-ui/libs/request/index.js
@@ -0,0 +1,169 @@
+import deepMerge from "../function/deepMerge";
+import validate from "../function/test";
+class Request {
+	// 设置全局默认配置
+	setConfig(customConfig) {
+		// 深度合并对象，否则会造成对象深层属性丢失
+		this.config = deepMerge(this.config, customConfig);
+	}
+
+	// 主要请求部分
+	request(options = {}) {
+		// 检查请求拦截
+		if (this.interceptor.request && typeof this.interceptor.request === 'function') {
+			let tmpConfig = {};
+			let interceptorRequest = this.interceptor.request(options);
+			if (interceptorRequest === false) {
+				// 返回一个处于pending状态中的Promise，来取消原promise，避免进入then()回调
+				return new Promise(()=>{});
+			}
+			this.options = interceptorRequest;
+		}
+		options.dataType = options.dataType || this.config.dataType;
+		options.responseType = options.responseType || this.config.responseType;
+		options.url = options.url || '';
+		options.params = options.params || {};
+		options.header = Object.assign({}, this.config.header, options.header);
+		options.method = options.method || this.config.method;
+
+		return new Promise((resolve, reject) => {
+			options.complete = (response) => {
+				// 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading)
+				uni.hideLoading();
+				// 清除定时器，如果请求回来了，就无需loading
+				clearTimeout(this.config.timer);
+				this.config.timer = null;
+				// 判断用户对拦截返回数据的要求，如果originalData为true，返回所有的数据(response)到拦截器，否则只返回response.data
+				if(this.config.originalData) {
+					// 判断是否存在拦截器
+					if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+						let resInterceptors = this.interceptor.response(response);
+						// 如果拦截器不返回false，就将拦截器返回的内容给this.$u.post的then回调
+						if (resInterceptors !== false) {
+							resolve(resInterceptors);
+						} else {
+							// 如果拦截器返回false，意味着拦截器定义者认为返回有问题，直接接入catch回调
+							reject(response);
+						}
+					} else {
+						// 如果要求返回原始数据，就算没有拦截器，也返回最原始的数据
+						resolve(response);
+					}
+				} else {
+					if (response.statusCode == 200) {
+						if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+							let resInterceptors = this.interceptor.response(response.data);
+							if (resInterceptors !== false) {
+								resolve(resInterceptors);
+							} else {
+								reject(response.data);
+							}
+						} else {
+							// 如果不是返回原始数据(originalData=false)，且没有拦截器的情况下，返回纯数据给then回调
+							resolve(response.data);
+						}
+					} else {
+						// 不返回原始数据的情况下，服务器状态码不为200，modal弹框提示
+						// if(response.errMsg) {
+						// 	uni.showModal({
+						// 		title: response.errMsg
+						// 	});
+						// }
+						reject(response)
+					}
+				}
+			}
+
+			// 判断用户传递的URL是否/开头,如果不是,加上/，这里使用了uView的test.js验证库的url()方法
+			options.url = validate.url(options.url) ? options.url : (this.config.baseUrl + (options.url.indexOf('/') == 0 ?
+				options.url : '/' + options.url));
+			
+			// 是否显示loading
+			// 加一个是否已有timer定时器的判断，否则有两个同时请求的时候，后者会清除前者的定时器id
+			// 而没有清除前者的定时器，导致前者超时，一直显示loading
+			if(this.config.showLoading && !this.config.timer) {
+				this.config.timer = setTimeout(() => {
+					uni.showLoading({
+						title: this.config.loadingText,
+						mask: this.config.loadingMask
+					})
+					this.config.timer = null;
+				}, this.config.loadingTime);
+			}
+			uni.request(options);
+		})
+		// .catch(res => {
+		// 	// 如果返回reject()，不让其进入this.$u.post().then().catch()后面的catct()
+		// 	// 因为很多人都会忘了写后面的catch()，导致报错捕获不到catch
+		// 	return new Promise(()=>{});
+		// })
+	}
+
+	constructor() {
+		this.config = {
+			baseUrl: '', // 请求的根域名
+			// 默认的请求头
+			header: {},
+			method: 'POST',
+			// 设置为json，返回后uni.request会对数据进行一次JSON.parse
+			dataType: 'json',
+			// 此参数无需处理，因为5+和支付宝小程序不支持，默认为text即可
+			responseType: 'text',
+			showLoading: true, // 是否显示请求中的loading
+			loadingText: '请求中...',
+			loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
+			timer: null, // 定时器
+			originalData: false, // 是否在拦截器中返回服务端的原始数据，见文档说明
+			loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
+		}
+	
+		// 拦截器
+		this.interceptor = {
+			// 请求前的拦截
+			request: null,
+			// 请求后的拦截
+			response: null
+		}
+
+		// get请求
+		this.get = (url, data = {}, header = {}) => {
+			return this.request({
+				method: 'GET',
+				url,
+				header,
+				data
+			})
+		}
+
+		// post请求
+		this.post = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'POST',
+				header,
+				data
+			})
+		}
+		
+		// put请求，不支持支付宝小程序(HX2.6.15)
+		this.put = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'PUT',
+				header,
+				data
+			})
+		}
+		
+		// delete请求，不支持支付宝和头条小程序(HX2.6.15)
+		this.delete = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'DELETE',
+				header,
+				data
+			})
+		}
+	}
+}
+export default new Request
diff --git a/uview-ui/libs/store/index.js b/uview-ui/libs/store/index.js
new file mode 100644
index 0000000..a5927b3
--- /dev/null
+++ b/uview-ui/libs/store/index.js
@@ -0,0 +1,19 @@
+// 暂时不用vuex模块方式实现，将该方法直接放入到/store/index.js中
+const module = {
+	actions: {
+		$uStore({rootState}, params) {
+			let nameArr = params.name.split('.');
+			if(nameArr.length >= 2) {
+				let obj = rootState[nameArr[0]];
+				for(let i = 1; i < nameArr.length - 1; i ++) {
+					obj = obj[nameArr[i]];
+				}
+				obj[nameArr[nameArr.length - 1]] = params.value;
+			} else {
+				rootState[params.name] = params.value;
+			}
+		}
+	}
+}
+
+export default module
\ No newline at end of file
diff --git a/uview-ui/libs/util/area.js b/uview-ui/libs/util/area.js
new file mode 100644
index 0000000..0d602e9
--- /dev/null
+++ b/uview-ui/libs/util/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/uview-ui/libs/util/async-validator.js b/uview-ui/libs/util/async-validator.js
new file mode 100644
index 0000000..d7215b9
--- /dev/null
+++ b/uview-ui/libs/util/async-validator.js
@@ -0,0 +1,1356 @@
+function _extends() {
+	_extends = Object.assign || function(target) {
+		for (var i = 1; i < arguments.length; i++) {
+			var source = arguments[i];
+
+			for (var key in source) {
+				if (Object.prototype.hasOwnProperty.call(source, key)) {
+					target[key] = source[key];
+				}
+			}
+		}
+
+		return target;
+	};
+
+	return _extends.apply(this, arguments);
+}
+
+/* eslint no-console:0 */
+var formatRegExp = /%[sdj%]/g;
+var warning = function warning() {}; // don't print warning message when in production env or node runtime
+
+if (typeof process !== 'undefined' && process.env && process.env.NODE_ENV !== 'production' && typeof window !==
+	'undefined' && typeof document !== 'undefined') {
+	warning = function warning(type, errors) {
+		if (typeof console !== 'undefined' && console.warn) {
+			if (errors.every(function(e) {
+					return typeof e === 'string';
+				})) {
+				console.warn(type, errors);
+			}
+		}
+	};
+}
+
+function convertFieldsError(errors) {
+	if (!errors || !errors.length) return null;
+	var fields = {};
+	errors.forEach(function(error) {
+		var field = error.field;
+		fields[field] = fields[field] || [];
+		fields[field].push(error);
+	});
+	return fields;
+}
+
+function format() {
+	for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+		args[_key] = arguments[_key];
+	}
+
+	var i = 1;
+	var f = args[0];
+	var len = args.length;
+
+	if (typeof f === 'function') {
+		return f.apply(null, args.slice(1));
+	}
+
+	if (typeof f === 'string') {
+		var str = String(f).replace(formatRegExp, function(x) {
+			if (x === '%%') {
+				return '%';
+			}
+
+			if (i >= len) {
+				return x;
+			}
+
+			switch (x) {
+				case '%s':
+					return String(args[i++]);
+
+				case '%d':
+					return Number(args[i++]);
+
+				case '%j':
+					try {
+						return JSON.stringify(args[i++]);
+					} catch (_) {
+						return '[Circular]';
+					}
+
+					break;
+
+				default:
+					return x;
+			}
+		});
+
+		for (var arg = args[i]; i < len; arg = args[++i]) {
+			str += " " + arg;
+		}
+
+		return str;
+	}
+
+	return f;
+}
+
+function isNativeStringType(type) {
+	return type === 'string' || type === 'url' || type === 'hex' || type === 'email' || type === 'pattern';
+}
+
+function isEmptyValue(value, type) {
+	if (value === undefined || value === null) {
+		return true;
+	}
+
+	if (type === 'array' && Array.isArray(value) && !value.length) {
+		return true;
+	}
+
+	if (isNativeStringType(type) && typeof value === 'string' && !value) {
+		return true;
+	}
+
+	return false;
+}
+
+function asyncParallelArray(arr, func, callback) {
+	var results = [];
+	var total = 0;
+	var arrLength = arr.length;
+
+	function count(errors) {
+		results.push.apply(results, errors);
+		total++;
+
+		if (total === arrLength) {
+			callback(results);
+		}
+	}
+
+	arr.forEach(function(a) {
+		func(a, count);
+	});
+}
+
+function asyncSerialArray(arr, func, callback) {
+	var index = 0;
+	var arrLength = arr.length;
+
+	function next(errors) {
+		if (errors && errors.length) {
+			callback(errors);
+			return;
+		}
+
+		var original = index;
+		index = index + 1;
+
+		if (original < arrLength) {
+			func(arr[original], next);
+		} else {
+			callback([]);
+		}
+	}
+
+	next([]);
+}
+
+function flattenObjArr(objArr) {
+	var ret = [];
+	Object.keys(objArr).forEach(function(k) {
+		ret.push.apply(ret, objArr[k]);
+	});
+	return ret;
+}
+
+function asyncMap(objArr, option, func, callback) {
+	if (option.first) {
+		var _pending = new Promise(function(resolve, reject) {
+			var next = function next(errors) {
+				callback(errors);
+				return errors.length ? reject({
+					errors: errors,
+					fields: convertFieldsError(errors)
+				}) : resolve();
+			};
+
+			var flattenArr = flattenObjArr(objArr);
+			asyncSerialArray(flattenArr, func, next);
+		});
+
+		_pending["catch"](function(e) {
+			return e;
+		});
+
+		return _pending;
+	}
+
+	var firstFields = option.firstFields || [];
+
+	if (firstFields === true) {
+		firstFields = Object.keys(objArr);
+	}
+
+	var objArrKeys = Object.keys(objArr);
+	var objArrLength = objArrKeys.length;
+	var total = 0;
+	var results = [];
+	var pending = new Promise(function(resolve, reject) {
+		var next = function next(errors) {
+			results.push.apply(results, errors);
+			total++;
+
+			if (total === objArrLength) {
+				callback(results);
+				return results.length ? reject({
+					errors: results,
+					fields: convertFieldsError(results)
+				}) : resolve();
+			}
+		};
+
+		if (!objArrKeys.length) {
+			callback(results);
+			resolve();
+		}
+
+		objArrKeys.forEach(function(key) {
+			var arr = objArr[key];
+
+			if (firstFields.indexOf(key) !== -1) {
+				asyncSerialArray(arr, func, next);
+			} else {
+				asyncParallelArray(arr, func, next);
+			}
+		});
+	});
+	pending["catch"](function(e) {
+		return e;
+	});
+	return pending;
+}
+
+function complementError(rule) {
+	return function(oe) {
+		if (oe && oe.message) {
+			oe.field = oe.field || rule.fullField;
+			return oe;
+		}
+
+		return {
+			message: typeof oe === 'function' ? oe() : oe,
+			field: oe.field || rule.fullField
+		};
+	};
+}
+
+function deepMerge(target, source) {
+	if (source) {
+		for (var s in source) {
+			if (source.hasOwnProperty(s)) {
+				var value = source[s];
+
+				if (typeof value === 'object' && typeof target[s] === 'object') {
+					target[s] = _extends({}, target[s], {}, value);
+				} else {
+					target[s] = value;
+				}
+			}
+		}
+	}
+
+	return target;
+}
+
+/**
+ *  Rule for validating required fields.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function required(rule, value, source, errors, options, type) {
+	if (rule.required && (!source.hasOwnProperty(rule.field) || isEmptyValue(value, type || rule.type))) {
+		errors.push(format(options.messages.required, rule.fullField));
+	}
+}
+
+/**
+ *  Rule for validating whitespace.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function whitespace(rule, value, source, errors, options) {
+	if (/^\s+$/.test(value) || value === '') {
+		errors.push(format(options.messages.whitespace, rule.fullField));
+	}
+}
+
+/* eslint max-len:0 */
+
+var pattern = {
+	// http://emailregex.com/
+	email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+	url: new RegExp(
+		"^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$",
+		'i'),
+	hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i
+};
+var types = {
+	integer: function integer(value) {
+		return types.number(value) && parseInt(value, 10) === value;
+	},
+	"float": function float(value) {
+		return types.number(value) && !types.integer(value);
+	},
+	array: function array(value) {
+		return Array.isArray(value);
+	},
+	regexp: function regexp(value) {
+		if (value instanceof RegExp) {
+			return true;
+		}
+
+		try {
+			return !!new RegExp(value);
+		} catch (e) {
+			return false;
+		}
+	},
+	date: function date(value) {
+		return typeof value.getTime === 'function' && typeof value.getMonth === 'function' && typeof value.getYear ===
+			'function';
+	},
+	number: function number(value) {
+		if (isNaN(value)) {
+			return false;
+		}
+
+		// 修改源码，将字符串数值先转为数值
+		return typeof +value === 'number';
+	},
+	object: function object(value) {
+		return typeof value === 'object' && !types.array(value);
+	},
+	method: function method(value) {
+		return typeof value === 'function';
+	},
+	email: function email(value) {
+		return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
+	},
+	url: function url(value) {
+		return typeof value === 'string' && !!value.match(pattern.url);
+	},
+	hex: function hex(value) {
+		return typeof value === 'string' && !!value.match(pattern.hex);
+	}
+};
+/**
+ *  Rule for validating the type of a value.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function type(rule, value, source, errors, options) {
+	if (rule.required && value === undefined) {
+		required(rule, value, source, errors, options);
+		return;
+	}
+
+	var custom = ['integer', 'float', 'array', 'regexp', 'object', 'method', 'email', 'number', 'date', 'url', 'hex'];
+	var ruleType = rule.type;
+
+	if (custom.indexOf(ruleType) > -1) {
+		if (!types[ruleType](value)) {
+			errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+		} // straight typeof check
+
+	} else if (ruleType && typeof value !== rule.type) {
+		errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+	}
+}
+
+/**
+ *  Rule for validating minimum and maximum allowed values.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function range(rule, value, source, errors, options) {
+	var len = typeof rule.len === 'number';
+	var min = typeof rule.min === 'number';
+	var max = typeof rule.max === 'number'; // 正则匹配码点范围从U+010000一直到U+10FFFF的文字（补充平面Supplementary Plane）
+
+	var spRegexp = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+	var val = value;
+	var key = null;
+	var num = typeof value === 'number';
+	var str = typeof value === 'string';
+	var arr = Array.isArray(value);
+
+	if (num) {
+		key = 'number';
+	} else if (str) {
+		key = 'string';
+	} else if (arr) {
+		key = 'array';
+	} // if the value is not of a supported type for range validation
+	// the validation rule rule should use the
+	// type property to also test for a particular type
+
+
+	if (!key) {
+		return false;
+	}
+
+	if (arr) {
+		val = value.length;
+	}
+
+	if (str) {
+		// 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".lenght !== 3
+		val = value.replace(spRegexp, '_').length;
+	}
+
+	if (len) {
+		if (val !== rule.len) {
+			errors.push(format(options.messages[key].len, rule.fullField, rule.len));
+		}
+	} else if (min && !max && val < rule.min) {
+		errors.push(format(options.messages[key].min, rule.fullField, rule.min));
+	} else if (max && !min && val > rule.max) {
+		errors.push(format(options.messages[key].max, rule.fullField, rule.max));
+	} else if (min && max && (val < rule.min || val > rule.max)) {
+		errors.push(format(options.messages[key].range, rule.fullField, rule.min, rule.max));
+	}
+}
+
+var ENUM = 'enum';
+/**
+ *  Rule for validating a value exists in an enumerable list.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function enumerable(rule, value, source, errors, options) {
+	rule[ENUM] = Array.isArray(rule[ENUM]) ? rule[ENUM] : [];
+
+	if (rule[ENUM].indexOf(value) === -1) {
+		errors.push(format(options.messages[ENUM], rule.fullField, rule[ENUM].join(', ')));
+	}
+}
+
+/**
+ *  Rule for validating a regular expression pattern.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function pattern$1(rule, value, source, errors, options) {
+	if (rule.pattern) {
+		if (rule.pattern instanceof RegExp) {
+			// if a RegExp instance is passed, reset `lastIndex` in case its `global`
+			// flag is accidentally set to `true`, which in a validation scenario
+			// is not necessary and the result might be misleading
+			rule.pattern.lastIndex = 0;
+
+			if (!rule.pattern.test(value)) {
+				errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+			}
+		} else if (typeof rule.pattern === 'string') {
+			var _pattern = new RegExp(rule.pattern);
+
+			if (!_pattern.test(value)) {
+				errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+			}
+		}
+	}
+}
+
+var rules = {
+	required: required,
+	whitespace: whitespace,
+	type: type,
+	range: range,
+	"enum": enumerable,
+	pattern: pattern$1
+};
+
+/**
+ *  Performs validation for string types.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function string(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'string') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, 'string');
+
+		if (!isEmptyValue(value, 'string')) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+			rules.pattern(rule, value, source, errors, options);
+
+			if (rule.whitespace === true) {
+				rules.whitespace(rule, value, source, errors, options);
+			}
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a function.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function method(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function number(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (value === '') {
+			value = undefined;
+		}
+
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a boolean.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function _boolean(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates the regular expression type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function regexp(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value)) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number is an integer.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function integer(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number is a floating point number.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function floatFn(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates an array.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function array(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'array') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, 'array');
+
+		if (!isEmptyValue(value, 'array')) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates an object.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function object(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+var ENUM$1 = 'enum';
+/**
+ *  Validates an enumerable list.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function enumerable$1(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules[ENUM$1](rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a regular expression pattern.
+ *
+ *  Performs validation when a rule only contains
+ *  a pattern property but is not declared as a string type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function pattern$2(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'string') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value, 'string')) {
+			rules.pattern(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+function date(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field); 
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value)) {
+			var dateObject;
+
+			if (typeof value === 'number') {
+				dateObject = new Date(value);
+			} else {
+				dateObject = value;
+			}
+
+			rules.type(rule, dateObject, source, errors, options);
+
+			if (dateObject) {
+				rules.range(rule, dateObject.getTime(), source, errors, options);
+			}
+		}
+	}
+
+	callback(errors);
+}
+
+function required$1(rule, value, callback, source, options) {
+	var errors = [];
+	var type = Array.isArray(value) ? 'array' : typeof value;
+	rules.required(rule, value, source, errors, options, type);
+	callback(errors);
+}
+
+function type$1(rule, value, callback, source, options) {
+	var ruleType = rule.type;
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, ruleType) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, ruleType);
+
+		if (!isEmptyValue(value, ruleType)) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Performs validation for any type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function any(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+	}
+
+	callback(errors);
+}
+
+var validators = {
+	string: string,
+	method: method,
+	number: number,
+	"boolean": _boolean,
+	regexp: regexp,
+	integer: integer,
+	"float": floatFn,
+	array: array,
+	object: object,
+	"enum": enumerable$1,
+	pattern: pattern$2,
+	date: date,
+	url: type$1,
+	hex: type$1,
+	email: type$1,
+	required: required$1,
+	any: any
+};
+
+function newMessages() {
+	return {
+		"default": 'Validation error on field %s',
+		required: '%s is required',
+		"enum": '%s must be one of %s',
+		whitespace: '%s cannot be empty',
+		date: {
+			format: '%s date %s is invalid for format %s',
+			parse: '%s date could not be parsed, %s is invalid ',
+			invalid: '%s date %s is invalid'
+		},
+		types: {
+			string: '%s is not a %s',
+			method: '%s is not a %s (function)',
+			array: '%s is not an %s',
+			object: '%s is not an %s',
+			number: '%s is not a %s',
+			date: '%s is not a %s',
+			"boolean": '%s is not a %s',
+			integer: '%s is not an %s',
+			"float": '%s is not a %s',
+			regexp: '%s is not a valid %s',
+			email: '%s is not a valid %s',
+			url: '%s is not a valid %s',
+			hex: '%s is not a valid %s'
+		},
+		string: {
+			len: '%s must be exactly %s characters',
+			min: '%s must be at least %s characters',
+			max: '%s cannot be longer than %s characters',
+			range: '%s must be between %s and %s characters'
+		},
+		number: {
+			len: '%s must equal %s',
+			min: '%s cannot be less than %s',
+			max: '%s cannot be greater than %s',
+			range: '%s must be between %s and %s'
+		},
+		array: {
+			len: '%s must be exactly %s in length',
+			min: '%s cannot be less than %s in length',
+			max: '%s cannot be greater than %s in length',
+			range: '%s must be between %s and %s in length'
+		},
+		pattern: {
+			mismatch: '%s value %s does not match pattern %s'
+		},
+		clone: function clone() {
+			var cloned = JSON.parse(JSON.stringify(this));
+			cloned.clone = this.clone;
+			return cloned;
+		}
+	};
+}
+var messages = newMessages();
+
+/**
+ *  Encapsulates a validation schema.
+ *
+ *  @param descriptor An object declaring validation rules
+ *  for this schema.
+ */
+
+function Schema(descriptor) {
+	this.rules = null;
+	this._messages = messages;
+	this.define(descriptor);
+}
+
+Schema.prototype = {
+	messages: function messages(_messages) {
+		if (_messages) {
+			this._messages = deepMerge(newMessages(), _messages);
+		}
+
+		return this._messages;
+	},
+	define: function define(rules) {
+		if (!rules) {
+			throw new Error('Cannot configure a schema with no rules');
+		}
+
+		if (typeof rules !== 'object' || Array.isArray(rules)) {
+			throw new Error('Rules must be an object');
+		}
+
+		this.rules = {};
+		var z;
+		var item;
+
+		for (z in rules) {
+			if (rules.hasOwnProperty(z)) {
+				item = rules[z];
+				this.rules[z] = Array.isArray(item) ? item : [item];
+			}
+		}
+	},
+	validate: function validate(source_, o, oc) {
+		var _this = this;
+
+		if (o === void 0) {
+			o = {};
+		}
+
+		if (oc === void 0) {
+			oc = function oc() {};
+		}
+
+		var source = source_;
+		var options = o;
+		var callback = oc;
+
+		if (typeof options === 'function') {
+			callback = options;
+			options = {};
+		}
+
+		if (!this.rules || Object.keys(this.rules).length === 0) {
+			if (callback) {
+				callback();
+			}
+
+			return Promise.resolve();
+		}
+
+		function complete(results) {
+			var i;
+			var errors = [];
+			var fields = {};
+
+			function add(e) {
+				if (Array.isArray(e)) {
+					var _errors;
+
+					errors = (_errors = errors).concat.apply(_errors, e);
+				} else {
+					errors.push(e);
+				}
+			}
+
+			for (i = 0; i < results.length; i++) {
+				add(results[i]);
+			}
+
+			if (!errors.length) {
+				errors = null;
+				fields = null;
+			} else {
+				fields = convertFieldsError(errors);
+			}
+
+			callback(errors, fields);
+		}
+
+		if (options.messages) {
+			var messages$1 = this.messages();
+
+			if (messages$1 === messages) {
+				messages$1 = newMessages();
+			}
+
+			deepMerge(messages$1, options.messages);
+			options.messages = messages$1;
+		} else {
+			options.messages = this.messages();
+		}
+
+		var arr;
+		var value;
+		var series = {};
+		var keys = options.keys || Object.keys(this.rules);
+		keys.forEach(function(z) {
+			arr = _this.rules[z];
+			value = source[z];
+			arr.forEach(function(r) {
+				var rule = r;
+
+				if (typeof rule.transform === 'function') {
+					if (source === source_) {
+						source = _extends({}, source);
+					}
+
+					value = source[z] = rule.transform(value);
+				}
+
+				if (typeof rule === 'function') {
+					rule = {
+						validator: rule
+					};
+				} else {
+					rule = _extends({}, rule);
+				}
+
+				rule.validator = _this.getValidationMethod(rule);
+				rule.field = z;
+				rule.fullField = rule.fullField || z;
+				rule.type = _this.getType(rule);
+
+				if (!rule.validator) {
+					return;
+				}
+
+				series[z] = series[z] || [];
+				series[z].push({
+					rule: rule,
+					value: value,
+					source: source,
+					field: z
+				});
+			});
+		});
+		var errorFields = {};
+		return asyncMap(series, options, function(data, doIt) {
+			var rule = data.rule;
+			var deep = (rule.type === 'object' || rule.type === 'array') && (typeof rule.fields === 'object' || typeof rule.defaultField ===
+				'object');
+			deep = deep && (rule.required || !rule.required && data.value);
+			rule.field = data.field;
+
+			function addFullfield(key, schema) {
+				return _extends({}, schema, {
+					fullField: rule.fullField + "." + key
+				});
+			}
+
+			function cb(e) {
+				if (e === void 0) {
+					e = [];
+				}
+
+				var errors = e;
+
+				if (!Array.isArray(errors)) {
+					errors = [errors];
+				}
+
+				if (!options.suppressWarning && errors.length) {
+					Schema.warning('async-validator:', errors);
+				}
+
+				if (errors.length && rule.message) {
+					errors = [].concat(rule.message);
+				}
+
+				errors = errors.map(complementError(rule));
+
+				if (options.first && errors.length) {
+					errorFields[rule.field] = 1;
+					return doIt(errors);
+				}
+
+				if (!deep) {
+					doIt(errors);
+				} else {
+					// if rule is required but the target object
+					// does not exist fail at the rule level and don't
+					// go deeper
+					if (rule.required && !data.value) {
+						if (rule.message) {
+							errors = [].concat(rule.message).map(complementError(rule));
+						} else if (options.error) {
+							errors = [options.error(rule, format(options.messages.required, rule.field))];
+						} else {
+							errors = [];
+						}
+
+						return doIt(errors);
+					}
+
+					var fieldsSchema = {};
+
+					if (rule.defaultField) {
+						for (var k in data.value) {
+							if (data.value.hasOwnProperty(k)) {
+								fieldsSchema[k] = rule.defaultField;
+							}
+						}
+					}
+
+					fieldsSchema = _extends({}, fieldsSchema, {}, data.rule.fields);
+
+					for (var f in fieldsSchema) {
+						if (fieldsSchema.hasOwnProperty(f)) {
+							var fieldSchema = Array.isArray(fieldsSchema[f]) ? fieldsSchema[f] : [fieldsSchema[f]];
+							fieldsSchema[f] = fieldSchema.map(addFullfield.bind(null, f));
+						}
+					}
+
+					var schema = new Schema(fieldsSchema);
+					schema.messages(options.messages);
+
+					if (data.rule.options) {
+						data.rule.options.messages = options.messages;
+						data.rule.options.error = options.error;
+					}
+
+					schema.validate(data.value, data.rule.options || options, function(errs) {
+						var finalErrors = [];
+
+						if (errors && errors.length) {
+							finalErrors.push.apply(finalErrors, errors);
+						}
+
+						if (errs && errs.length) {
+							finalErrors.push.apply(finalErrors, errs);
+						}
+
+						doIt(finalErrors.length ? finalErrors : null);
+					});
+				}
+			}
+
+			var res;
+
+			if (rule.asyncValidator) {
+				res = rule.asyncValidator(rule, data.value, cb, data.source, options);
+			} else if (rule.validator) {
+				res = rule.validator(rule, data.value, cb, data.source, options);
+
+				if (res === true) {
+					cb();
+				} else if (res === false) {
+					cb(rule.message || rule.field + " fails");
+				} else if (res instanceof Array) {
+					cb(res);
+				} else if (res instanceof Error) {
+					cb(res.message);
+				}
+			}
+
+			if (res && res.then) {
+				res.then(function() {
+					return cb();
+				}, function(e) {
+					return cb(e);
+				});
+			}
+		}, function(results) {
+			complete(results);
+		});
+	},
+	getType: function getType(rule) {
+		if (rule.type === undefined && rule.pattern instanceof RegExp) {
+			rule.type = 'pattern';
+		}
+
+		if (typeof rule.validator !== 'function' && rule.type && !validators.hasOwnProperty(rule.type)) {
+			throw new Error(format('Unknown rule type %s', rule.type));
+		}
+
+		return rule.type || 'string';
+	},
+	getValidationMethod: function getValidationMethod(rule) {
+		if (typeof rule.validator === 'function') {
+			return rule.validator;
+		}
+
+		var keys = Object.keys(rule);
+		var messageIndex = keys.indexOf('message');
+
+		if (messageIndex !== -1) {
+			keys.splice(messageIndex, 1);
+		}
+
+		if (keys.length === 1 && keys[0] === 'required') {
+			return validators.required;
+		}
+
+		return validators[this.getType(rule)] || false;
+	}
+};
+
+Schema.register = function register(type, validator) {
+	if (typeof validator !== 'function') {
+		throw new Error('Cannot register a validator by type, validator is not a function');
+	}
+
+	validators[type] = validator;
+};
+
+Schema.warning = warning;
+Schema.messages = messages;
+
+export default Schema;
+//# sourceMappingURL=index.js.map
diff --git a/uview-ui/libs/util/city.js b/uview-ui/libs/util/city.js
new file mode 100644
index 0000000..94169eb
--- /dev/null
+++ b/uview-ui/libs/util/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/uview-ui/libs/util/emitter.js b/uview-ui/libs/util/emitter.js
new file mode 100644
index 0000000..228016e
--- /dev/null
+++ b/uview-ui/libs/util/emitter.js
@@ -0,0 +1,51 @@
+/**
+ * 递归使用 call 方式this指向
+ * @param componentName // 需要找的组件的名称
+ * @param eventName // 事件名称
+ * @param 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 componentName // 需要找的组件的名称
+         * @param eventName // 事件名称
+         * @param params // 需要传递的参数
+         */
+        dispatch(componentName, eventName, params) {
+            let parent = this.$parent || this.$root;//$parent 找到最近的父节点 $root 根节点
+            let name = parent.$options.name; // 获取当前组件实例的name
+            // 如果当前有节点 && 当前没名称 且 当前名称等于需要传进来的名称的时候就去查找当前的节点
+            // 循环出当前名称的一样的组件实例
+            while (parent && (!name||name!==componentName)) {
+                parent = parent.$parent;
+                if (parent) {
+                    name = parent.$options.name;
+                }
+            }
+            // 有节点表示当前找到了name一样的实例
+            if (parent) {
+                parent.$emit.apply(parent,[eventName].concat(params))
+            }
+        },
+        /**
+         * 广播 (向下查找) (广播多个)
+         * @param componentName // 需要找的组件的名称
+         * @param eventName // 事件名称
+         * @param params // 需要传递的参数
+         */
+        broadcast(componentName, eventName, params) {
+            broadcast.call(this,componentName, eventName, params)
+        }
+    }
+}
diff --git a/uview-ui/libs/util/province.js b/uview-ui/libs/util/province.js
new file mode 100644
index 0000000..436b190
--- /dev/null
+++ b/uview-ui/libs/util/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/uview-ui/package.json b/uview-ui/package.json
new file mode 100644
index 0000000..431d585
--- /dev/null
+++ b/uview-ui/package.json
@@ -0,0 +1,39 @@
+{
+	"name": "uview-ui",
+	"version": "1.8.4",
+	"description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
+	"main": "index.js",
+	"keywords": [
+		"uview",
+		"uView",
+		"uni-app",
+		"uni-app ui",
+		"uniapp",
+		"uviewui",
+		"uview ui",
+		"uviewUI",
+		"uViewui",
+		"uViewUI",
+		"uView UI",
+		"uni ui",
+		"uni UI",
+		"uniapp ui",
+		"ui",
+		"UI框架",
+		"uniapp ui框架",
+		"uniapp UI"
+	],
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"repository": {
+		"type": "git",
+		"url": ""
+	},
+	"devDependencies": {
+		"node-sass": "^4.14.0",
+		"sass-loader": "^8.0.2"
+	},
+	"author": "uView",
+	"license": "MIT"
+}
diff --git a/uview-ui/theme.scss b/uview-ui/theme.scss
new file mode 100644
index 0000000..c8f5776
--- /dev/null
+++ b/uview-ui/theme.scss
@@ -0,0 +1,38 @@
+// 此文件为uView的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+$u-main-color: #303133;
+$u-content-color: #606266;
+$u-tips-color: #909399;
+$u-light-color: #c0c4cc;
+$u-border-color: #e4e7ed;
+$u-bg-color: #f3f4f6;
+
+$u-type-primary: #3cb4fb;
+$u-type-primary-light: #ecf5ff;
+$u-type-primary-disabled: #a0cfff;
+$u-type-primary-dark: #2b85e4;
+
+$u-type-warning: #ff9900;
+$u-type-warning-disabled: #fcbd71;
+$u-type-warning-dark: #f29100;
+$u-type-warning-light: #fdf6ec;
+
+$u-type-success: #19be6b;
+$u-type-success-disabled: #71d5a1;
+$u-type-success-dark: #18b566;
+$u-type-success-light: #dbf1e1;
+
+$u-type-error: #fa3534;
+$u-type-error-disabled: #fab6b6;
+$u-type-error-dark: #dd6161;
+$u-type-error-light: #fef0f0;
+
+$u-type-info: #909399;
+$u-type-info-disabled: #c8c9cc;
+$u-type-info-dark: #82848a;
+$u-type-info-light: #f4f4f5;
+
+$u-form-item-height: 70rpx;
+$u-form-item-border-color: #dcdfe6;
diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 0000000..9d4aa7b
--- /dev/null
+++ b/vue.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+	// 配置路径别名
+	configureWebpack: {
+		devServer: {
+			// 调试时允许内网穿透，让外网的人访问到本地调试的H5页面
+			disableHostCheck: true,
+			port: '8080',
+		}
+	},
+	//productionSourceMap: false,
+}