From c55be1078372264dde54e4370b2a4b5fa27aa417 Mon Sep 17 00:00:00 2001
From: pengxiaolong <15716207+pengxiaolong711@user.noreply.gitee.com>
Date: Thu, 22 May 2025 22:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/VerifyLogin.js                     |  31 ++
 components/contentList/contentList.vue        |   2 +
 components/request.js                         |   6 +-
 pages/Home/Home.vue                           |   2 +-
 pages/UserInformation/UserInformation.vue     |  12 +-
 pages/login/login.vue                         |  15 +-
 pages/pkDetail/pkDetail.vue                   | 150 ++++-
 uni_modules/uni-popup/changelog.md            |  94 ++++
 .../components/uni-popup-dialog/keypress.js   |  45 ++
 .../uni-popup-dialog/uni-popup-dialog.vue     | 327 +++++++++++
 .../uni-popup-message/uni-popup-message.vue   | 143 +++++
 .../uni-popup-share/uni-popup-share.vue       | 188 +++++++
 .../components/uni-popup/i18n/en.json         |   7 +
 .../components/uni-popup/i18n/index.js        |   8 +
 .../components/uni-popup/i18n/zh-Hans.json    |   7 +
 .../components/uni-popup/i18n/zh-Hant.json    |   7 +
 .../components/uni-popup/keypress.js          |  45 ++
 .../uni-popup/components/uni-popup/popup.js   |  26 +
 .../components/uni-popup/uni-popup.uvue       |  90 +++
 .../components/uni-popup/uni-popup.vue        | 518 ++++++++++++++++++
 uni_modules/uni-popup/package.json            |  90 +++
 uni_modules/uni-popup/readme.md               |  17 +
 uni_modules/uni-transition/changelog.md       |  27 +
 .../uni-transition/createAnimation.js         | 131 +++++
 .../uni-transition/uni-transition.vue         | 289 ++++++++++
 uni_modules/uni-transition/package.json       |  87 +++
 uni_modules/uni-transition/readme.md          |  11 +
 .../mp-weixin/components/VerifyLogin.js.map   |   1 +
 .../components/contentList/contentList.js.map |   2 +-
 .../mp-weixin/components/formatDate.js.map    |   2 +-
 .../mp-weixin/components/request.js.map       |   2 +-
 .../mp-weixin/pages/Home/Home.js.map          |   2 +-
 .../UserInformation/UserInformation.js.map    |   2 +-
 .../mp-weixin/pages/login/login.js.map        |   2 +-
 .../mp-weixin/pages/pkDetail/pkDetail.js.map  |   2 +-
 .../components/uni-popup/uni-popup.js.map     |   1 +
 .../uni-transition/createAnimation.js.map     |   1 +
 .../uni-transition/uni-transition.js.map      |   1 +
 unpackage/dist/dev/mp-weixin/common/vendor.js |   2 +-
 .../dev/mp-weixin/components/VerifyLogin.js   |  32 ++
 .../components/contentList/contentList.js     |   9 +-
 .../dev/mp-weixin/components/formatDate.js    |  11 +
 .../dist/dev/mp-weixin/components/request.js  |   8 +-
 .../dist/dev/mp-weixin/pages/Home/Home.js     |   1 +
 .../pages/UserInformation/UserInformation.js  |  17 +-
 .../dist/dev/mp-weixin/pages/login/login.js   |  17 +-
 .../dev/mp-weixin/pages/pkDetail/pkDetail.js  |  63 ++-
 .../mp-weixin/pages/pkDetail/pkDetail.json    |   4 +-
 .../mp-weixin/pages/pkDetail/pkDetail.wxml    |   2 +-
 .../mp-weixin/pages/pkDetail/pkDetail.wxss    |  72 +++
 .../components/uni-popup/uni-popup.js         | 397 ++++++++++++++
 .../components/uni-popup/uni-popup.json       |   6 +
 .../components/uni-popup/uni-popup.wxml       |   1 +
 .../components/uni-popup/uni-popup.wxss       |  47 ++
 .../uni-transition/createAnimation.js         | 116 ++++
 .../uni-transition/uni-transition.js          | 269 +++++++++
 .../uni-transition/uni-transition.json        |   4 +
 .../uni-transition/uni-transition.wxml        |   1 +
 .../uni-transition/uni-transition.wxss        |   0
 59 files changed, 3428 insertions(+), 44 deletions(-)
 create mode 100644 components/VerifyLogin.js
 create mode 100644 uni_modules/uni-popup/changelog.md
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/en.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/index.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/popup.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.vue
 create mode 100644 uni_modules/uni-popup/package.json
 create mode 100644 uni_modules/uni-popup/readme.md
 create mode 100644 uni_modules/uni-transition/changelog.md
 create mode 100644 uni_modules/uni-transition/components/uni-transition/createAnimation.js
 create mode 100644 uni_modules/uni-transition/components/uni-transition/uni-transition.vue
 create mode 100644 uni_modules/uni-transition/package.json
 create mode 100644 uni_modules/uni-transition/readme.md
 create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/VerifyLogin.js.map
 create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
 create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js.map
 create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
 create mode 100644 unpackage/dist/dev/mp-weixin/components/VerifyLogin.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxss

diff --git a/components/VerifyLogin.js b/components/VerifyLogin.js
new file mode 100644
index 0000000..2ac893e
--- /dev/null
+++ b/components/VerifyLogin.js
@@ -0,0 +1,31 @@
+function VerifyLogin() {
+    return new Promise((resolve, reject) => {
+     
+        uni.getStorage({
+            key: "userinfo",
+            success: (res) => {
+                if (res.data) {
+                    if (res.data.nickName) {
+                        resolve(true);
+                    } else {
+                        uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+                        uni.reLaunch({ url: "/pages/UserInformation/UserInformation" });
+                        resolve(false);
+                    }
+                } else {
+                    uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+                    uni.navigateTo({ url: '/pages/login/login' });
+                    resolve(false);
+                }
+            },
+            fail: (err) => {
+                console.error("获取用户信息失败", err);
+                uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+                uni.navigateTo({ url: '/pages/login/login' });
+                reject(err);
+            }
+        });
+    });
+}
+
+export default VerifyLogin;
diff --git a/components/contentList/contentList.vue b/components/contentList/contentList.vue
index fbf7242..d88ac41 100644
--- a/components/contentList/contentList.vue
+++ b/components/contentList/contentList.vue
@@ -28,6 +28,7 @@
 import request from "../../components/request.js";
 import formatDate from "../../components/formatDate.js";
 export default {
+  inject: ['$global'],
   data() {
     return {
       page: 0,//页码
@@ -50,6 +51,7 @@ export default {
         },
       })
     },
+    formatDate: formatDate,
    async pkList(){
       const res = await request({
         url: "pk/pkList",
diff --git a/components/request.js b/components/request.js
index e0ea89f..8fecd96 100644
--- a/components/request.js
+++ b/components/request.js
@@ -24,15 +24,17 @@ export default function request(urldata) {
                                 }
                             });
                         } else {
-                            this.$global.lastPage = uni.page.route;
+                            uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
                             uni.reLaunch({ url: "/pages/UserInformation/UserInformation" })
                         }
                     } else {
-                        this.$global.lastPage = uni.page.route;
+                        uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
                         uni.navigateTo({ url: '/pages/login/login' })
                     }
                 },
                 fail: function (res) {
+                    uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+                    uni.navigateTo({ url: '/pages/login/login' })
                     reject(res);
                 }
             });
diff --git a/pages/Home/Home.vue b/pages/Home/Home.vue
index 515d5ac..b5494be 100644
--- a/pages/Home/Home.vue
+++ b/pages/Home/Home.vue
@@ -32,7 +32,7 @@ export default {
   methods: {
     goAdvertisement(){
       // this.$global.lastPage = getCurrentPages().router;
-      // uni.navigateTo({ url: '/pages/login/login' })
+      uni.navigateTo({ url: '/pages/pkDetail/pkDetail' })
     }
   },
   components: {
diff --git a/pages/UserInformation/UserInformation.vue b/pages/UserInformation/UserInformation.vue
index e08d7c1..5acaf07 100644
--- a/pages/UserInformation/UserInformation.vue
+++ b/pages/UserInformation/UserInformation.vue
@@ -28,6 +28,7 @@ export default {
       id: "",
       info: {},
       userSig: "",
+      lastPage: "",
     };
   },
   onLoad(option) {
@@ -43,6 +44,15 @@ export default {
         this.userSig = res.data;
       },
     });
+    uni.getStorage({
+      key: "lastPage",
+      success: (res) => {
+        this.lastPage = "/"+res.data;
+      },
+      fail: () => {
+        this.lastPage = "/pages/Home/Home";
+      },
+    })
     // const { info } = option;
     // this.id = JSON.parse(info).id
   },
@@ -99,7 +109,7 @@ export default {
 
           //```````````````````````````````````````````````````````````````````````登录成功后跳转回原页面 或 首页
           uni.reLaunch({
-            url: this.$global.lastPage || "/pages/Home/Home", // 默认页
+            url: this.lastPage, 
           });
           //````````````````````````````````````````````````````````````````````
         } else {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d6259f8..ab99abf 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -20,6 +20,7 @@ export default {
       userInfo: {},
       info: {},
       userSig: "",
+      lastPage: "",
     };
   },
   onLoad() {
@@ -29,7 +30,18 @@ export default {
         this.userInfo = res.userInfo;
       },
     });
+    uni.getStorage({
+      key: "lastPage",
+      success: (res) => {
+        this.lastPage = "/"+res.data;
+        console.log(this.lastPage);
+      },
+      fail: () => {
+        this.lastPage = "/pages/Home/Home";
+      },
+    })
   },
+  
   methods: {
     // 获取手机号
     async getPhoneNumber(e) {
@@ -66,8 +78,9 @@ export default {
             uni.hideLoading();
             TUIlogin(this.info.data.chatInfo.appId, this.info.data.info.id,this.userSig.userSig)
             //跳转原来页面否则首页
+            console.log("跳的地址", this.lastPage);
             uni.reLaunch({
-            url: this.$global.lastPage || "/pages/Home/Home", // 默认页
+            url: this.lastPage, 
           });
           }
         } else {
diff --git a/pages/pkDetail/pkDetail.vue b/pages/pkDetail/pkDetail.vue
index 7d8af65..153af16 100644
--- a/pages/pkDetail/pkDetail.vue
+++ b/pages/pkDetail/pkDetail.vue
@@ -1,21 +1,56 @@
 <template>
-    <view class="container">
+  <view class="Navigation">
+    <image
+      src="../../static/Navigationimg.png"
+      mode="scaleToFill"
+      class="Navigationimg"
+    />
+    <image
+      @click="Returnfunc"
+      src="../../static/Return.png"
+      mode="scaleToFill"
+      class="Return"
+    />
+  </view>
+  <view class="container">
+    <view class="individual">
+      <view class="anchor">
         <!-- <image
             src="{{item.anchorIcon}}"
             mode="scaleToFill"
         /> -->
-        <view >主播名称{{item.anchorId}}</view>
-        <view>主播性别{{item.sex === 1?"男":"女"}}</view>
-        <view> 国家{{item.country}}</view>
-        <view>金币{{item.coin}}</view>
-        <view>主播备注{{item.remark}}</view>
-        <view>PK时间{{item.pkTime}}</view>
+      </view>
+      <view>
+        <view>主播名称{{ item.anchorId }}</view>
+        <view>主播性别{{ item.sex === 1 ? "男" : "女" }}</view>
+        <view> 国家{{ item.country }}</view>
+      </view>
     </view>
 
+    <view>金币{{ item.coin }}</view>
+    <view>PK时间{{ formatDate(item.pkTime) }}</view>
+
+    <view>主播备注{{ item.remark }}</view>
+    <button @click="openChat()">聊了个天</button>
+    <button @click="open()">立即邀请PK</button>
+  </view>
+  <!-- 弹窗 -->
+  <uni-popup ref="popup" type="center" border-radius="10px 10px 0 0">
+    <view class="popup-content">
+      <view class="popup-title">您确定要邀请主播PK吗？</view>
+      <view class="popup-btn">
+        <button class="invite" type="primary" @click="invite()">邀请</button>
+        <button class="cancel" type="default" @click="close()">取消</button>
+      </view>
+    </view>
+  </uni-popup>
 </template>
 
 <script>
+import formatDate from "../../components/formatDate.js";
+import VerifyLogin from "../../components/VerifyLogin.js";
 export default {
+  inject: ['$global'],
   data() {
     return {
       item: {},
@@ -29,11 +64,110 @@ export default {
       this.item = data.item; // 将接收到的数据赋值给item
       console.log("接收到的数据:", this.item);
     });
+    
+  },
+  methods: {
+    formatDate: formatDate,
+    Returnfunc() {
+      uni.navigateBack({
+        delta: 1,
+      });
+    },
+    open() {
+      this.$refs.popup.open("center");
+    },
+    invite() {
+      // 发送邀请消息
+    },
+    close() {
+      this.$refs.popup.close();
+    },
+    openChat() {
+      //判断用户是否登录
+      VerifyLogin().then(() => {
+        // 打开聊天页面
+        const conversationID = `C2C${this.item.senderId}`;
+        uni.redirectTo({
+          url: `/TUIKit/components/TUIChat/index?conversationID=${conversationID}`,
+        });
+      });
+    },
   },
-  methods: {},
 };
 </script>
 
 <style scoped>
 /* 样式定义 */
+.Navigation {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 200rpx;
+}
+.Navigationimg {
+  width: 100%;
+  height: 100%;
+}
+.Return {
+  position: absolute;
+  left: 60rpx;
+  bottom: 40rpx;
+  width: 60rpx;
+  height: 60rpx;
+}
+.container {
+  position: absolute;
+  top: 200rpx;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.individual {
+  display: flex;
+  /* justify-content: center; */
+  margin-top: 50rpx;
+}
+.anchor {
+  width: 200rpx;
+  height: 200rpx;
+  background-color: rgba(0, 0, 255, 0.369);
+  border-radius: 50%;
+}
+.popup-content {
+  width: 500rpx;
+  height: 300rpx;
+  background-color: #fff;
+  border-radius: 10px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.popup-title {
+  font-size: 30rpx;
+  margin-top: 50rpx;
+  text-align: center;
+}
+.popup-btn {
+  display: flex;
+  justify-content: space-around;
+  margin-top: 50rpx;
+}
+.invite {
+  width: 200rpx;
+  height: 80rpx;
+  font-size: 30rpx;
+  line-height: 80rpx;
+  border-radius: 20rpx;
+  background-color: #1aff0087;
+}
+.cancel {
+  width: 200rpx;
+  height: 80rpx;
+  font-size: 30rpx;
+  line-height: 80rpx;
+  margin-left: 30rpx;
+  border-radius: 20rpx;
+}
 </style>
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..013272a
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,94 @@
+## 1.9.8（2025-04-16）
+- 修复 更新组件示例 ，解决更新数据或保存项目导致弹窗消失的问题
+## 1.9.7（2025-04-14）
+- 修复 uni-popup-dialog 弹出框在vue3中双向绑定问题
+## 1.9.6（2025-01-08）
+- 修复 示例中过期图片地址
+## 1.9.5（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.9.2（2024-09-21）
+- 修复 uni-popup在android上的重复点击弹出位置不正确的bug
+## 1.9.1（2024-04-02）
+- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
+## 1.9.0（2024-03-28）
+- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
+## 1.8.9（2024-03-20）
+- 修复 uni-popup-dialog 数据输入时修正为双向绑定
+## 1.8.8（2024-02-20）
+- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
+## 1.8.7（2024-02-02）
+- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
+## 1.8.6（2024-01-30）
+- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
+## 1.8.5（2024-01-26）
+- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
+## 1.8.4（2023-11-15）
+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..f5731d5
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,327 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
+					:placeholder="placeholderText" :focus="focus">
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @showClose {Boolean} 是否显示关闭按钮
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @property {Number} maxlength 输入
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
+		props: {
+			inputType: {
+				type: String,
+				default: 'text'
+			},
+			showClose: {
+				type: Boolean,
+				default: true
+			},
+			// #ifdef VUE2
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [Number, String],
+				default: ''
+			},
+			// #endif
+
+
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText: {
+				type: String,
+				default: ''
+			},
+			confirmText: {
+				type: String,
+				default: ''
+			},
+			maxlength: {
+				type: Number,
+				default: -1,
+			},
+			focus: {
+				type: Boolean,
+				default: true,
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				setVal(val)
+			},
+			// #ifdef VUE3
+			modelValue(val) {
+				setVal(val)
+			},
+			// #endif
+			val(val) {
+				// #ifdef VUE2
+				// TODO 兼容 vue2
+				this.$emit('input', val);
+				// #endif
+				// #ifdef VUE3
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', val);
+				// #endif
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value;
+				// #ifdef VUE3
+				this.val = this.modelValue;
+				// #endif
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		methods: {
+			/**
+			 * 给val属性赋值
+			 */
+			setVal(val) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			},
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input') {
+					this.$emit('confirm', this.val)
+				} else {
+					this.$emit('confirm')
+				}
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			close() {
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..91370a8
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..c8945d5
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// TODO 替换为自己的图标
+				bottomData: [{
+						text: '微信',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'ali'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..7f1bd06
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..5e3003c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..13e39eb
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..c4e5781
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 0000000..5eb8d5b
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..5af55e0
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,518 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+			borderRadius:{
+				type: String,
+			}
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					backgroundColor: 'transparent',
+					borderRadius: this.borderRadius || "0",
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: 'top'
+			}
+		},
+		computed: {
+			getStyles() {
+				let res = { backgroundColor: this.bg };
+				if (this.borderRadius || "0") {
+					res = Object.assign(res, { borderRadius: this.borderRadius })
+				}
+				return res;
+			},
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				// #ifdef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getWindowInfo()
+				// #endif
+				// #ifndef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				// #endif
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		activated() {
+   	  this.setH5Visible(!this.showPopup);
+    },
+    deactivated() {
+      this.setH5Visible(true);
+    },
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible(visible = true) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					this.showPoptrans()
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
+				// #ifdef MP-WEIXIN
+					this.ani = ['fade']
+				// #endif
+				// #ifndef MP-WEIXIN
+					this.ani = ['zoom-out', 'fade']
+				// #endif
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center',
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			showPoptrans(){
+				this.$nextTick(()=>{
+					this.showPopup = true
+					this.showTrans = true
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..d8bfb9f
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,90 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.9.8",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"App": {
+                    "app-vue": "y",
+                    "app-nvue": "y",
+                    "app-harmony": "u",
+                    "app-uvue": "u"
+                },
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..2f2b10d
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,27 @@
+## 1.3.4（2025-04-16）
+- 修复 页面数据更新到底动画复原的问题
+- 修复 示例页面打开报错的问题
+## 1.3.3（2024-04-23）
+- 修复 当元素会受变量影响自动隐藏的bug
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..8f89b18
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..8772572
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,289 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+  <!-- #ifdef APP-NVUE -->
+  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		},
+		onceRender:{
+			type:Boolean,
+			default:false
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run(() => {
+						this.transform = ''
+						this.opacity = opacity || 1
+					})
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 0 : 1,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..b76a3ab
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.4",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+            "app-vue": "y",
+            "app-nvue": "y",
+            "app-harmony": "u",
+            "app-uvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..2f8a77e
--- /dev/null
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/components/VerifyLogin.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/components/VerifyLogin.js.map
new file mode 100644
index 0000000..9c9c4db
--- /dev/null
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/VerifyLogin.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"VerifyLogin.js","sources":["components/VerifyLogin.js"],"sourcesContent":["function VerifyLogin() {\r\n    return new Promise((resolve, reject) => {\r\n     \r\n        uni.getStorage({\r\n            key: \"userinfo\",\r\n            success: (res) => {\r\n                if (res.data) {\r\n                    if (res.data.nickName) {\r\n                        resolve(true);\r\n                    } else {\r\n                        uni.setStorageSync(\"lastPage\", getCurrentPages()[getCurrentPages().length - 1].route);\r\n                        uni.reLaunch({ url: \"/pages/UserInformation/UserInformation\" });\r\n                        resolve(false);\r\n                    }\r\n                } else {\r\n                    uni.setStorageSync(\"lastPage\", getCurrentPages()[getCurrentPages().length - 1].route);\r\n                    uni.navigateTo({ url: '/pages/login/login' });\r\n                    resolve(false);\r\n                }\r\n            },\r\n            fail: (err) => {\r\n                console.error(\"获取用户信息失败\", err);\r\n                uni.setStorageSync(\"lastPage\", getCurrentPages()[getCurrentPages().length - 1].route);\r\n                uni.navigateTo({ url: '/pages/login/login' });\r\n                reject(err);\r\n            }\r\n        });\r\n    });\r\n}\r\n\r\nexport default VerifyLogin;\r\n"],"names":["uni"],"mappings":";;AAAA,SAAS,cAAc;AACnB,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAEpCA,kBAAAA,MAAI,WAAW;AAAA,MACX,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AACd,YAAI,IAAI,MAAM;AACV,cAAI,IAAI,KAAK,UAAU;AACnB,oBAAQ,IAAI;AAAA,UACpC,OAA2B;AACHA,gCAAI,eAAe,YAAY,gBAAiB,EAAC,gBAAiB,EAAC,SAAS,CAAC,EAAE,KAAK;AACpFA,0BAAAA,MAAI,SAAS,EAAE,KAAK,yCAA0C,CAAA;AAC9D,oBAAQ,KAAK;AAAA,UAChB;AAAA,QACrB,OAAuB;AACHA,8BAAI,eAAe,YAAY,gBAAiB,EAAC,gBAAiB,EAAC,SAAS,CAAC,EAAE,KAAK;AACpFA,wBAAAA,MAAI,WAAW,EAAE,KAAK,qBAAsB,CAAA;AAC5C,kBAAQ,KAAK;AAAA,QAChB;AAAA,MACJ;AAAA,MACD,MAAM,CAAC,QAAQ;AACXA,sBAAA,MAAA,MAAA,SAAA,mCAAc,YAAY,GAAG;AAC7BA,4BAAI,eAAe,YAAY,gBAAiB,EAAC,gBAAiB,EAAC,SAAS,CAAC,EAAE,KAAK;AACpFA,sBAAAA,MAAI,WAAW,EAAE,KAAK,qBAAsB,CAAA;AAC5C,eAAO,GAAG;AAAA,MACb;AAAA,IACb,CAAS;AAAA,EACT,CAAK;AACL;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/components/contentList/contentList.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/components/contentList/contentList.js.map
index cb3dab8..12d374d 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/contentList/contentList.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/contentList/contentList.js.map
@@ -1 +1 @@
-{"version":3,"file":"contentList.js","sources":["components/contentList/contentList.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RDov6aG555uuL3RrLW1pbmktcHJvZ3JhbS9jb21wb25lbnRzL2NvbnRlbnRMaXN0L2NvbnRlbnRMaXN0LnZ1ZQ"],"sourcesContent":["<template>\r\n  <scroll-view scroll-y=\"true\" class=\"scroll\" lower-threshold=\"100\" @scrolltolower=\"onScrollToLower\" >\r\n    <uni-card  v-for=\"(item, index) in list\">\r\n      <view class=\"content-list\" @click=\"goDetail(item)\">\r\n      <!-- `````````````````````````` -->\r\n      <image class=\"headShot\" :src=\"item.anchorIcon\" mode=\"scaleToFill\" />\r\n      <!-- `````````````````````````````````````` -->\r\n      <view class=\"content-list-title\">\r\n        <view class=\"cardname\">{{ item.anchorId }}</view>\r\n        <view class=\"content-list-info\">\r\n          <view  :class=\"{Gendermale:item.sex === '1',Genderfemale:item.sex === '2'}\">\r\n            <image v-if=\"item.sex === '2'\"  class=\"Genderimg\" src=\"../../static/female.png\" mode=\"scaleToFill\" />\r\n            <image v-else class=\"Genderimg\" src=\"../../static/male.png\" mode=\"scaleToFill\" />\r\n            <view class=\"age\">{{ item.sex === '1'? \"男\" : \"女\" }}</view>\r\n          </view>\r\n          <view class=\"RoomID\">PK时间:&nbsp;{{formatDate(item.pkTime)}}</view>\r\n          <view class=\"Charm\">金币:</view>\r\n          <view class=\"charmValue\"> {{item.coin+'K'}}</view>\r\n        </view>\r\n      </view>\r\n      <!-- `````````````````````````````````````````````````````` -->\r\n      </view>\r\n    </uni-card>\r\n  </scroll-view>\r\n</template>\r\n\r\n<script>\r\nimport request from \"../../components/request.js\";\r\nimport formatDate from \"../../components/formatDate.js\";\r\nexport default {\r\n  data() {\r\n    return {\r\n      page: 0,//页码\r\n      size: 10, //每页条数\r\n      list: [],    // 列表数据\r\n    };\r\n  },\r\n  mounted() {\r\n    // 页面加载完成后请求数据\r\n    this.pkList()\r\n  },\r\n  methods: {\r\n    goDetail(item) {\r\n      uni.navigateTo({\r\n        url: '/pages/pkDetail/pkDetail',\r\n        success: function(res) {\r\n          res.eventChannel.emit('itemDetail', { \r\n            item: item,\r\n            });\r\n        },\r\n      })\r\n    },\r\n   async pkList(){\r\n      const res = await request({\r\n        url: \"pk/pkList\",\r\n        method: \"GET\",\r\n        data: {\r\n          status: 0,\r\n          page: this.page,\r\n          size: this.size,\r\n          },\r\n          userInfo: false,\r\n      });\r\n      console.log(res);\r\n      if (res.code === 200) {\r\n        this.list.push(...res.data)\r\n        console.log(this.list)\r\n      }\r\n    },\r\n    onScrollToLower() {\r\n      this.page++;\r\n      this.pkList();\r\n    },\r\n  },\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n.scroll {\r\n  height: 90%;\r\n  display: flex;\r\n  flex-direction: column;\r\n  justify-content: center;\r\n  align-items: center;\r\n}\r\n.content-list {\r\n  display: flex;\r\n  align-items: center;\r\n  width: 712rpx;\r\n  height: 161rpx;\r\n  background: #ffffff;\r\n  border-radius: 15rpx;\r\n  margin-bottom: 12rpx;\r\n  margin-left: 20rpx;\r\n}\r\n.headShot {\r\n  width: 101rpx;\r\n  height: 101rpx;\r\n  border-radius: 50rpx;\r\n  margin-left: 30rpx;\r\n  margin-right: 33rpx;\r\n}\r\n.content-list-info {\r\n  display: flex;\r\n  align-items: center;\r\n}\r\n.cardname {\r\n  font-size: 31rpx;\r\n  color: #161616;\r\n  line-height: 38rpx;\r\n}\r\n.Genderimg {\r\n  width: 15rpx;\r\n  height: 15rpx;\r\n  margin-left: 10rpx;\r\n  margin-right: 10rpx;\r\n}\r\n.age {\r\n  color: #ffffff;\r\n  font-size: 14rpx;\r\n}\r\n\r\n.Gendermale{\r\n    background: url(../../static/maleimg.png) no-repeat center;\r\n    width: 56.3rpx;\r\n  height: 29.58rpx;\r\n  background-size: 100% 100%;\r\n  display: flex;\r\n  align-items: center;\r\n  margin-right: 10rpx;\r\n}\r\n.Genderfemale{\r\n    background: url(../../static/femaleimg.png) no-repeat center;\r\n    width: 56.3rpx;\r\n  height: 29.58rpx;\r\n  background-size: 100% 100%;\r\n  display: flex;\r\n  align-items: center;\r\n  margin-right: 10rpx;\r\n}\r\n.RoomID {\r\n  font-size: 23rpx;\r\n  color: #a3a3a3;\r\n  line-height: 38rpx;\r\n\r\n}\r\n.Charm {\r\n  font-size: 23rpx;\r\n  color: #a3a3a3;\r\n  line-height: 38rpx;\r\n  margin-right: 12rpx;\r\n  margin-left: 20rpx;\r\n}\r\n.charmValue {\r\n  font-size: 23rpx;\r\n  color: #161616;\r\n  line-height: 38rpx;\r\n  font-weight: 600;\r\n}\r\n</style>\r\n","import Component from 'D:/项目/tk-mini-program/components/contentList/contentList.vue'\nwx.createComponent(Component)"],"names":["uni","request"],"mappings":";;;;AA6BA,MAAK,YAAU;AAAA,EACb,OAAO;AACL,WAAO;AAAA,MACL,MAAM;AAAA;AAAA,MACN,MAAM;AAAA;AAAA,MACN,MAAM,CAAE;AAAA;AAAA;EAEX;AAAA,EACD,UAAU;AAER,SAAK,OAAO;AAAA,EACb;AAAA,EACD,SAAS;AAAA,IACP,SAAS,MAAM;AACbA,oBAAAA,MAAI,WAAW;AAAA,QACb,KAAK;AAAA,QACL,SAAS,SAAS,KAAK;AACrB,cAAI,aAAa,KAAK,cAAc;AAAA,YAClC;AAAA,UACA,CAAC;AAAA,QACJ;AAAA,OACF;AAAA,IACF;AAAA,IACF,MAAM,SAAQ;AACX,YAAM,MAAM,MAAMC,2BAAQ;AAAA,QACxB,KAAK;AAAA,QACL,QAAQ;AAAA,QACR,MAAM;AAAA,UACJ,QAAQ;AAAA,UACR,MAAM,KAAK;AAAA,UACX,MAAM,KAAK;AAAA,QACV;AAAA,QACD,UAAU;AAAA,MACd,CAAC;AACDD,oBAAAA,MAAY,MAAA,OAAA,gDAAA,GAAG;AACf,UAAI,IAAI,SAAS,KAAK;AACpB,aAAK,KAAK,KAAK,GAAG,IAAI,IAAI;AAC1BA,sBAAAA,MAAY,MAAA,OAAA,gDAAA,KAAK,IAAI;AAAA,MACvB;AAAA,IACD;AAAA,IACD,kBAAkB;AAChB,WAAK;AACL,WAAK,OAAM;AAAA,IACZ;AAAA,EACF;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACzEA,GAAG,gBAAgB,SAAS;"}
\ No newline at end of file
+{"version":3,"file":"contentList.js","sources":["components/contentList/contentList.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RDov6aG555uuL3RrLW1pbmktcHJvZ3JhbS9jb21wb25lbnRzL2NvbnRlbnRMaXN0L2NvbnRlbnRMaXN0LnZ1ZQ"],"sourcesContent":["<template>\r\n  <scroll-view scroll-y=\"true\" class=\"scroll\" lower-threshold=\"100\" @scrolltolower=\"onScrollToLower\" >\r\n    <uni-card  v-for=\"(item, index) in list\">\r\n      <view class=\"content-list\" @click=\"goDetail(item)\">\r\n      <!-- `````````````````````````` -->\r\n      <image class=\"headShot\" :src=\"item.anchorIcon\" mode=\"scaleToFill\" />\r\n      <!-- `````````````````````````````````````` -->\r\n      <view class=\"content-list-title\">\r\n        <view class=\"cardname\">{{ item.anchorId }}</view>\r\n        <view class=\"content-list-info\">\r\n          <view  :class=\"{Gendermale:item.sex === '1',Genderfemale:item.sex === '2'}\">\r\n            <image v-if=\"item.sex === '2'\"  class=\"Genderimg\" src=\"../../static/female.png\" mode=\"scaleToFill\" />\r\n            <image v-else class=\"Genderimg\" src=\"../../static/male.png\" mode=\"scaleToFill\" />\r\n            <view class=\"age\">{{ item.sex === '1'? \"男\" : \"女\" }}</view>\r\n          </view>\r\n          <view class=\"RoomID\">PK时间:&nbsp;{{formatDate(item.pkTime)}}</view>\r\n          <view class=\"Charm\">金币:</view>\r\n          <view class=\"charmValue\"> {{item.coin+'K'}}</view>\r\n        </view>\r\n      </view>\r\n      <!-- `````````````````````````````````````````````````````` -->\r\n      </view>\r\n    </uni-card>\r\n  </scroll-view>\r\n</template>\r\n\r\n<script>\r\nimport request from \"../../components/request.js\";\r\nimport formatDate from \"../../components/formatDate.js\";\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {\r\n      page: 0,//页码\r\n      size: 10, //每页条数\r\n      list: [],    // 列表数据\r\n    };\r\n  },\r\n  mounted() {\r\n    // 页面加载完成后请求数据\r\n    this.pkList()\r\n  },\r\n  methods: {\r\n    goDetail(item) {\r\n      uni.navigateTo({\r\n        url: '/pages/pkDetail/pkDetail',\r\n        success: function(res) {\r\n          res.eventChannel.emit('itemDetail', { \r\n            item: item,\r\n            });\r\n        },\r\n      })\r\n    },\r\n    formatDate: formatDate,\r\n   async pkList(){\r\n      const res = await request({\r\n        url: \"pk/pkList\",\r\n        method: \"GET\",\r\n        data: {\r\n          status: 0,\r\n          page: this.page,\r\n          size: this.size,\r\n          },\r\n          userInfo: false,\r\n      });\r\n      console.log(res);\r\n      if (res.code === 200) {\r\n        this.list.push(...res.data)\r\n        console.log(this.list)\r\n      }\r\n    },\r\n    onScrollToLower() {\r\n      this.page++;\r\n      this.pkList();\r\n    },\r\n  },\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n.scroll {\r\n  height: 90%;\r\n  display: flex;\r\n  flex-direction: column;\r\n  justify-content: center;\r\n  align-items: center;\r\n}\r\n.content-list {\r\n  display: flex;\r\n  align-items: center;\r\n  width: 712rpx;\r\n  height: 161rpx;\r\n  background: #ffffff;\r\n  border-radius: 15rpx;\r\n  margin-bottom: 12rpx;\r\n  margin-left: 20rpx;\r\n}\r\n.headShot {\r\n  width: 101rpx;\r\n  height: 101rpx;\r\n  border-radius: 50rpx;\r\n  margin-left: 30rpx;\r\n  margin-right: 33rpx;\r\n}\r\n.content-list-info {\r\n  display: flex;\r\n  align-items: center;\r\n}\r\n.cardname {\r\n  font-size: 31rpx;\r\n  color: #161616;\r\n  line-height: 38rpx;\r\n}\r\n.Genderimg {\r\n  width: 15rpx;\r\n  height: 15rpx;\r\n  margin-left: 10rpx;\r\n  margin-right: 10rpx;\r\n}\r\n.age {\r\n  color: #ffffff;\r\n  font-size: 14rpx;\r\n}\r\n\r\n.Gendermale{\r\n    background: url(../../static/maleimg.png) no-repeat center;\r\n    width: 56.3rpx;\r\n  height: 29.58rpx;\r\n  background-size: 100% 100%;\r\n  display: flex;\r\n  align-items: center;\r\n  margin-right: 10rpx;\r\n}\r\n.Genderfemale{\r\n    background: url(../../static/femaleimg.png) no-repeat center;\r\n    width: 56.3rpx;\r\n  height: 29.58rpx;\r\n  background-size: 100% 100%;\r\n  display: flex;\r\n  align-items: center;\r\n  margin-right: 10rpx;\r\n}\r\n.RoomID {\r\n  font-size: 23rpx;\r\n  color: #a3a3a3;\r\n  line-height: 38rpx;\r\n\r\n}\r\n.Charm {\r\n  font-size: 23rpx;\r\n  color: #a3a3a3;\r\n  line-height: 38rpx;\r\n  margin-right: 12rpx;\r\n  margin-left: 20rpx;\r\n}\r\n.charmValue {\r\n  font-size: 23rpx;\r\n  color: #161616;\r\n  line-height: 38rpx;\r\n  font-weight: 600;\r\n}\r\n</style>\r\n","import Component from 'D:/项目/tk-mini-program/components/contentList/contentList.vue'\nwx.createComponent(Component)"],"names":["uni","formatDate","request"],"mappings":";;;;;AA6BA,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;AAAA,MACL,MAAM;AAAA;AAAA,MACN,MAAM;AAAA;AAAA,MACN,MAAM,CAAE;AAAA;AAAA;EAEX;AAAA,EACD,UAAU;AAER,SAAK,OAAO;AAAA,EACb;AAAA,EACD,SAAS;AAAA,IACP,SAAS,MAAM;AACbA,oBAAAA,MAAI,WAAW;AAAA,QACb,KAAK;AAAA,QACL,SAAS,SAAS,KAAK;AACrB,cAAI,aAAa,KAAK,cAAc;AAAA,YAClC;AAAA,UACA,CAAC;AAAA,QACJ;AAAA,OACF;AAAA,IACF;AAAA,IACD,YAAYC,sBAAU;AAAA,IACvB,MAAM,SAAQ;AACX,YAAM,MAAM,MAAMC,2BAAQ;AAAA,QACxB,KAAK;AAAA,QACL,QAAQ;AAAA,QACR,MAAM;AAAA,UACJ,QAAQ;AAAA,UACR,MAAM,KAAK;AAAA,UACX,MAAM,KAAK;AAAA,QACV;AAAA,QACD,UAAU;AAAA,MACd,CAAC;AACDF,oBAAAA,MAAY,MAAA,OAAA,gDAAA,GAAG;AACf,UAAI,IAAI,SAAS,KAAK;AACpB,aAAK,KAAK,KAAK,GAAG,IAAI,IAAI;AAC1BA,sBAAAA,MAAY,MAAA,OAAA,gDAAA,KAAK,IAAI;AAAA,MACvB;AAAA,IACD;AAAA,IACD,kBAAkB;AAChB,WAAK;AACL,WAAK,OAAM;AAAA,IACZ;AAAA,EACF;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC3EA,GAAG,gBAAgB,SAAS;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/components/formatDate.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/components/formatDate.js.map
index b16dee9..f69ad90 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/formatDate.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/formatDate.js.map
@@ -1 +1 @@
-{"version":3,"file":"formatDate.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
\ No newline at end of file
+{"version":3,"file":"formatDate.js","sources":["components/formatDate.js"],"sourcesContent":["function formatDate(timestamp) {\r\n    const date = new Date(timestamp * 1000); // 秒级转毫秒级\r\n    const year = date.getFullYear();\r\n    const month = String(date.getMonth() + 1).padStart(2, '0');\r\n    const day = String(date.getDate()).padStart(2, '0');\r\n    const hour = String(date.getHours()).padStart(2, '0');\r\n    const minute = String(date.getMinutes()).padStart(2, '0');\r\n    const second = String(date.getSeconds()).padStart(2, '0');\r\n    \r\n    return `${year}-${month}-${day} ${hour}:${minute}:${second}`;\r\n  }\r\n  export default formatDate;"],"names":[],"mappings":";AAAA,SAAS,WAAW,WAAW;AAC3B,QAAM,OAAO,IAAI,KAAK,YAAY,GAAI;AACtC,QAAM,OAAO,KAAK;AAClB,QAAM,QAAQ,OAAO,KAAK,SAAQ,IAAK,CAAC,EAAE,SAAS,GAAG,GAAG;AACzD,QAAM,MAAM,OAAO,KAAK,QAAS,CAAA,EAAE,SAAS,GAAG,GAAG;AAClD,QAAM,OAAO,OAAO,KAAK,SAAU,CAAA,EAAE,SAAS,GAAG,GAAG;AACpD,QAAM,SAAS,OAAO,KAAK,WAAY,CAAA,EAAE,SAAS,GAAG,GAAG;AACxD,QAAM,SAAS,OAAO,KAAK,WAAY,CAAA,EAAE,SAAS,GAAG,GAAG;AAExD,SAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,IAAI,IAAI,MAAM,IAAI,MAAM;AAC9D;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/components/request.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/components/request.js.map
index d15787b..da623ef 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/components/request.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/components/request.js.map
@@ -1 +1 @@
-{"version":3,"file":"request.js","sources":["components/request.js"],"sourcesContent":["export default function request(urldata) {\r\n    const { url, data, method, header, userInfo } = urldata;\r\n    const baseUrl =\r\n        \"http://192.168.0.218:8086/\"\r\n        + url;\r\n    if (userInfo) {\r\n        return new Promise((resolve, reject) => {\r\n            uni.getStorage({\r\n                key: \"userinfo\",\r\n                success: (res) => {\r\n                    if (res.data) {\r\n                        if (res.data.nickName) {\r\n                            uni.request({\r\n                                url: baseUrl,\r\n                                data: data,\r\n                                method: method,\r\n                                header: header,\r\n                                success: function (res) {\r\n                                    console.log(\"请求成功1\", res.data);\r\n                                    resolve(res.data);\r\n                                },\r\n                                fail: function (res) {\r\n                                    reject(res);\r\n                                }\r\n                            });\r\n                        } else {\r\n                            this.$global.lastPage = uni.page.route;\r\n                            uni.reLaunch({ url: \"/pages/UserInformation/UserInformation\" })\r\n                        }\r\n                    } else {\r\n                        this.$global.lastPage = uni.page.route;\r\n                        uni.navigateTo({ url: '/pages/login/login' })\r\n                    }\r\n                },\r\n                fail: function (res) {\r\n                    reject(res);\r\n                }\r\n            });\r\n        });\r\n    } else {\r\n        return new Promise((resolve, reject) => {\r\n            uni.request({\r\n                url: baseUrl,\r\n                data: data,\r\n                method: method,\r\n                header: header,\r\n                success: function (res) {\r\n                    console.log(\"请求成功2\", res);\r\n                    resolve(res.data);\r\n                },\r\n                fail: function (res) {\r\n                    reject(res);\r\n                }\r\n            });\r\n        });\r\n    }\r\n\r\n}"],"names":["uni","res"],"mappings":";;AAAe,SAAS,QAAQ,SAAS;AACrC,QAAM,EAAE,KAAK,MAAM,QAAQ,QAAQ,SAAU,IAAG;AAChD,QAAM,UACF,+BACE;AACN,MAAI,UAAU;AACV,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACpCA,oBAAAA,MAAI,WAAW;AAAA,QACX,KAAK;AAAA,QACL,SAAS,CAAC,QAAQ;AACd,cAAI,IAAI,MAAM;AACV,gBAAI,IAAI,KAAK,UAAU;AACnBA,4BAAAA,MAAI,QAAQ;AAAA,gBACR,KAAK;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,SAAS,SAAUC,MAAK;AACpBD,gCAAA,MAAA,MAAA,OAAA,+BAAY,SAASC,KAAI,IAAI;AAC7B,0BAAQA,KAAI,IAAI;AAAA,gBACnB;AAAA,gBACD,MAAM,SAAUA,MAAK;AACjB,yBAAOA,IAAG;AAAA,gBACb;AAAA,cACjC,CAA6B;AAAA,YAC7B,OAA+B;AACH,mBAAK,QAAQ,WAAWD,cAAAA,MAAI,KAAK;AACjCA,4BAAAA,MAAI,SAAS,EAAE,KAAK,yCAAwC,CAAE;AAAA,YACjE;AAAA,UACzB,OAA2B;AACH,iBAAK,QAAQ,WAAWA,cAAAA,MAAI,KAAK;AACjCA,0BAAAA,MAAI,WAAW,EAAE,KAAK,qBAAoB,CAAE;AAAA,UAC/C;AAAA,QACJ;AAAA,QACD,MAAM,SAAU,KAAK;AACjB,iBAAO,GAAG;AAAA,QACb;AAAA,MACjB,CAAa;AAAA,IACb,CAAS;AAAA,EACT,OAAW;AACH,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACpCA,oBAAAA,MAAI,QAAQ;AAAA,QACR,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA,SAAS,SAAU,KAAK;AACpBA,wBAAY,MAAA,MAAA,OAAA,+BAAA,SAAS,GAAG;AACxB,kBAAQ,IAAI,IAAI;AAAA,QACnB;AAAA,QACD,MAAM,SAAU,KAAK;AACjB,iBAAO,GAAG;AAAA,QACb;AAAA,MACjB,CAAa;AAAA,IACb,CAAS;AAAA,EACJ;AAEL;;"}
\ No newline at end of file
+{"version":3,"file":"request.js","sources":["components/request.js"],"sourcesContent":["export default function request(urldata) {\r\n    const { url, data, method, header, userInfo } = urldata;\r\n    const baseUrl =\r\n        \"http://192.168.0.218:8086/\"\r\n        + url;\r\n    if (userInfo) {\r\n        return new Promise((resolve, reject) => {\r\n            uni.getStorage({\r\n                key: \"userinfo\",\r\n                success: (res) => {\r\n                    if (res.data) {\r\n                        if (res.data.nickName) {\r\n                            uni.request({\r\n                                url: baseUrl,\r\n                                data: data,\r\n                                method: method,\r\n                                header: header,\r\n                                success: function (res) {\r\n                                    console.log(\"请求成功1\", res.data);\r\n                                    resolve(res.data);\r\n                                },\r\n                                fail: function (res) {\r\n                                    reject(res);\r\n                                }\r\n                            });\r\n                        } else {\r\n                            uni.setStorageSync(\"lastPage\", getCurrentPages()[getCurrentPages().length - 1].route);\r\n                            uni.reLaunch({ url: \"/pages/UserInformation/UserInformation\" })\r\n                        }\r\n                    } else {\r\n                        uni.setStorageSync(\"lastPage\", getCurrentPages()[getCurrentPages().length - 1].route);\r\n                        uni.navigateTo({ url: '/pages/login/login' })\r\n                    }\r\n                },\r\n                fail: function (res) {\r\n                    uni.setStorageSync(\"lastPage\", getCurrentPages()[getCurrentPages().length - 1].route);\r\n                    uni.navigateTo({ url: '/pages/login/login' })\r\n                    reject(res);\r\n                }\r\n            });\r\n        });\r\n    } else {\r\n        return new Promise((resolve, reject) => {\r\n            uni.request({\r\n                url: baseUrl,\r\n                data: data,\r\n                method: method,\r\n                header: header,\r\n                success: function (res) {\r\n                    console.log(\"请求成功2\", res);\r\n                    resolve(res.data);\r\n                },\r\n                fail: function (res) {\r\n                    reject(res);\r\n                }\r\n            });\r\n        });\r\n    }\r\n\r\n}"],"names":["uni","res"],"mappings":";;AAAe,SAAS,QAAQ,SAAS;AACrC,QAAM,EAAE,KAAK,MAAM,QAAQ,QAAQ,SAAU,IAAG;AAChD,QAAM,UACF,+BACE;AACN,MAAI,UAAU;AACV,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACpCA,oBAAAA,MAAI,WAAW;AAAA,QACX,KAAK;AAAA,QACL,SAAS,CAAC,QAAQ;AACd,cAAI,IAAI,MAAM;AACV,gBAAI,IAAI,KAAK,UAAU;AACnBA,4BAAAA,MAAI,QAAQ;AAAA,gBACR,KAAK;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,SAAS,SAAUC,MAAK;AACpBD,gCAAA,MAAA,MAAA,OAAA,+BAAY,SAASC,KAAI,IAAI;AAC7B,0BAAQA,KAAI,IAAI;AAAA,gBACnB;AAAA,gBACD,MAAM,SAAUA,MAAK;AACjB,yBAAOA,IAAG;AAAA,gBACb;AAAA,cACjC,CAA6B;AAAA,YAC7B,OAA+B;AACHD,kCAAI,eAAe,YAAY,gBAAiB,EAAC,gBAAiB,EAAC,SAAS,CAAC,EAAE,KAAK;AACpFA,4BAAAA,MAAI,SAAS,EAAE,KAAK,yCAAwC,CAAE;AAAA,YACjE;AAAA,UACzB,OAA2B;AACHA,gCAAI,eAAe,YAAY,gBAAiB,EAAC,gBAAiB,EAAC,SAAS,CAAC,EAAE,KAAK;AACpFA,0BAAAA,MAAI,WAAW,EAAE,KAAK,qBAAoB,CAAE;AAAA,UAC/C;AAAA,QACJ;AAAA,QACD,MAAM,SAAU,KAAK;AACjBA,8BAAI,eAAe,YAAY,gBAAiB,EAAC,gBAAiB,EAAC,SAAS,CAAC,EAAE,KAAK;AACpFA,wBAAAA,MAAI,WAAW,EAAE,KAAK,qBAAoB,CAAE;AAC5C,iBAAO,GAAG;AAAA,QACb;AAAA,MACjB,CAAa;AAAA,IACb,CAAS;AAAA,EACT,OAAW;AACH,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACpCA,oBAAAA,MAAI,QAAQ;AAAA,QACR,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA,SAAS,SAAU,KAAK;AACpBA,wBAAY,MAAA,MAAA,OAAA,+BAAA,SAAS,GAAG;AACxB,kBAAQ,IAAI,IAAI;AAAA,QACnB;AAAA,QACD,MAAM,SAAU,KAAK;AACjB,iBAAO,GAAG;AAAA,QACb;AAAA,MACjB,CAAa;AAAA,IACb,CAAS;AAAA,EACJ;AAEL;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/Home/Home.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/Home/Home.js.map
index 5ee7a64..86ea5ee 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/Home/Home.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/Home/Home.js.map
@@ -1 +1 @@
-{"version":3,"file":"Home.js","sources":["pages/Home/Home.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvSG9tZS9Ib21lLnZ1ZQ"],"sourcesContent":["<template>\r\n  <view class=\"page\">\r\n    <image src=\"../../static/HomeBackground.png\" class=\"HomeBackground\"></image>\r\n  </view>\r\n  <view class=\"top-navigation-container\">\r\n    <top-navigation></top-navigation>\r\n  </view>\r\n  <view class=\"Advertisement\" @click=\"goAdvertisement\">\r\n    <advertisement></advertisement>\r\n  </view>\r\n  <view class=\"contentList\">\r\n    <contentList></contentList>\r\n  </view>\r\n  <view class=\"tabBar\">\r\n    <tabBar></tabBar>\r\n  </view>\r\n</template>\r\n\r\n<script>\r\nimport topNavigation from \"../../components/topNavigation/topNavigation\";\r\nimport Advertisement from \"../../components/Advertisement/Advertisement\";\r\nimport contentList from \"../../components/contentList/contentList\";\r\nimport tabBar from \"../../components/tabBar/tabBar\";\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {};\r\n  },\r\n  onLoad() {\r\n    // this.requestSomething();\r\n  },\r\n  methods: {\r\n    goAdvertisement(){\r\n      // this.$global.lastPage = getCurrentPages().router;\r\n      // uni.navigateTo({ url: '/pages/login/login' })\r\n    }\r\n  },\r\n  components: {\r\n    topNavigation,\r\n    Advertisement,\r\n    contentList,\r\n    tabBar,\r\n  },\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n.page {\r\n  position: relative;\r\n  width: 750rpx;\r\n  height: 1620rpx;\r\n}\r\n\r\n.HomeBackground {\r\n  position: absolute;\r\n  top: 0;\r\n  left: 0;\r\n  width: 100%;\r\n  height: 100%;\r\n  z-index: -1;\r\n}\r\n.top-navigation-container {\r\n  position: fixed;\r\n  top: 160rpx;\r\n  left: 0;\r\n  width: 100%;\r\n  height: 114.5rpx;\r\n}\r\n.Advertisement {\r\n  position: fixed;\r\n  top: 300rpx;\r\n  left: 0;\r\n  width: 100%;\r\n  height: 100rpx;\r\n  z-index: 100;\r\n}\r\n.contentList {\r\n  position: fixed;\r\n  top: 400rpx;\r\n  left: 0;\r\n  bottom: -30rpx;\r\n  width: 100%;\r\n  /* height: 1300rpx; */\r\n}\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/Home/Home.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;AAmBA,MAAO,gBAAe,MAAW;AACjC,MAAO,gBAAe,MAAW;AACjC,MAAO,cAAa,MAAW;AAC/B,eAAe,MAAW;AAC1B,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;EACR;AAAA,EACD,SAAS;AAAA,EAER;AAAA,EACD,SAAS;AAAA,IACP,kBAAiB;AAAA,IAGjB;AAAA,EACD;AAAA,EACD,YAAY;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACH;;;;;;;;;;;;;;;;;;;;AC1CA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"Home.js","sources":["pages/Home/Home.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvSG9tZS9Ib21lLnZ1ZQ"],"sourcesContent":["<template>\r\n  <view class=\"page\">\r\n    <image src=\"../../static/HomeBackground.png\" class=\"HomeBackground\"></image>\r\n  </view>\r\n  <view class=\"top-navigation-container\">\r\n    <top-navigation></top-navigation>\r\n  </view>\r\n  <view class=\"Advertisement\" @click=\"goAdvertisement\">\r\n    <advertisement></advertisement>\r\n  </view>\r\n  <view class=\"contentList\">\r\n    <contentList></contentList>\r\n  </view>\r\n  <view class=\"tabBar\">\r\n    <tabBar></tabBar>\r\n  </view>\r\n</template>\r\n\r\n<script>\r\nimport topNavigation from \"../../components/topNavigation/topNavigation\";\r\nimport Advertisement from \"../../components/Advertisement/Advertisement\";\r\nimport contentList from \"../../components/contentList/contentList\";\r\nimport tabBar from \"../../components/tabBar/tabBar\";\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {};\r\n  },\r\n  onLoad() {\r\n    // this.requestSomething();\r\n  },\r\n  methods: {\r\n    goAdvertisement(){\r\n      // this.$global.lastPage = getCurrentPages().router;\r\n      uni.navigateTo({ url: '/pages/pkDetail/pkDetail' })\r\n    }\r\n  },\r\n  components: {\r\n    topNavigation,\r\n    Advertisement,\r\n    contentList,\r\n    tabBar,\r\n  },\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n.page {\r\n  position: relative;\r\n  width: 750rpx;\r\n  height: 1620rpx;\r\n}\r\n\r\n.HomeBackground {\r\n  position: absolute;\r\n  top: 0;\r\n  left: 0;\r\n  width: 100%;\r\n  height: 100%;\r\n  z-index: -1;\r\n}\r\n.top-navigation-container {\r\n  position: fixed;\r\n  top: 160rpx;\r\n  left: 0;\r\n  width: 100%;\r\n  height: 114.5rpx;\r\n}\r\n.Advertisement {\r\n  position: fixed;\r\n  top: 300rpx;\r\n  left: 0;\r\n  width: 100%;\r\n  height: 100rpx;\r\n  z-index: 100;\r\n}\r\n.contentList {\r\n  position: fixed;\r\n  top: 400rpx;\r\n  left: 0;\r\n  bottom: -30rpx;\r\n  width: 100%;\r\n  /* height: 1300rpx; */\r\n}\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/Home/Home.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni"],"mappings":";;;AAmBA,MAAO,gBAAe,MAAW;AACjC,MAAO,gBAAe,MAAW;AACjC,MAAO,cAAa,MAAW;AAC/B,eAAe,MAAW;AAC1B,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;EACR;AAAA,EACD,SAAS;AAAA,EAER;AAAA,EACD,SAAS;AAAA,IACP,kBAAiB;AAEfA,oBAAAA,MAAI,WAAW,EAAE,KAAK,2BAAyB,CAAG;AAAA,IACpD;AAAA,EACD;AAAA,EACD,YAAY;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACH;;;;;;;;;;;;;;;;;;;;AC1CA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/UserInformation/UserInformation.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/UserInformation/UserInformation.js.map
index a312f86..8df00bc 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/UserInformation/UserInformation.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/UserInformation/UserInformation.js.map
@@ -1 +1 @@
-{"version":3,"file":"UserInformation.js","sources":["pages/UserInformation/UserInformation.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvVXNlckluZm9ybWF0aW9uL1VzZXJJbmZvcm1hdGlvbi52dWU"],"sourcesContent":["<template>\r\n  <view class=\"container\">\r\n    <button class=\"login-btn\" open-type=\"chooseAvatar\" @chooseavatar=\"Userinfo\">\r\n      <image class=\"avatar\" :src=\"userinfo\"></image>\r\n    </button>\r\n    <input\r\n      type=\"nickname\"\r\n      class=\"weui-input\"\r\n      placeholder=\"请输入昵称\"\r\n      @blur=\"inputName\"\r\n    />\r\n    <button class=\"weui-btn\" @click=\"wxLogin\">登录</button>\r\n  </view>\r\n</template>\r\n\r\n<script>\r\nimport request from \"../../components/request.js\";\r\nimport postFile  from \"../../components/postFile.js\";\r\nimport generateFileName  from \"../../components/generateFileName.js\";\r\n\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {\r\n      userinfo:\r\n        \"https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0\",\r\n      name: \"\",\r\n      id: \"\",\r\n      info: {},\r\n      userSig: \"\",\r\n    };\r\n  },\r\n  onLoad(option) {\r\n    uni.getStorage({\r\n      key: \"userinfo\",\r\n      success: (res) => {\r\n        this.id = res.data.id;\r\n      },\r\n    });\r\n    uni.getStorage({\r\n      key: \"userSig\",\r\n      success: (res) => {\r\n        this.userSig = res.data;\r\n      },\r\n    });\r\n    // const { info } = option;\r\n    // this.id = JSON.parse(info).id\r\n  },\r\n  methods: {\r\n    // 输入昵称\r\n    inputName(e) {\r\n      this.name = e.detail.value;\r\n    },\r\n    // 选择头像\r\n    async Userinfo(e) {\r\n      const { avatarUrl } = e.detail;\r\n      this.userinfo = avatarUrl;\r\n    },\r\n    // 微信登录\r\n    async wxLogin(e) {\r\n      uni.showLoading({\r\n        title: \"登录中...\",\r\n        mask: true,\r\n      });\r\n        const { code } = await uni.login({\r\n          provider: \"weixin\",\r\n          onlyAuthorize: true,\r\n        });\r\n\r\n        postFile({\r\n          path: this.userinfo,\r\n          name:generateFileName(),\r\n        }).then((res) => {\r\n          this.userinfo = res;\r\n        }).catch((err) => {\r\n          console.log(err);\r\n        });\r\n        \r\n        if (this.userinfo) {\r\n          const res = await request({\r\n          url: \"user/inputUserInfo\",\r\n          method: \"POST\",\r\n          data: {\r\n            id: this.id,\r\n            headerIcon: this.userinfo,\r\n            nickName: this.name,\r\n            code,\r\n            usersig: this.userSig.userSig,\r\n          },\r\n          userInfo: false,\r\n        });\r\n        if (res.code === 200) {\r\n          uni.showToast({\r\n            title: \"登录成功\",\r\n            icon: \"success\",\r\n          });\r\n          uni.setStorageSync(\"userinfo\", res.data.info);\r\n          uni.hideLoading();\r\n\r\n          //```````````````````````````````````````````````````````````````````````登录成功后跳转回原页面 或 首页\r\n          uni.reLaunch({\r\n            url: this.$global.lastPage || \"/pages/Home/Home\", // 默认页\r\n          });\r\n          //````````````````````````````````````````````````````````````````````\r\n        } else {\r\n          uni.showToast({\r\n            title: \"登录失败\",\r\n            icon: \"none\",\r\n          });\r\n        }\r\n        }else{\r\n          uni.showToast({\r\n            title: \"上传失败\",\r\n            icon: \"none\",\r\n          });\r\n        }\r\n       \r\n\r\n        \r\n    },\r\n  },\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n.container {\r\n  width: 100%;\r\n  height: 100%;\r\n  display: flex;\r\n  flex-direction: column;\r\n  justify-content: center;\r\n  align-items: center;\r\n  background: linear-gradient(to bottom, #11cb2a6e, #2574fc6d);\r\n}\r\n.login-btn {\r\n  width: 200rpx;\r\n  height: 200rpx;\r\n  border-radius: 50%;\r\n  padding: 0px;\r\n  margin-bottom: 60rpx;\r\n}\r\n.avatar {\r\n  width: 100%;\r\n  height: 100%;\r\n  border-radius: 50%;\r\n}\r\n.weui-input {\r\n  width: 80%;\r\n  text-align: center;\r\n  margin-bottom: 40rpx;\r\n}\r\n.weui-btn {\r\n  width: 40%;\r\n  margin-top: 20rpx;\r\n  background-color: #11cb2a00;\r\n  color: #fff;\r\n}\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/UserInformation/UserInformation.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","postFile","generateFileName","request"],"mappings":";;;;;AAoBA,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;AAAA,MACL,UACE;AAAA,MACF,MAAM;AAAA,MACN,IAAI;AAAA,MACJ,MAAM,CAAE;AAAA,MACR,SAAS;AAAA;EAEZ;AAAA,EACD,OAAO,QAAQ;AACbA,kBAAAA,MAAI,WAAW;AAAA,MACb,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AAChB,aAAK,KAAK,IAAI,KAAK;AAAA,MACpB;AAAA,IACH,CAAC;AACDA,kBAAAA,MAAI,WAAW;AAAA,MACb,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AAChB,aAAK,UAAU,IAAI;AAAA,MACpB;AAAA,IACH,CAAC;AAAA,EAGF;AAAA,EACD,SAAS;AAAA;AAAA,IAEP,UAAU,GAAG;AACX,WAAK,OAAO,EAAE,OAAO;AAAA,IACtB;AAAA;AAAA,IAED,MAAM,SAAS,GAAG;AAChB,YAAM,EAAE,UAAQ,IAAM,EAAE;AACxB,WAAK,WAAW;AAAA,IACjB;AAAA;AAAA,IAED,MAAM,QAAQ,GAAG;AACfA,oBAAAA,MAAI,YAAY;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,MACR,CAAC;AACC,YAAM,EAAE,KAAK,IAAI,MAAMA,cAAAA,MAAI,MAAM;AAAA,QAC/B,UAAU;AAAA,QACV,eAAe;AAAA,MACjB,CAAC;AAEDC,qCAAS;AAAA,QACP,MAAM,KAAK;AAAA,QACX,MAAKC,4BAAAA,iBAAkB;AAAA,MACzB,CAAC,EAAE,KAAK,CAAC,QAAQ;AACf,aAAK,WAAW;AAAA,MAClB,CAAC,EAAE,MAAM,CAAC,QAAQ;AAChBF,sBAAAA,sEAAY,GAAG;AAAA,MACjB,CAAC;AAED,UAAI,KAAK,UAAU;AACjB,cAAM,MAAM,MAAMG,2BAAQ;AAAA,UAC1B,KAAK;AAAA,UACL,QAAQ;AAAA,UACR,MAAM;AAAA,YACJ,IAAI,KAAK;AAAA,YACT,YAAY,KAAK;AAAA,YACjB,UAAU,KAAK;AAAA,YACf;AAAA,YACA,SAAS,KAAK,QAAQ;AAAA,UACvB;AAAA,UACD,UAAU;AAAA,QACZ,CAAC;AACD,YAAI,IAAI,SAAS,KAAK;AACpBH,wBAAAA,MAAI,UAAU;AAAA,YACZ,OAAO;AAAA,YACP,MAAM;AAAA,UACR,CAAC;AACDA,wBAAG,MAAC,eAAe,YAAY,IAAI,KAAK,IAAI;AAC5CA,wBAAG,MAAC,YAAW;AAGfA,wBAAAA,MAAI,SAAS;AAAA,YACX,KAAK,KAAK,QAAQ,YAAY;AAAA;AAAA,UAChC,CAAC;AAAA,eAEI;AACLA,wBAAAA,MAAI,UAAU;AAAA,YACZ,OAAO;AAAA,YACP,MAAM;AAAA,UACR,CAAC;AAAA,QACH;AAAA,aACK;AACHA,sBAAAA,MAAI,UAAU;AAAA,UACZ,OAAO;AAAA,UACP,MAAM;AAAA,QACR,CAAC;AAAA,MACH;AAAA,IAIH;AAAA,EACF;AACH;;;;;;;;;;ACxHA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"UserInformation.js","sources":["pages/UserInformation/UserInformation.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvVXNlckluZm9ybWF0aW9uL1VzZXJJbmZvcm1hdGlvbi52dWU"],"sourcesContent":["<template>\r\n  <view class=\"container\">\r\n    <button class=\"login-btn\" open-type=\"chooseAvatar\" @chooseavatar=\"Userinfo\">\r\n      <image class=\"avatar\" :src=\"userinfo\"></image>\r\n    </button>\r\n    <input\r\n      type=\"nickname\"\r\n      class=\"weui-input\"\r\n      placeholder=\"请输入昵称\"\r\n      @blur=\"inputName\"\r\n    />\r\n    <button class=\"weui-btn\" @click=\"wxLogin\">登录</button>\r\n  </view>\r\n</template>\r\n\r\n<script>\r\nimport request from \"../../components/request.js\";\r\nimport postFile  from \"../../components/postFile.js\";\r\nimport generateFileName  from \"../../components/generateFileName.js\";\r\n\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {\r\n      userinfo:\r\n        \"https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0\",\r\n      name: \"\",\r\n      id: \"\",\r\n      info: {},\r\n      userSig: \"\",\r\n      lastPage: \"\",\r\n    };\r\n  },\r\n  onLoad(option) {\r\n    uni.getStorage({\r\n      key: \"userinfo\",\r\n      success: (res) => {\r\n        this.id = res.data.id;\r\n      },\r\n    });\r\n    uni.getStorage({\r\n      key: \"userSig\",\r\n      success: (res) => {\r\n        this.userSig = res.data;\r\n      },\r\n    });\r\n    uni.getStorage({\r\n      key: \"lastPage\",\r\n      success: (res) => {\r\n        this.lastPage = \"/\"+res.data;\r\n      },\r\n      fail: () => {\r\n        this.lastPage = \"/pages/Home/Home\";\r\n      },\r\n    })\r\n    // const { info } = option;\r\n    // this.id = JSON.parse(info).id\r\n  },\r\n  methods: {\r\n    // 输入昵称\r\n    inputName(e) {\r\n      this.name = e.detail.value;\r\n    },\r\n    // 选择头像\r\n    async Userinfo(e) {\r\n      const { avatarUrl } = e.detail;\r\n      this.userinfo = avatarUrl;\r\n    },\r\n    // 微信登录\r\n    async wxLogin(e) {\r\n      uni.showLoading({\r\n        title: \"登录中...\",\r\n        mask: true,\r\n      });\r\n        const { code } = await uni.login({\r\n          provider: \"weixin\",\r\n          onlyAuthorize: true,\r\n        });\r\n\r\n        postFile({\r\n          path: this.userinfo,\r\n          name:generateFileName(),\r\n        }).then((res) => {\r\n          this.userinfo = res;\r\n        }).catch((err) => {\r\n          console.log(err);\r\n        });\r\n        \r\n        if (this.userinfo) {\r\n          const res = await request({\r\n          url: \"user/inputUserInfo\",\r\n          method: \"POST\",\r\n          data: {\r\n            id: this.id,\r\n            headerIcon: this.userinfo,\r\n            nickName: this.name,\r\n            code,\r\n            usersig: this.userSig.userSig,\r\n          },\r\n          userInfo: false,\r\n        });\r\n        if (res.code === 200) {\r\n          uni.showToast({\r\n            title: \"登录成功\",\r\n            icon: \"success\",\r\n          });\r\n          uni.setStorageSync(\"userinfo\", res.data.info);\r\n          uni.hideLoading();\r\n\r\n          //```````````````````````````````````````````````````````````````````````登录成功后跳转回原页面 或 首页\r\n          uni.reLaunch({\r\n            url: this.lastPage, \r\n          });\r\n          //````````````````````````````````````````````````````````````````````\r\n        } else {\r\n          uni.showToast({\r\n            title: \"登录失败\",\r\n            icon: \"none\",\r\n          });\r\n        }\r\n        }else{\r\n          uni.showToast({\r\n            title: \"上传失败\",\r\n            icon: \"none\",\r\n          });\r\n        }\r\n       \r\n\r\n        \r\n    },\r\n  },\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n.container {\r\n  width: 100%;\r\n  height: 100%;\r\n  display: flex;\r\n  flex-direction: column;\r\n  justify-content: center;\r\n  align-items: center;\r\n  background: linear-gradient(to bottom, #11cb2a6e, #2574fc6d);\r\n}\r\n.login-btn {\r\n  width: 200rpx;\r\n  height: 200rpx;\r\n  border-radius: 50%;\r\n  padding: 0px;\r\n  margin-bottom: 60rpx;\r\n}\r\n.avatar {\r\n  width: 100%;\r\n  height: 100%;\r\n  border-radius: 50%;\r\n}\r\n.weui-input {\r\n  width: 80%;\r\n  text-align: center;\r\n  margin-bottom: 40rpx;\r\n}\r\n.weui-btn {\r\n  width: 40%;\r\n  margin-top: 20rpx;\r\n  background-color: #11cb2a00;\r\n  color: #fff;\r\n}\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/UserInformation/UserInformation.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","postFile","generateFileName","request"],"mappings":";;;;;AAoBA,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;AAAA,MACL,UACE;AAAA,MACF,MAAM;AAAA,MACN,IAAI;AAAA,MACJ,MAAM,CAAE;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA;EAEb;AAAA,EACD,OAAO,QAAQ;AACbA,kBAAAA,MAAI,WAAW;AAAA,MACb,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AAChB,aAAK,KAAK,IAAI,KAAK;AAAA,MACpB;AAAA,IACH,CAAC;AACDA,kBAAAA,MAAI,WAAW;AAAA,MACb,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AAChB,aAAK,UAAU,IAAI;AAAA,MACpB;AAAA,IACH,CAAC;AACDA,kBAAAA,MAAI,WAAW;AAAA,MACb,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AAChB,aAAK,WAAW,MAAI,IAAI;AAAA,MACzB;AAAA,MACD,MAAM,MAAM;AACV,aAAK,WAAW;AAAA,MACjB;AAAA,KACF;AAAA,EAGF;AAAA,EACD,SAAS;AAAA;AAAA,IAEP,UAAU,GAAG;AACX,WAAK,OAAO,EAAE,OAAO;AAAA,IACtB;AAAA;AAAA,IAED,MAAM,SAAS,GAAG;AAChB,YAAM,EAAE,UAAQ,IAAM,EAAE;AACxB,WAAK,WAAW;AAAA,IACjB;AAAA;AAAA,IAED,MAAM,QAAQ,GAAG;AACfA,oBAAAA,MAAI,YAAY;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,MACR,CAAC;AACC,YAAM,EAAE,KAAK,IAAI,MAAMA,cAAAA,MAAI,MAAM;AAAA,QAC/B,UAAU;AAAA,QACV,eAAe;AAAA,MACjB,CAAC;AAEDC,qCAAS;AAAA,QACP,MAAM,KAAK;AAAA,QACX,MAAKC,4BAAAA,iBAAkB;AAAA,MACzB,CAAC,EAAE,KAAK,CAAC,QAAQ;AACf,aAAK,WAAW;AAAA,MAClB,CAAC,EAAE,MAAM,CAAC,QAAQ;AAChBF,sBAAAA,sEAAY,GAAG;AAAA,MACjB,CAAC;AAED,UAAI,KAAK,UAAU;AACjB,cAAM,MAAM,MAAMG,2BAAQ;AAAA,UAC1B,KAAK;AAAA,UACL,QAAQ;AAAA,UACR,MAAM;AAAA,YACJ,IAAI,KAAK;AAAA,YACT,YAAY,KAAK;AAAA,YACjB,UAAU,KAAK;AAAA,YACf;AAAA,YACA,SAAS,KAAK,QAAQ;AAAA,UACvB;AAAA,UACD,UAAU;AAAA,QACZ,CAAC;AACD,YAAI,IAAI,SAAS,KAAK;AACpBH,wBAAAA,MAAI,UAAU;AAAA,YACZ,OAAO;AAAA,YACP,MAAM;AAAA,UACR,CAAC;AACDA,wBAAG,MAAC,eAAe,YAAY,IAAI,KAAK,IAAI;AAC5CA,wBAAG,MAAC,YAAW;AAGfA,wBAAAA,MAAI,SAAS;AAAA,YACX,KAAK,KAAK;AAAA,UACZ,CAAC;AAAA,eAEI;AACLA,wBAAAA,MAAI,UAAU;AAAA,YACZ,OAAO;AAAA,YACP,MAAM;AAAA,UACR,CAAC;AAAA,QACH;AAAA,aACK;AACHA,sBAAAA,MAAI,UAAU;AAAA,UACZ,OAAO;AAAA,UACP,MAAM;AAAA,QACR,CAAC;AAAA,MACH;AAAA,IAIH;AAAA,EACF;AACH;;;;;;;;;;AClIA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
index ffbf56d..6ba36a5 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
@@ -1 +1 @@
-{"version":3,"file":"login.js","sources":["pages/login/login.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvbG9naW4vbG9naW4udnVl"],"sourcesContent":["<template>\r\n  <view class=\"container\">\r\n    <image class=\"logo\" :src=\"userInfo.avatarUrl\"></image>\r\n    <view class=\"nickname\"> {{ userInfo.nickName }}</view>\r\n    <button class=\"login-btn\" open-type=\"getPhoneNumber\" @getphonenumber=\"getPhoneNumber\">\r\n      使用微信登录\r\n    </button>\r\n  </view>\r\n</template>\r\n\r\n<script>\r\nimport request from \"../../components/request.js\";\r\nimport  genTestUserSig  from \"../../components/debug/GenerateTestUserSig.js\";\r\nimport TUIlogin from \"../../components/TUILogin.js\";\r\n// const  genTestUserSig  = require('../../components/debug/GenerateTestUserSig.js');\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {\r\n      userInfo: {},\r\n      info: {},\r\n      userSig: \"\",\r\n    };\r\n  },\r\n  onLoad() {\r\n    uni.getUserInfo({\r\n      provider: \"weixin\",\r\n      success: (res) => {\r\n        this.userInfo = res.userInfo;\r\n      },\r\n    });\r\n  },\r\n  methods: {\r\n    // 获取手机号\r\n    async getPhoneNumber(e) {\r\n      uni.showLoading({\r\n        title: \"登录中...\",\r\n        mask: true,\r\n      });\r\n        const res = await request({\r\n          url: \"user/loginWithPhoneNumber\",\r\n          method: \"POST\",\r\n          data: {\r\n            code: e.detail.code,\r\n          },\r\n          userInfo: false,\r\n        });\r\n        this.info = res;\r\n        const sdkAppID = Number(this.info.data.chatInfo.appId);\r\n            const userID =\"administrator\";\r\n            this.userSig = genTestUserSig({\r\n              SDKAPPID : sdkAppID,\r\n              SECRETKEY:this.info.data.chatInfo.appKey,\r\n              userID: userID,\r\n            })\r\n            uni.setStorageSync(\"chatInfo\", this.info.data.chatInfo)\r\n            uni.setStorageSync(\"userSig\", this.userSig)\r\n            uni.setStorageSync(\"userinfo\", this.info.data.info);\r\n        if (this.info.code === 200) {\r\n          if (this.info.data.newAccount) {\r\n            uni.reLaunch({\r\n              url: \"/pages/UserInformation/UserInformation\",\r\n            });\r\n          } else {\r\n            uni.setStorageSync(\"userinfo\", this.info.data.info);\r\n            uni.hideLoading();\r\n            TUIlogin(this.info.data.chatInfo.appId, this.info.data.info.id,this.userSig.userSig)\r\n            //跳转原来页面否则首页\r\n            uni.reLaunch({\r\n            url: this.$global.lastPage || \"/pages/Home/Home\", // 默认页\r\n          });\r\n          }\r\n        } else {\r\n          uni.showToast({\r\n            title: \"登录失败\",\r\n            icon: \"none\",\r\n          });\r\n        }\r\n    },\r\n  },\r\n};\r\n</script>\r\n\r\n<style>\r\n.container {\r\n  width: 100%;\r\n  height: 100%;\r\n  display: flex;\r\n  flex-direction: column;\r\n  justify-content: center;\r\n  align-items: center;\r\n  background: linear-gradient(to bottom, #11cb2a6e, #2574fc6d);\r\n}\r\n\r\n.logo {\r\n  width: 200rpx;\r\n  height: 200rpx;\r\n  border-radius: 50%;\r\n}\r\n.nickname {\r\n  width: 300rpx;\r\n  height: 100rpx;\r\n  color: rgb(255, 255, 255);\r\n  border-radius: 0px;\r\n  padding: 20rpx 40rpx;\r\n  font-size: 30rpx;\r\n  text-align: center;\r\n  line-height: 100rpx;\r\n}\r\n.login-btn {\r\n  background-color: hsla(0, 0%, 100%, 0);\r\n  border: 1px solid #00ff0000;\r\n  color: #ffffff;\r\n}\r\n\r\n.tips {\r\n  color: #666;\r\n  font-size: 24rpx;\r\n  margin-top: 40rpx;\r\n}\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/login/login.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","request","genTestUserSig","TUIlogin"],"mappings":";;;;;AAeA,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;AAAA,MACL,UAAU,CAAE;AAAA,MACZ,MAAM,CAAE;AAAA,MACR,SAAS;AAAA;EAEZ;AAAA,EACD,SAAS;AACPA,kBAAAA,MAAI,YAAY;AAAA,MACd,UAAU;AAAA,MACV,SAAS,CAAC,QAAQ;AAChB,aAAK,WAAW,IAAI;AAAA,MACrB;AAAA,IACH,CAAC;AAAA,EACF;AAAA,EACD,SAAS;AAAA;AAAA,IAEP,MAAM,eAAe,GAAG;AACtBA,oBAAAA,MAAI,YAAY;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,MACR,CAAC;AACC,YAAM,MAAM,MAAMC,2BAAQ;AAAA,QACxB,KAAK;AAAA,QACL,QAAQ;AAAA,QACR,MAAM;AAAA,UACJ,MAAM,EAAE,OAAO;AAAA,QAChB;AAAA,QACD,UAAU;AAAA,MACZ,CAAC;AACD,WAAK,OAAO;AACZ,YAAM,WAAW,OAAO,KAAK,KAAK,KAAK,SAAS,KAAK;AACjD,YAAM,SAAQ;AACd,WAAK,UAAUC,oDAAe;AAAA,QAC5B,UAAW;AAAA,QACX,WAAU,KAAK,KAAK,KAAK,SAAS;AAAA,QAClC;AAAA,OACD;AACDF,oBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,QAAQ;AACtDA,oBAAAA,MAAI,eAAe,WAAW,KAAK,OAAO;AAC1CA,oBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,IAAI;AACtD,UAAI,KAAK,KAAK,SAAS,KAAK;AAC1B,YAAI,KAAK,KAAK,KAAK,YAAY;AAC7BA,wBAAAA,MAAI,SAAS;AAAA,YACX,KAAK;AAAA,UACP,CAAC;AAAA,eACI;AACLA,wBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,IAAI;AAClDA,wBAAG,MAAC,YAAW;AACfG,8BAAAA,SAAS,KAAK,KAAK,KAAK,SAAS,OAAO,KAAK,KAAK,KAAK,KAAK,IAAG,KAAK,QAAQ,OAAO;AAEnFH,wBAAAA,MAAI,SAAS;AAAA,YACb,KAAK,KAAK,QAAQ,YAAY;AAAA;AAAA,UAChC,CAAC;AAAA,QACD;AAAA,aACK;AACLA,sBAAAA,MAAI,UAAU;AAAA,UACZ,OAAO;AAAA,UACP,MAAM;AAAA,QACR,CAAC;AAAA,MACH;AAAA,IACH;AAAA,EACF;AACH;;;;;;;;;AC/EA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"login.js","sources":["pages/login/login.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvbG9naW4vbG9naW4udnVl"],"sourcesContent":["<template>\r\n  <view class=\"container\">\r\n    <image class=\"logo\" :src=\"userInfo.avatarUrl\"></image>\r\n    <view class=\"nickname\"> {{ userInfo.nickName }}</view>\r\n    <button class=\"login-btn\" open-type=\"getPhoneNumber\" @getphonenumber=\"getPhoneNumber\">\r\n      使用微信登录\r\n    </button>\r\n  </view>\r\n</template>\r\n\r\n<script>\r\nimport request from \"../../components/request.js\";\r\nimport  genTestUserSig  from \"../../components/debug/GenerateTestUserSig.js\";\r\nimport TUIlogin from \"../../components/TUILogin.js\";\r\n// const  genTestUserSig  = require('../../components/debug/GenerateTestUserSig.js');\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {\r\n      userInfo: {},\r\n      info: {},\r\n      userSig: \"\",\r\n      lastPage: \"\",\r\n    };\r\n  },\r\n  onLoad() {\r\n    uni.getUserInfo({\r\n      provider: \"weixin\",\r\n      success: (res) => {\r\n        this.userInfo = res.userInfo;\r\n      },\r\n    });\r\n    uni.getStorage({\r\n      key: \"lastPage\",\r\n      success: (res) => {\r\n        this.lastPage = \"/\"+res.data;\r\n        console.log(this.lastPage);\r\n      },\r\n      fail: () => {\r\n        this.lastPage = \"/pages/Home/Home\";\r\n      },\r\n    })\r\n  },\r\n  \r\n  methods: {\r\n    // 获取手机号\r\n    async getPhoneNumber(e) {\r\n      uni.showLoading({\r\n        title: \"登录中...\",\r\n        mask: true,\r\n      });\r\n        const res = await request({\r\n          url: \"user/loginWithPhoneNumber\",\r\n          method: \"POST\",\r\n          data: {\r\n            code: e.detail.code,\r\n          },\r\n          userInfo: false,\r\n        });\r\n        this.info = res;\r\n        const sdkAppID = Number(this.info.data.chatInfo.appId);\r\n            const userID =\"administrator\";\r\n            this.userSig = genTestUserSig({\r\n              SDKAPPID : sdkAppID,\r\n              SECRETKEY:this.info.data.chatInfo.appKey,\r\n              userID: userID,\r\n            })\r\n            uni.setStorageSync(\"chatInfo\", this.info.data.chatInfo)\r\n            uni.setStorageSync(\"userSig\", this.userSig)\r\n            uni.setStorageSync(\"userinfo\", this.info.data.info);\r\n        if (this.info.code === 200) {\r\n          if (this.info.data.newAccount) {\r\n            uni.reLaunch({\r\n              url: \"/pages/UserInformation/UserInformation\",\r\n            });\r\n          } else {\r\n            uni.setStorageSync(\"userinfo\", this.info.data.info);\r\n            uni.hideLoading();\r\n            TUIlogin(this.info.data.chatInfo.appId, this.info.data.info.id,this.userSig.userSig)\r\n            //跳转原来页面否则首页\r\n            console.log(\"跳的地址\", this.lastPage);\r\n            uni.reLaunch({\r\n            url: this.lastPage, \r\n          });\r\n          }\r\n        } else {\r\n          uni.showToast({\r\n            title: \"登录失败\",\r\n            icon: \"none\",\r\n          });\r\n        }\r\n    },\r\n  },\r\n};\r\n</script>\r\n\r\n<style>\r\n.container {\r\n  width: 100%;\r\n  height: 100%;\r\n  display: flex;\r\n  flex-direction: column;\r\n  justify-content: center;\r\n  align-items: center;\r\n  background: linear-gradient(to bottom, #11cb2a6e, #2574fc6d);\r\n}\r\n\r\n.logo {\r\n  width: 200rpx;\r\n  height: 200rpx;\r\n  border-radius: 50%;\r\n}\r\n.nickname {\r\n  width: 300rpx;\r\n  height: 100rpx;\r\n  color: rgb(255, 255, 255);\r\n  border-radius: 0px;\r\n  padding: 20rpx 40rpx;\r\n  font-size: 30rpx;\r\n  text-align: center;\r\n  line-height: 100rpx;\r\n}\r\n.login-btn {\r\n  background-color: hsla(0, 0%, 100%, 0);\r\n  border: 1px solid #00ff0000;\r\n  color: #ffffff;\r\n}\r\n\r\n.tips {\r\n  color: #666;\r\n  font-size: 24rpx;\r\n  margin-top: 40rpx;\r\n}\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/login/login.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","request","genTestUserSig","TUIlogin"],"mappings":";;;;;AAeA,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;AAAA,MACL,UAAU,CAAE;AAAA,MACZ,MAAM,CAAE;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA;EAEb;AAAA,EACD,SAAS;AACPA,kBAAAA,MAAI,YAAY;AAAA,MACd,UAAU;AAAA,MACV,SAAS,CAAC,QAAQ;AAChB,aAAK,WAAW,IAAI;AAAA,MACrB;AAAA,IACH,CAAC;AACDA,kBAAAA,MAAI,WAAW;AAAA,MACb,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AAChB,aAAK,WAAW,MAAI,IAAI;AACxBA,sBAAY,MAAA,MAAA,OAAA,+BAAA,KAAK,QAAQ;AAAA,MAC1B;AAAA,MACD,MAAM,MAAM;AACV,aAAK,WAAW;AAAA,MACjB;AAAA,KACF;AAAA,EACF;AAAA,EAED,SAAS;AAAA;AAAA,IAEP,MAAM,eAAe,GAAG;AACtBA,oBAAAA,MAAI,YAAY;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,MACR,CAAC;AACC,YAAM,MAAM,MAAMC,2BAAQ;AAAA,QACxB,KAAK;AAAA,QACL,QAAQ;AAAA,QACR,MAAM;AAAA,UACJ,MAAM,EAAE,OAAO;AAAA,QAChB;AAAA,QACD,UAAU;AAAA,MACZ,CAAC;AACD,WAAK,OAAO;AACZ,YAAM,WAAW,OAAO,KAAK,KAAK,KAAK,SAAS,KAAK;AACjD,YAAM,SAAQ;AACd,WAAK,UAAUC,oDAAe;AAAA,QAC5B,UAAW;AAAA,QACX,WAAU,KAAK,KAAK,KAAK,SAAS;AAAA,QAClC;AAAA,OACD;AACDF,oBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,QAAQ;AACtDA,oBAAAA,MAAI,eAAe,WAAW,KAAK,OAAO;AAC1CA,oBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,IAAI;AACtD,UAAI,KAAK,KAAK,SAAS,KAAK;AAC1B,YAAI,KAAK,KAAK,KAAK,YAAY;AAC7BA,wBAAAA,MAAI,SAAS;AAAA,YACX,KAAK;AAAA,UACP,CAAC;AAAA,eACI;AACLA,wBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,IAAI;AAClDA,wBAAG,MAAC,YAAW;AACfG,8BAAAA,SAAS,KAAK,KAAK,KAAK,SAAS,OAAO,KAAK,KAAK,KAAK,KAAK,IAAG,KAAK,QAAQ,OAAO;AAEnFH,wBAAA,MAAA,MAAA,OAAA,+BAAY,QAAQ,KAAK,QAAQ;AACjCA,wBAAAA,MAAI,SAAS;AAAA,YACb,KAAK,KAAK;AAAA,UACZ,CAAC;AAAA,QACD;AAAA,aACK;AACLA,sBAAAA,MAAI,UAAU;AAAA,UACZ,OAAO;AAAA,UACP,MAAM;AAAA,QACR,CAAC;AAAA,MACH;AAAA,IACH;AAAA,EACF;AACH;;;;;;;;;AC5FA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/pkDetail/pkDetail.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/pkDetail/pkDetail.js.map
index d09d73a..937f8bc 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/pkDetail/pkDetail.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/pkDetail/pkDetail.js.map
@@ -1 +1 @@
-{"version":3,"file":"pkDetail.js","sources":["pages/pkDetail/pkDetail.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvcGtEZXRhaWwvcGtEZXRhaWwudnVl"],"sourcesContent":["<template>\r\n    <view class=\"container\">\r\n        <!-- <image\r\n            src=\"{{item.anchorIcon}}\"\r\n            mode=\"scaleToFill\"\r\n        /> -->\r\n        <view >主播名称{{item.anchorId}}</view>\r\n        <view>主播性别{{item.sex === 1?\"男\":\"女\"}}</view>\r\n        <view> 国家{{item.country}}</view>\r\n        <view>金币{{item.coin}}</view>\r\n        <view>主播备注{{item.remark}}</view>\r\n        <view>PK时间{{item.pkTime}}</view>\r\n    </view>\r\n\r\n</template>\r\n\r\n<script>\r\nexport default {\r\n  data() {\r\n    return {\r\n      item: {},\r\n    };\r\n  },\r\n  onLoad(options) {\r\n    // 获取源页面的eventChannel对象\r\n    const eventChannel = this.getOpenerEventChannel();\r\n    // 监听itemDetail事件\r\n    eventChannel.on(\"itemDetail\", (data) => {\r\n      this.item = data.item; // 将接收到的数据赋值给item\r\n      console.log(\"接收到的数据:\", this.item);\r\n    });\r\n  },\r\n  methods: {},\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n/* 样式定义 */\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/pkDetail/pkDetail.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni"],"mappings":";;AAiBA,MAAK,YAAU;AAAA,EACb,OAAO;AACL,WAAO;AAAA,MACL,MAAM,CAAE;AAAA;EAEX;AAAA,EACD,OAAO,SAAS;AAEd,UAAM,eAAe,KAAK;AAE1B,iBAAa,GAAG,cAAc,CAAC,SAAS;AACtC,WAAK,OAAO,KAAK;AACjBA,oBAAA,MAAA,MAAA,OAAA,qCAAY,WAAW,KAAK,IAAI;AAAA,IAClC,CAAC;AAAA,EACF;AAAA,EACD,SAAS,CAAE;AACb;;;;;;;;;;;;AChCA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"pkDetail.js","sources":["pages/pkDetail/pkDetail.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvcGtEZXRhaWwvcGtEZXRhaWwudnVl"],"sourcesContent":["<template>\r\n  <view class=\"Navigation\">\r\n    <image\r\n      src=\"../../static/Navigationimg.png\"\r\n      mode=\"scaleToFill\"\r\n      class=\"Navigationimg\"\r\n    />\r\n    <image\r\n      @click=\"Returnfunc\"\r\n      src=\"../../static/Return.png\"\r\n      mode=\"scaleToFill\"\r\n      class=\"Return\"\r\n    />\r\n  </view>\r\n  <view class=\"container\">\r\n    <view class=\"individual\">\r\n      <view class=\"anchor\">\r\n        <!-- <image\r\n            src=\"{{item.anchorIcon}}\"\r\n            mode=\"scaleToFill\"\r\n        /> -->\r\n      </view>\r\n      <view>\r\n        <view>主播名称{{ item.anchorId }}</view>\r\n        <view>主播性别{{ item.sex === 1 ? \"男\" : \"女\" }}</view>\r\n        <view> 国家{{ item.country }}</view>\r\n      </view>\r\n    </view>\r\n\r\n    <view>金币{{ item.coin }}</view>\r\n    <view>PK时间{{ formatDate(item.pkTime) }}</view>\r\n\r\n    <view>主播备注{{ item.remark }}</view>\r\n    <button @click=\"openChat()\">聊了个天</button>\r\n    <button @click=\"open()\">立即邀请PK</button>\r\n  </view>\r\n  <!-- 弹窗 -->\r\n  <uni-popup ref=\"popup\" type=\"center\" border-radius=\"10px 10px 0 0\">\r\n    <view class=\"popup-content\">\r\n      <view class=\"popup-title\">您确定要邀请主播PK吗？</view>\r\n      <view class=\"popup-btn\">\r\n        <button class=\"invite\" type=\"primary\" @click=\"invite()\">邀请</button>\r\n        <button class=\"cancel\" type=\"default\" @click=\"close()\">取消</button>\r\n      </view>\r\n    </view>\r\n  </uni-popup>\r\n</template>\r\n\r\n<script>\r\nimport formatDate from \"../../components/formatDate.js\";\r\nimport VerifyLogin from \"../../components/VerifyLogin.js\";\r\nexport default {\r\n  inject: ['$global'],\r\n  data() {\r\n    return {\r\n      item: {},\r\n    };\r\n  },\r\n  onLoad(options) {\r\n    // 获取源页面的eventChannel对象\r\n    const eventChannel = this.getOpenerEventChannel();\r\n    // 监听itemDetail事件\r\n    eventChannel.on(\"itemDetail\", (data) => {\r\n      this.item = data.item; // 将接收到的数据赋值给item\r\n      console.log(\"接收到的数据:\", this.item);\r\n    });\r\n    \r\n  },\r\n  methods: {\r\n    formatDate: formatDate,\r\n    Returnfunc() {\r\n      uni.navigateBack({\r\n        delta: 1,\r\n      });\r\n    },\r\n    open() {\r\n      this.$refs.popup.open(\"center\");\r\n    },\r\n    invite() {\r\n      // 发送邀请消息\r\n    },\r\n    close() {\r\n      this.$refs.popup.close();\r\n    },\r\n    openChat() {\r\n      //判断用户是否登录\r\n      VerifyLogin().then(() => {\r\n        // 打开聊天页面\r\n        const conversationID = `C2C${this.item.senderId}`;\r\n        uni.redirectTo({\r\n          url: `/TUIKit/components/TUIChat/index?conversationID=${conversationID}`,\r\n        });\r\n      });\r\n    },\r\n  },\r\n};\r\n</script>\r\n\r\n<style scoped>\r\n/* 样式定义 */\r\n.Navigation {\r\n  position: fixed;\r\n  top: 0;\r\n  left: 0;\r\n  right: 0;\r\n  height: 200rpx;\r\n}\r\n.Navigationimg {\r\n  width: 100%;\r\n  height: 100%;\r\n}\r\n.Return {\r\n  position: absolute;\r\n  left: 60rpx;\r\n  bottom: 40rpx;\r\n  width: 60rpx;\r\n  height: 60rpx;\r\n}\r\n.container {\r\n  position: absolute;\r\n  top: 200rpx;\r\n  left: 0;\r\n  right: 0;\r\n  bottom: 0;\r\n}\r\n.individual {\r\n  display: flex;\r\n  /* justify-content: center; */\r\n  margin-top: 50rpx;\r\n}\r\n.anchor {\r\n  width: 200rpx;\r\n  height: 200rpx;\r\n  background-color: rgba(0, 0, 255, 0.369);\r\n  border-radius: 50%;\r\n}\r\n.popup-content {\r\n  width: 500rpx;\r\n  height: 300rpx;\r\n  background-color: #fff;\r\n  border-radius: 10px;\r\n  display: flex;\r\n  flex-direction: column;\r\n  justify-content: center;\r\n  align-items: center;\r\n}\r\n.popup-title {\r\n  font-size: 30rpx;\r\n  margin-top: 50rpx;\r\n  text-align: center;\r\n}\r\n.popup-btn {\r\n  display: flex;\r\n  justify-content: space-around;\r\n  margin-top: 50rpx;\r\n}\r\n.invite {\r\n  width: 200rpx;\r\n  height: 80rpx;\r\n  font-size: 30rpx;\r\n  line-height: 80rpx;\r\n  border-radius: 20rpx;\r\n  background-color: #1aff0087;\r\n}\r\n.cancel {\r\n  width: 200rpx;\r\n  height: 80rpx;\r\n  font-size: 30rpx;\r\n  line-height: 80rpx;\r\n  margin-left: 30rpx;\r\n  border-radius: 20rpx;\r\n}\r\n</style>\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/pkDetail/pkDetail.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","formatDate","VerifyLogin"],"mappings":";;;;;AAmDA,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;AAAA,MACL,MAAM,CAAE;AAAA;EAEX;AAAA,EACD,OAAO,SAAS;AAEd,UAAM,eAAe,KAAK;AAE1B,iBAAa,GAAG,cAAc,CAAC,SAAS;AACtC,WAAK,OAAO,KAAK;AACjBA,oBAAA,MAAA,MAAA,OAAA,qCAAY,WAAW,KAAK,IAAI;AAAA,IAClC,CAAC;AAAA,EAEF;AAAA,EACD,SAAS;AAAA,IACP,YAAYC,sBAAU;AAAA,IACtB,aAAa;AACXD,oBAAAA,MAAI,aAAa;AAAA,QACf,OAAO;AAAA,MACT,CAAC;AAAA,IACF;AAAA,IACD,OAAO;AACL,WAAK,MAAM,MAAM,KAAK,QAAQ;AAAA,IAC/B;AAAA,IACD,SAAS;AAAA,IAER;AAAA,IACD,QAAQ;AACN,WAAK,MAAM,MAAM;IAClB;AAAA,IACD,WAAW;AAETE,6BAAW,YAAA,EAAG,KAAK,MAAM;AAEvB,cAAM,iBAAiB,MAAM,KAAK,KAAK,QAAQ;AAC/CF,sBAAAA,MAAI,WAAW;AAAA,UACb,KAAK,mDAAmD,cAAc;AAAA,QACxE,CAAC;AAAA,MACH,CAAC;AAAA,IACF;AAAA,EACF;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC9FA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
new file mode 100644
index 0000000..80a1f7a
--- /dev/null
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"uni-popup.js","sources":["uni_modules/uni-popup/components/uni-popup/uni-popup.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RDov6aG555uuL3RrLW1pbmktcHJvZ3JhbS91bmlfbW9kdWxlcy91bmktcG9wdXAvY29tcG9uZW50cy91bmktcG9wdXAvdW5pLXBvcHVwLnZ1ZQ"],"sourcesContent":["<template>\n\t<view v-if=\"showPopup\" class=\"uni-popup\" :class=\"[popupstyle, isDesktop ? 'fixforpc-z-index' : '']\">\n\t\t<view @touchstart=\"touchstart\">\n\t\t\t<uni-transition key=\"1\" v-if=\"maskShow\" name=\"mask\" mode-class=\"fade\" :styles=\"maskClass\"\n\t\t\t\t:duration=\"duration\" :show=\"showTrans\" @click=\"onTap\" />\n\t\t\t<uni-transition key=\"2\" :mode-class=\"ani\" name=\"content\" :styles=\"transClass\" :duration=\"duration\"\n\t\t\t\t:show=\"showTrans\" @click=\"onTap\">\n\t\t\t\t<view class=\"uni-popup__wrapper\" :style=\"getStyles\" :class=\"[popupstyle]\" @click=\"clear\">\n\t\t\t\t\t<slot />\n\t\t\t\t</view>\n\t\t\t</uni-transition>\n\t\t</view>\n\t\t<!-- #ifdef H5 -->\n\t\t<keypress v-if=\"maskShow\" @esc=\"onTap\" />\n\t\t<!-- #endif -->\n\t</view>\n</template>\n\n<script>\n\t// #ifdef H5\n\timport keypress from './keypress.js'\n\t// #endif\n\n\t/**\n\t * PopUp 弹出层\n\t * @description 弹出层组件，为了解决遮罩弹层的问题\n\t * @tutorial https://ext.dcloud.net.cn/plugin?id=329\n\t * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式\n\t * \t@value top 顶部弹出\n\t * \t@value center 中间弹出\n\t * \t@value bottom 底部弹出\n\t * \t@value left\t\t左侧弹出\n\t * \t@value right  右侧弹出\n\t * \t@value message 消息提示\n\t * \t@value dialog 对话框\n\t * \t@value share 底部分享示例\n\t * @property {Boolean} animation = [true|false] 是否开启动画\n\t * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)\n\t * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗\n\t * @property {String}  backgroundColor 主窗口背景色\n\t * @property {String}  maskBackgroundColor 蒙版颜色\n\t * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:\"10px 10px 10px 10px\"\n\t * @property {Boolean} safeArea\t\t   是否适配底部安全区\n\t * @event {Function} change 打开关闭弹窗触发，e={show: false}\n\t * @event {Function} maskClick 点击遮罩触发\n\t */\n\n\texport default {\n\t\tname: 'uniPopup',\n\t\tcomponents: {\n\t\t\t// #ifdef H5\n\t\t\tkeypress\n\t\t\t// #endif\n\t\t},\n\t\temits: ['change', 'maskClick'],\n\t\tprops: {\n\t\t\t// 开启动画\n\t\t\tanimation: {\n\t\t\t\ttype: Boolean,\n\t\t\t\tdefault: true\n\t\t\t},\n\t\t\t// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层\n\t\t\t// message: 消息提示 ; dialog : 对话框\n\t\t\ttype: {\n\t\t\t\ttype: String,\n\t\t\t\tdefault: 'center'\n\t\t\t},\n\t\t\t// maskClick\n\t\t\tisMaskClick: {\n\t\t\t\ttype: Boolean,\n\t\t\t\tdefault: null\n\t\t\t},\n\t\t\t// TODO 2 个版本后废弃属性 ，使用 isMaskClick\n\t\t\tmaskClick: {\n\t\t\t\ttype: Boolean,\n\t\t\t\tdefault: null\n\t\t\t},\n\t\t\tbackgroundColor: {\n\t\t\t\ttype: String,\n\t\t\t\tdefault: 'none'\n\t\t\t},\n\t\t\tsafeArea: {\n\t\t\t\ttype: Boolean,\n\t\t\t\tdefault: true\n\t\t\t},\n\t\t\tmaskBackgroundColor: {\n\t\t\t\ttype: String,\n\t\t\t\tdefault: 'rgba(0, 0, 0, 0.4)'\n\t\t\t},\n\t\t\tborderRadius:{\n\t\t\t\ttype: String,\n\t\t\t}\n\t\t},\n\n\t\twatch: {\n\t\t\t/**\n\t\t\t * 监听type类型\n\t\t\t */\n\t\t\ttype: {\n\t\t\t\thandler: function(type) {\n\t\t\t\t\tif (!this.config[type]) return\n\t\t\t\t\tthis[this.config[type]](true)\n\t\t\t\t},\n\t\t\t\timmediate: true\n\t\t\t},\n\t\t\tisDesktop: {\n\t\t\t\thandler: function(newVal) {\n\t\t\t\t\tif (!this.config[newVal]) return\n\t\t\t\t\tthis[this.config[this.type]](true)\n\t\t\t\t},\n\t\t\t\timmediate: true\n\t\t\t},\n\t\t\t/**\n\t\t\t * 监听遮罩是否可点击\n\t\t\t * @param {Object} val\n\t\t\t */\n\t\t\tmaskClick: {\n\t\t\t\thandler: function(val) {\n\t\t\t\t\tthis.mkclick = val\n\t\t\t\t},\n\t\t\t\timmediate: true\n\t\t\t},\n\t\t\tisMaskClick: {\n\t\t\t\thandler: function(val) {\n\t\t\t\t\tthis.mkclick = val\n\t\t\t\t},\n\t\t\t\timmediate: true\n\t\t\t},\n\t\t\t// H5 下禁止底部滚动\n\t\t\tshowPopup(show) {\n\t\t\t\t// #ifdef H5\n\t\t\t\t// fix by mehaotian 处理 h5 滚动穿透的问题\n\t\t\t\tdocument.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'\n\t\t\t\t// #endif\n\t\t\t}\n\t\t},\n\t\tdata() {\n\t\t\treturn {\n\t\t\t\tduration: 300,\n\t\t\t\tani: [],\n\t\t\t\tshowPopup: false,\n\t\t\t\tshowTrans: false,\n\t\t\t\tpopupWidth: 0,\n\t\t\t\tpopupHeight: 0,\n\t\t\t\tconfig: {\n\t\t\t\t\ttop: 'top',\n\t\t\t\t\tbottom: 'bottom',\n\t\t\t\t\tcenter: 'center',\n\t\t\t\t\tleft: 'left',\n\t\t\t\t\tright: 'right',\n\t\t\t\t\tmessage: 'top',\n\t\t\t\t\tdialog: 'center',\n\t\t\t\t\tshare: 'bottom'\n\t\t\t\t},\n\t\t\t\tmaskClass: {\n\t\t\t\t\tposition: 'fixed',\n\t\t\t\t\tbottom: 0,\n\t\t\t\t\ttop: 0,\n\t\t\t\t\tleft: 0,\n\t\t\t\t\tright: 0,\n\t\t\t\t\tbackgroundColor: 'rgba(0, 0, 0, 0.4)'\n\t\t\t\t},\n\t\t\t\ttransClass: {\n\t\t\t\t\tbackgroundColor: 'transparent',\n\t\t\t\t\tborderRadius: this.borderRadius || \"0\",\n\t\t\t\t\tposition: 'fixed',\n\t\t\t\t\tleft: 0,\n\t\t\t\t\tright: 0\n\t\t\t\t},\n\t\t\t\tmaskShow: true,\n\t\t\t\tmkclick: true,\n\t\t\t\tpopupstyle: 'top'\n\t\t\t}\n\t\t},\n\t\tcomputed: {\n\t\t\tgetStyles() {\n\t\t\t\tlet res = { backgroundColor: this.bg };\n\t\t\t\tif (this.borderRadius || \"0\") {\n\t\t\t\t\tres = Object.assign(res, { borderRadius: this.borderRadius })\n\t\t\t\t}\n\t\t\t\treturn res;\n\t\t\t},\n\t\t\tisDesktop() {\n\t\t\t\treturn this.popupWidth >= 500 && this.popupHeight >= 500\n\t\t\t},\n\t\t\tbg() {\n\t\t\t\tif (this.backgroundColor === '' || this.backgroundColor === 'none') {\n\t\t\t\t\treturn 'transparent'\n\t\t\t\t}\n\t\t\t\treturn this.backgroundColor\n\t\t\t}\n\t\t},\n\t\tmounted() {\n\t\t\tconst fixSize = () => {\n\t\t\t\t// #ifdef MP-WEIXIN\n\t\t\t\tconst {\n\t\t\t\t\twindowWidth,\n\t\t\t\t\twindowHeight,\n\t\t\t\t\twindowTop,\n\t\t\t\t\tsafeArea,\n\t\t\t\t\tscreenHeight,\n\t\t\t\t\tsafeAreaInsets\n\t\t\t\t} = uni.getWindowInfo()\n\t\t\t\t// #endif\n\t\t\t\t// #ifndef MP-WEIXIN\n\t\t\t\tconst {\n\t\t\t\t\twindowWidth,\n\t\t\t\t\twindowHeight,\n\t\t\t\t\twindowTop,\n\t\t\t\t\tsafeArea,\n\t\t\t\t\tscreenHeight,\n\t\t\t\t\tsafeAreaInsets\n\t\t\t\t} = uni.getSystemInfoSync()\n\t\t\t\t// #endif\n\t\t\t\tthis.popupWidth = windowWidth\n\t\t\t\tthis.popupHeight = windowHeight + (windowTop || 0)\n\t\t\t\t// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复\n\t\t\t\tif (safeArea && this.safeArea) {\n\t\t\t\t\t// #ifdef MP-WEIXIN\n\t\t\t\t\tthis.safeAreaInsets = screenHeight - safeArea.bottom\n\t\t\t\t\t// #endif\n\t\t\t\t\t// #ifndef MP-WEIXIN\n\t\t\t\t\tthis.safeAreaInsets = safeAreaInsets.bottom\n\t\t\t\t\t// #endif\n\t\t\t\t} else {\n\t\t\t\t\tthis.safeAreaInsets = 0\n\t\t\t\t}\n\t\t\t}\n\t\t\tfixSize()\n\t\t\t// #ifdef H5\n\t\t\t// window.addEventListener('resize', fixSize)\n\t\t\t// this.$once('hook:beforeDestroy', () => {\n\t\t\t// \twindow.removeEventListener('resize', fixSize)\n\t\t\t// })\n\t\t\t// #endif\n\t\t},\n\t\t// #ifndef VUE3\n\t\t// TODO vue2\n\t\tdestroyed() {\n\t\t\tthis.setH5Visible()\n\t\t},\n\t\t// #endif\n\t\t// #ifdef VUE3\n\t\t// TODO vue3\n\t\tunmounted() {\n\t\t\tthis.setH5Visible()\n\t\t},\n\t\t// #endif\n\t\tactivated() {\n   \t  this.setH5Visible(!this.showPopup);\n    },\n    deactivated() {\n      this.setH5Visible(true);\n    },\n\t\tcreated() {\n\t\t\t// this.mkclick =  this.isMaskClick || this.maskClick\n\t\t\tif (this.isMaskClick === null && this.maskClick === null) {\n\t\t\t\tthis.mkclick = true\n\t\t\t} else {\n\t\t\t\tthis.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick\n\t\t\t}\n\t\t\tif (this.animation) {\n\t\t\t\tthis.duration = 300\n\t\t\t} else {\n\t\t\t\tthis.duration = 0\n\t\t\t}\n\t\t\t// TODO 处理 message 组件生命周期异常的问题\n\t\t\tthis.messageChild = null\n\t\t\t// TODO 解决头条冒泡的问题\n\t\t\tthis.clearPropagation = false\n\t\t\tthis.maskClass.backgroundColor = this.maskBackgroundColor\n\t\t},\n\t\tmethods: {\n\t\t\tsetH5Visible(visible = true) {\n\t\t\t\t// #ifdef H5\n\t\t\t\t// fix by mehaotian 处理 h5 滚动穿透的问题\n\t\t\t\tdocument.getElementsByTagName('body')[0].style.overflow =  visible ? \"visible\" : \"hidden\";\n\t\t\t\t// #endif\n\t\t\t},\n\t\t\t/**\n\t\t\t * 公用方法，不显示遮罩层\n\t\t\t */\n\t\t\tcloseMask() {\n\t\t\t\tthis.maskShow = false\n\t\t\t},\n\t\t\t/**\n\t\t\t * 公用方法，遮罩层禁止点击\n\t\t\t */\n\t\t\tdisableMask() {\n\t\t\t\tthis.mkclick = false\n\t\t\t},\n\t\t\t// TODO nvue 取消冒泡\n\t\t\tclear(e) {\n\t\t\t\t// #ifndef APP-NVUE\n\t\t\t\te.stopPropagation()\n\t\t\t\t// #endif\n\t\t\t\tthis.clearPropagation = true\n\t\t\t},\n\n\t\t\topen(direction) {\n\t\t\t\t// fix by mehaotian 处理快速打开关闭的情况\n\t\t\t\tif (this.showPopup) {\n\t\t\t\t\treturn\n\t\t\t\t}\n\t\t\t\tlet innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']\n\t\t\t\tif (!(direction && innerType.indexOf(direction) !== -1)) {\n\t\t\t\t\tdirection = this.type\n\t\t\t\t}\n\t\t\t\tif (!this.config[direction]) {\n\t\t\t\t\tconsole.error('缺少类型：', direction)\n\t\t\t\t\treturn\n\t\t\t\t}\n\t\t\t\tthis[this.config[direction]]()\n\t\t\t\tthis.$emit('change', {\n\t\t\t\t\tshow: true,\n\t\t\t\t\ttype: direction\n\t\t\t\t})\n\t\t\t},\n\t\t\tclose(type) {\n\t\t\t\tthis.showTrans = false\n\t\t\t\tthis.$emit('change', {\n\t\t\t\t\tshow: false,\n\t\t\t\t\ttype: this.type\n\t\t\t\t})\n\t\t\t\tclearTimeout(this.timer)\n\t\t\t\t// // 自定义关闭事件\n\t\t\t\t// this.customOpen && this.customClose()\n\t\t\t\tthis.timer = setTimeout(() => {\n\t\t\t\t\tthis.showPopup = false\n\t\t\t\t}, 300)\n\t\t\t},\n\t\t\t// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容\n\t\t\ttouchstart() {\n\t\t\t\tthis.clearPropagation = false\n\t\t\t},\n\n\t\t\tonTap() {\n\t\t\t\tif (this.clearPropagation) {\n\t\t\t\t\t// fix by mehaotian 兼容 nvue\n\t\t\t\t\tthis.clearPropagation = false\n\t\t\t\t\treturn\n\t\t\t\t}\n\t\t\t\tthis.$emit('maskClick')\n\t\t\t\tif (!this.mkclick) return\n\t\t\t\tthis.close()\n\t\t\t},\n\t\t\t/**\n\t\t\t * 顶部弹出样式处理\n\t\t\t */\n\t\t\ttop(type) {\n\t\t\t\tthis.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'\n\t\t\t\tthis.ani = ['slide-top']\n\t\t\t\tthis.transClass = {\n\t\t\t\t\tposition: 'fixed',\n\t\t\t\t\tleft: 0,\n\t\t\t\t\tright: 0,\n\t\t\t\t\tbackgroundColor: this.bg,\n\t\t\t\t\tborderRadius:this.borderRadius || \"0\"\n\t\t\t\t}\n\t\t\t\t// TODO 兼容 type 属性 ，后续会废弃\n\t\t\t\tif (type) return\n\t\t\t\tthis.showPopup = true\n\t\t\t\tthis.showTrans = true\n\t\t\t\tthis.$nextTick(() => {\n\t\t\t\t\tthis.showPoptrans()\n\t\t\t\t\tif (this.messageChild && this.type === 'message') {\n\t\t\t\t\t\tthis.messageChild.timerClose()\n\t\t\t\t\t}\n\t\t\t\t})\n\t\t\t},\n\t\t\t/**\n\t\t\t * 底部弹出样式处理\n\t\t\t */\n\t\t\tbottom(type) {\n\t\t\t\tthis.popupstyle = 'bottom'\n\t\t\t\tthis.ani = ['slide-bottom']\n\t\t\t\tthis.transClass = {\n\t\t\t\t\tposition: 'fixed',\n\t\t\t\t\tleft: 0,\n\t\t\t\t\tright: 0,\n\t\t\t\t\tbottom: 0,\n\t\t\t\t\tpaddingBottom: this.safeAreaInsets + 'px',\n\t\t\t\t\tbackgroundColor: this.bg,\n\t\t\t\t\tborderRadius:this.borderRadius || \"0\",\n\t\t\t\t}\n\t\t\t\t// TODO 兼容 type 属性 ，后续会废弃\n\t\t\t\tif (type) return\n\t\t\t\tthis.showPoptrans()\n\t\t\t},\n\t\t\t/**\n\t\t\t * 中间弹出样式处理\n\t\t\t */\n\t\t\tcenter(type) {\n\t\t\t\tthis.popupstyle = 'center'\n\t\t\t\t//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理\n\t\t\t\t// #ifdef MP-WEIXIN\n\t\t\t\t\tthis.ani = ['fade']\n\t\t\t\t// #endif\n\t\t\t\t// #ifndef MP-WEIXIN\n\t\t\t\t\tthis.ani = ['zoom-out', 'fade']\n\t\t\t\t// #endif\n\t\t\t\tthis.transClass = {\n\t\t\t\t\tposition: 'fixed',\n\t\t\t\t\t/* #ifndef APP-NVUE */\n\t\t\t\t\tdisplay: 'flex',\n\t\t\t\t\tflexDirection: 'column',\n\t\t\t\t\t/* #endif */\n\t\t\t\t\tbottom: 0,\n\t\t\t\t\tleft: 0,\n\t\t\t\t\tright: 0,\n\t\t\t\t\ttop: 0,\n\t\t\t\t\tjustifyContent: 'center',\n\t\t\t\t\talignItems: 'center',\n\t\t\t\t\tborderRadius:this.borderRadius || \"0\"\n\t\t\t\t}\n\t\t\t\t// TODO 兼容 type 属性 ，后续会废弃\n\t\t\t\tif (type) return\n\t\t\t\tthis.showPoptrans()\n\t\t\t},\n\t\t\tleft(type) {\n\t\t\t\tthis.popupstyle = 'left'\n\t\t\t\tthis.ani = ['slide-left']\n\t\t\t\tthis.transClass = {\n\t\t\t\t\tposition: 'fixed',\n\t\t\t\t\tleft: 0,\n\t\t\t\t\tbottom: 0,\n\t\t\t\t\ttop: 0,\n\t\t\t\t\tbackgroundColor: this.bg,\n\t\t\t\t\tborderRadius:this.borderRadius || \"0\",\n\t\t\t\t\t/* #ifndef APP-NVUE */\n\t\t\t\t\tdisplay: 'flex',\n\t\t\t\t\tflexDirection: 'column'\n\t\t\t\t\t/* #endif */\n\t\t\t\t}\n\t\t\t\t// TODO 兼容 type 属性 ，后续会废弃\n\t\t\t\tif (type) return\n\t\t\t\tthis.showPoptrans()\n\t\t\t},\n\t\t\tright(type) {\n\t\t\t\tthis.popupstyle = 'right'\n\t\t\t\tthis.ani = ['slide-right']\n\t\t\t\tthis.transClass = {\n\t\t\t\t\tposition: 'fixed',\n\t\t\t\t\tbottom: 0,\n\t\t\t\t\tright: 0,\n\t\t\t\t\ttop: 0,\n\t\t\t\t\tbackgroundColor: this.bg,\n\t\t\t\t\tborderRadius:this.borderRadius || \"0\",\n\t\t\t\t\t/* #ifndef APP-NVUE */\n\t\t\t\t\tdisplay: 'flex',\n\t\t\t\t\tflexDirection: 'column'\n\t\t\t\t\t/* #endif */\n\t\t\t\t}\n\t\t\t\t// TODO 兼容 type 属性 ，后续会废弃\n\t\t\t\tif (type) return\n\t\t\t\tthis.showPoptrans()\n\t\t\t},\n\t\t\tshowPoptrans(){\n\t\t\t\tthis.$nextTick(()=>{\n\t\t\t\t\tthis.showPopup = true\n\t\t\t\t\tthis.showTrans = true\n\t\t\t\t})\n\t\t\t}\n\t\t}\n\t}\n</script>\n<style lang=\"scss\">\n\t.uni-popup {\n\t\tposition: fixed;\n\t\t/* #ifndef APP-NVUE */\n\t\tz-index: 99;\n\n\t\t/* #endif */\n\t\t&.top,\n\t\t&.left,\n\t\t&.right {\n\t\t\t/* #ifdef H5 */\n\t\t\ttop: var(--window-top);\n\t\t\t/* #endif */\n\t\t\t/* #ifndef H5 */\n\t\t\ttop: 0;\n\t\t\t/* #endif */\n\t\t}\n\n\t\t.uni-popup__wrapper {\n\t\t\t/* #ifndef APP-NVUE */\n\t\t\tdisplay: block;\n\t\t\t/* #endif */\n\t\t\tposition: relative;\n\n\t\t\t/* iphonex 等安全区设置，底部安全区适配 */\n\t\t\t/* #ifndef APP-NVUE */\n\t\t\t// padding-bottom: constant(safe-area-inset-bottom);\n\t\t\t// padding-bottom: env(safe-area-inset-bottom);\n\t\t\t/* #endif */\n\t\t\t&.left,\n\t\t\t&.right {\n\t\t\t\t/* #ifdef H5 */\n\t\t\t\tpadding-top: var(--window-top);\n\t\t\t\t/* #endif */\n\t\t\t\t/* #ifndef H5 */\n\t\t\t\tpadding-top: 0;\n\t\t\t\t/* #endif */\n\t\t\t\tflex: 1;\n\t\t\t}\n\t\t}\n\t}\n\n\t.fixforpc-z-index {\n\t\t/* #ifndef APP-NVUE */\n\t\tz-index: 999;\n\t\t/* #endif */\n\t}\n\n\t.fixforpc-top {\n\t\ttop: 0;\n\t}\n</style>\n","import Component from 'D:/项目/tk-mini-program/uni_modules/uni-popup/components/uni-popup/uni-popup.vue'\nwx.createComponent(Component)"],"names":["uni"],"mappings":"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"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js.map
new file mode 100644
index 0000000..91bd620
--- /dev/null
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"createAnimation.js","sources":["uni_modules/uni-transition/components/uni-transition/createAnimation.js"],"sourcesContent":["// const defaultOption = {\n// \tduration: 300,\n// \ttimingFunction: 'linear',\n// \tdelay: 0,\n// \ttransformOrigin: '50% 50% 0'\n// }\n// #ifdef APP-NVUE\nconst nvueAnimation = uni.requireNativePlugin('animation')\n// #endif\nclass MPAnimation {\n\tconstructor(options, _this) {\n\t\tthis.options = options\n\t\t// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误\n\t\tthis.animation = uni.createAnimation({\n\t\t\t...options\n\t\t})\n\t\tthis.currentStepAnimates = {}\n\t\tthis.next = 0\n\t\tthis.$ = _this\n\n\t}\n\n\t_nvuePushAnimates(type, args) {\n\t\tlet aniObj = this.currentStepAnimates[this.next]\n\t\tlet styles = {}\n\t\tif (!aniObj) {\n\t\t\tstyles = {\n\t\t\t\tstyles: {},\n\t\t\t\tconfig: {}\n\t\t\t}\n\t\t} else {\n\t\t\tstyles = aniObj\n\t\t}\n\t\tif (animateTypes1.includes(type)) {\n\t\t\tif (!styles.styles.transform) {\n\t\t\t\tstyles.styles.transform = ''\n\t\t\t}\n\t\t\tlet unit = ''\n\t\t\tif(type === 'rotate'){\n\t\t\t\tunit = 'deg'\n\t\t\t}\n\t\t\tstyles.styles.transform += `${type}(${args+unit}) `\n\t\t} else {\n\t\t\tstyles.styles[type] = `${args}`\n\t\t}\n\t\tthis.currentStepAnimates[this.next] = styles\n\t}\n\t_animateRun(styles = {}, config = {}) {\n\t\tlet ref = this.$.$refs['ani'].ref\n\t\tif (!ref) return\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tnvueAnimation.transition(ref, {\n\t\t\t\tstyles,\n\t\t\t\t...config\n\t\t\t}, res => {\n\t\t\t\tresolve()\n\t\t\t})\n\t\t})\n\t}\n\n\t_nvueNextAnimate(animates, step = 0, fn) {\n\t\tlet obj = animates[step]\n\t\tif (obj) {\n\t\t\tlet {\n\t\t\t\tstyles,\n\t\t\t\tconfig\n\t\t\t} = obj\n\t\t\tthis._animateRun(styles, config).then(() => {\n\t\t\t\tstep += 1\n\t\t\t\tthis._nvueNextAnimate(animates, step, fn)\n\t\t\t})\n\t\t} else {\n\t\t\tthis.currentStepAnimates = {}\n\t\t\ttypeof fn === 'function' && fn()\n\t\t\tthis.isEnd = true\n\t\t}\n\t}\n\n\tstep(config = {}) {\n\t\t// #ifndef APP-NVUE\n\t\tthis.animation.step(config)\n\t\t// #endif\n\t\t// #ifdef APP-NVUE\n\t\tthis.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)\n\t\tthis.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin\n\t\tthis.next++\n\t\t// #endif\n\t\treturn this\n\t}\n\n\trun(fn) {\n\t\t// #ifndef APP-NVUE\n\t\tthis.$.animationData = this.animation.export()\n\t\tthis.$.timer = setTimeout(() => {\n\t\t\ttypeof fn === 'function' && fn()\n\t\t}, this.$.durationTime)\n\t\t// #endif\n\t\t// #ifdef APP-NVUE\n\t\tthis.isEnd = false\n\t\tlet ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref\n\t\tif(!ref) return\n\t\tthis._nvueNextAnimate(this.currentStepAnimates, 0, fn)\n\t\tthis.next = 0\n\t\t// #endif\n\t}\n}\n\n\nconst animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',\n\t'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',\n\t'translateZ'\n]\nconst animateTypes2 = ['opacity', 'backgroundColor']\nconst animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']\nanimateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {\n\tMPAnimation.prototype[type] = function(...args) {\n\t\t// #ifndef APP-NVUE\n\t\tthis.animation[type](...args)\n\t\t// #endif\n\t\t// #ifdef APP-NVUE\n\t\tthis._nvuePushAnimates(type, args)\n\t\t// #endif\n\t\treturn this\n\t}\n})\n\nexport function createAnimation(option, _this) {\n\tif(!_this) return\n\tclearTimeout(_this.timer)\n\treturn new MPAnimation(option, _this)\n}\n"],"names":["uni"],"mappings":"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"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
new file mode 100644
index 0000000..a76414c
--- /dev/null
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"uni-transition.js","sources":["uni_modules/uni-transition/components/uni-transition/uni-transition.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RDov6aG555uuL3RrLW1pbmktcHJvZ3JhbS91bmlfbW9kdWxlcy91bmktdHJhbnNpdGlvbi9jb21wb25lbnRzL3VuaS10cmFuc2l0aW9uL3VuaS10cmFuc2l0aW9uLnZ1ZQ"],"sourcesContent":["<template>\n  <!-- #ifndef APP-NVUE -->\n  <view v-show=\"isShow\" ref=\"ani\" :animation=\"animationData\" :class=\"customClass\" :style=\"transformStyles\" @click=\"onClick\"><slot></slot></view>\n  <!-- #endif -->\n  <!-- #ifdef APP-NVUE -->\n  <view v-if=\"isShow\" ref=\"ani\" :animation=\"animationData\" :class=\"customClass\" :style=\"transformStyles\" @click=\"onClick\"><slot></slot></view>\n  <!-- #endif -->\n</template>\n\n<script>\nimport { createAnimation } from './createAnimation'\n\n/**\n * Transition 过渡动画\n * @description 简单过渡动画组件\n * @tutorial https://ext.dcloud.net.cn/plugin?id=985\n * @property {Boolean} show = [false|true] 控制组件显示或隐藏\n * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型\n *  @value fade 渐隐渐出过渡\n *  @value slide-top 由上至下过渡\n *  @value slide-right 由右至左过渡\n *  @value slide-bottom 由下至上过渡\n *  @value slide-left 由左至右过渡\n *  @value zoom-in 由小到大过渡\n *  @value zoom-out 由大到小过渡\n * @property {Number} duration 过渡动画持续时间\n * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`\n */\nexport default {\n\tname: 'uniTransition',\n\temits:['click','change'],\n\tprops: {\n\t\tshow: {\n\t\t\ttype: Boolean,\n\t\t\tdefault: false\n\t\t},\n\t\tmodeClass: {\n\t\t\ttype: [Array, String],\n\t\t\tdefault() {\n\t\t\t\treturn 'fade'\n\t\t\t}\n\t\t},\n\t\tduration: {\n\t\t\ttype: Number,\n\t\t\tdefault: 300\n\t\t},\n\t\tstyles: {\n\t\t\ttype: Object,\n\t\t\tdefault() {\n\t\t\t\treturn {}\n\t\t\t}\n\t\t},\n\t\tcustomClass:{\n\t\t\ttype: String,\n\t\t\tdefault: ''\n\t\t},\n\t\tonceRender:{\n\t\t\ttype:Boolean,\n\t\t\tdefault:false\n\t\t},\n\t},\n\tdata() {\n\t\treturn {\n\t\t\tisShow: false,\n\t\t\ttransform: '',\n\t\t\topacity: 1,\n\t\t\tanimationData: {},\n\t\t\tdurationTime: 300,\n\t\t\tconfig: {}\n\t\t}\n\t},\n\twatch: {\n\t\tshow: {\n\t\t\thandler(newVal) {\n\t\t\t\tif (newVal) {\n\t\t\t\t\tthis.open()\n\t\t\t\t} else {\n\t\t\t\t\t// 避免上来就执行 close,导致动画错乱\n\t\t\t\t\tif (this.isShow) {\n\t\t\t\t\t\tthis.close()\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t},\n\t\t\timmediate: true\n\t\t}\n\t},\n\tcomputed: {\n\t\t// 生成样式数据\n\t\tstylesObject() {\n\t\t\tlet styles = {\n\t\t\t\t...this.styles,\n\t\t\t\t'transition-duration': this.duration / 1000 + 's'\n\t\t\t}\n\t\t\tlet transform = ''\n\t\t\tfor (let i in styles) {\n\t\t\t\tlet line = this.toLine(i)\n\t\t\t\ttransform += line + ':' + styles[i] + ';'\n\t\t\t}\n\t\t\treturn transform\n\t\t},\n\t\t// 初始化动画条件\n\t\ttransformStyles() {\n\t\t\treturn 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject\n\t\t}\n\t},\n\tcreated() {\n\t\t// 动画默认配置\n\t\tthis.config = {\n\t\t\tduration: this.duration,\n\t\t\ttimingFunction: 'ease',\n\t\t\ttransformOrigin: '50% 50%',\n\t\t\tdelay: 0\n\t\t}\n\t\tthis.durationTime = this.duration\n\t},\n\tmethods: {\n\t\t/**\n\t\t *  ref 触发 初始化动画\n\t\t */\n\t\tinit(obj = {}) {\n\t\t\tif (obj.duration) {\n\t\t\t\tthis.durationTime = obj.duration\n\t\t\t}\n\t\t\tthis.animation = createAnimation(Object.assign(this.config, obj),this)\n\t\t},\n\t\t/**\n\t\t * 点击组件触发回调\n\t\t */\n\t\tonClick() {\n\t\t\tthis.$emit('click', {\n\t\t\t\tdetail: this.isShow\n\t\t\t})\n\t\t},\n\t\t/**\n\t\t * ref 触发 动画分组\n\t\t * @param {Object} obj\n\t\t */\n\t\tstep(obj, config = {}) {\n\t\t\tif (!this.animation) return\n\t\t\tfor (let i in obj) {\n\t\t\t\ttry {\n\t\t\t\t\tif(typeof obj[i] === 'object'){\n\t\t\t\t\t\tthis.animation[i](...obj[i])\n\t\t\t\t\t}else{\n\t\t\t\t\t\tthis.animation[i](obj[i])\n\t\t\t\t\t}\n\t\t\t\t} catch (e) {\n\t\t\t\t\tconsole.error(`方法 ${i} 不存在`)\n\t\t\t\t}\n\t\t\t}\n\t\t\tthis.animation.step(config)\n\t\t\treturn this\n\t\t},\n\t\t/**\n\t\t *  ref 触发 执行动画\n\t\t */\n\t\trun(fn) {\n\t\t\tif (!this.animation) return\n\t\t\tthis.animation.run(fn)\n\t\t},\n\t\t// 开始过度动画\n\t\topen() {\n\t\t\tclearTimeout(this.timer)\n\t\t\tthis.transform = ''\n\t\t\tthis.isShow = true\n\t\t\tlet { opacity, transform } = this.styleInit(false)\n\t\t\tif (typeof opacity !== 'undefined') {\n\t\t\t\tthis.opacity = opacity\n\t\t\t}\n\t\t\tthis.transform = transform\n\t\t\t// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常\n\t\t\tthis.$nextTick(() => {\n\t\t\t\t// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器\n\t\t\t\tthis.timer = setTimeout(() => {\n\t\t\t\t\tthis.animation = createAnimation(this.config, this)\n\t\t\t\t\tthis.tranfromInit(false).step()\n\t\t\t\t\tthis.animation.run(() => {\n\t\t\t\t\t\tthis.transform = ''\n\t\t\t\t\t\tthis.opacity = opacity || 1\n\t\t\t\t\t})\n\t\t\t\t\tthis.$emit('change', {\n\t\t\t\t\t\tdetail: this.isShow\n\t\t\t\t\t})\n\t\t\t\t}, 20)\n\t\t\t})\n\t\t},\n\t\t// 关闭过度动画\n\t\tclose(type) {\n\t\t\tif (!this.animation) return\n\t\t\tthis.tranfromInit(true)\n\t\t\t\t.step()\n\t\t\t\t.run(() => {\n\t\t\t\t\tthis.isShow = false\n\t\t\t\t\tthis.animationData = null\n\t\t\t\t\tthis.animation = null\n\t\t\t\t\tlet { opacity, transform } = this.styleInit(false)\n\t\t\t\t\tthis.opacity = opacity || 1\n\t\t\t\t\tthis.transform = transform\n\t\t\t\t\tthis.$emit('change', {\n\t\t\t\t\t\tdetail: this.isShow\n\t\t\t\t\t})\n\t\t\t\t})\n\t\t},\n\t\t// 处理动画开始前的默认样式\n\t\tstyleInit(type) {\n\t\t\tlet styles = {\n\t\t\t\ttransform: ''\n\t\t\t}\n\t\t\tlet buildStyle = (type, mode) => {\n\t\t\t\tif (mode === 'fade') {\n\t\t\t\t\tstyles.opacity = this.animationType(type)[mode]\n\t\t\t\t} else {\n\t\t\t\t\tstyles.transform += this.animationType(type)[mode] + ' '\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (typeof this.modeClass === 'string') {\n\t\t\t\tbuildStyle(type, this.modeClass)\n\t\t\t} else {\n\t\t\t\tthis.modeClass.forEach(mode => {\n\t\t\t\t\tbuildStyle(type, mode)\n\t\t\t\t})\n\t\t\t}\n\t\t\treturn styles\n\t\t},\n\t\t// 处理内置组合动画\n\t\ttranfromInit(type) {\n\t\t\tlet buildTranfrom = (type, mode) => {\n\t\t\t\tlet aniNum = null\n\t\t\t\tif (mode === 'fade') {\n\t\t\t\t\taniNum = type ? 0 : 1\n\t\t\t\t} else {\n\t\t\t\t\taniNum = type ? '-100%' : '0'\n\t\t\t\t\tif (mode === 'zoom-in') {\n\t\t\t\t\t\taniNum = type ? 0.8 : 1\n\t\t\t\t\t}\n\t\t\t\t\tif (mode === 'zoom-out') {\n\t\t\t\t\t\taniNum = type ? 1.2 : 1\n\t\t\t\t\t}\n\t\t\t\t\tif (mode === 'slide-right') {\n\t\t\t\t\t\taniNum = type ? '100%' : '0'\n\t\t\t\t\t}\n\t\t\t\t\tif (mode === 'slide-bottom') {\n\t\t\t\t\t\taniNum = type ? '100%' : '0'\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tthis.animation[this.animationMode()[mode]](aniNum)\n\t\t\t}\n\t\t\tif (typeof this.modeClass === 'string') {\n\t\t\t\tbuildTranfrom(type, this.modeClass)\n\t\t\t} else {\n\t\t\t\tthis.modeClass.forEach(mode => {\n\t\t\t\t\tbuildTranfrom(type, mode)\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treturn this.animation\n\t\t},\n\t\tanimationType(type) {\n\t\t\treturn {\n\t\t\t\tfade: type ? 0 : 1,\n\t\t\t\t'slide-top': `translateY(${type ? '0' : '-100%'})`,\n\t\t\t\t'slide-right': `translateX(${type ? '0' : '100%'})`,\n\t\t\t\t'slide-bottom': `translateY(${type ? '0' : '100%'})`,\n\t\t\t\t'slide-left': `translateX(${type ? '0' : '-100%'})`,\n\t\t\t\t'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,\n\t\t\t\t'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`\n\t\t\t}\n\t\t},\n\t\t// 内置动画类型与实际动画对应字典\n\t\tanimationMode() {\n\t\t\treturn {\n\t\t\t\tfade: 'opacity',\n\t\t\t\t'slide-top': 'translateY',\n\t\t\t\t'slide-right': 'translateX',\n\t\t\t\t'slide-bottom': 'translateY',\n\t\t\t\t'slide-left': 'translateX',\n\t\t\t\t'zoom-in': 'scale',\n\t\t\t\t'zoom-out': 'scale'\n\t\t\t}\n\t\t},\n\t\t// 驼峰转中横线\n\t\ttoLine(name) {\n\t\t\treturn name.replace(/([A-Z])/g, '-$1').toLowerCase()\n\t\t}\n\t}\n}\n</script>\n\n<style></style>\n","import Component from 'D:/项目/tk-mini-program/uni_modules/uni-transition/components/uni-transition/uni-transition.vue'\nwx.createComponent(Component)"],"names":["createAnimation","uni","type"],"mappings":"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"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 79315e0..d6c6d96 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -8012,7 +8012,7 @@ function isConsoleWritable() {
 function initRuntimeSocketService() {
   const hosts = "192.168.0.111,127.0.0.1";
   const port = "8090";
-  const id = "mp-weixin_Z0m08P";
+  const id = "mp-weixin_Jf3Rfu";
   const lazy = typeof swan !== "undefined";
   let restoreError = lazy ? () => {
   } : initOnError();
diff --git a/unpackage/dist/dev/mp-weixin/components/VerifyLogin.js b/unpackage/dist/dev/mp-weixin/components/VerifyLogin.js
new file mode 100644
index 0000000..6fe9e51
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/components/VerifyLogin.js
@@ -0,0 +1,32 @@
+"use strict";
+const common_vendor = require("../common/vendor.js");
+function VerifyLogin() {
+  return new Promise((resolve, reject) => {
+    common_vendor.index.getStorage({
+      key: "userinfo",
+      success: (res) => {
+        if (res.data) {
+          if (res.data.nickName) {
+            resolve(true);
+          } else {
+            common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+            common_vendor.index.reLaunch({ url: "/pages/UserInformation/UserInformation" });
+            resolve(false);
+          }
+        } else {
+          common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+          common_vendor.index.navigateTo({ url: "/pages/login/login" });
+          resolve(false);
+        }
+      },
+      fail: (err) => {
+        common_vendor.index.__f__("error", "at components/VerifyLogin.js:22", "获取用户信息失败", err);
+        common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+        common_vendor.index.navigateTo({ url: "/pages/login/login" });
+        reject(err);
+      }
+    });
+  });
+}
+exports.VerifyLogin = VerifyLogin;
+//# sourceMappingURL=../../.sourcemap/mp-weixin/components/VerifyLogin.js.map
diff --git a/unpackage/dist/dev/mp-weixin/components/contentList/contentList.js b/unpackage/dist/dev/mp-weixin/components/contentList/contentList.js
index 417d291..02e0648 100644
--- a/unpackage/dist/dev/mp-weixin/components/contentList/contentList.js
+++ b/unpackage/dist/dev/mp-weixin/components/contentList/contentList.js
@@ -1,8 +1,10 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
 const components_request = require("../request.js");
+const components_formatDate = require("../formatDate.js");
 const common_assets = require("../../common/assets.js");
 const _sfc_main = {
+  inject: ["$global"],
   data() {
     return {
       page: 0,
@@ -27,6 +29,7 @@ const _sfc_main = {
         }
       });
     },
+    formatDate: components_formatDate.formatDate,
     async pkList() {
       const res = await components_request.request({
         url: "pk/pkList",
@@ -38,10 +41,10 @@ const _sfc_main = {
         },
         userInfo: false
       });
-      common_vendor.index.__f__("log", "at components/contentList/contentList.vue:64", res);
+      common_vendor.index.__f__("log", "at components/contentList/contentList.vue:66", res);
       if (res.code === 200) {
         this.list.push(...res.data);
-        common_vendor.index.__f__("log", "at components/contentList/contentList.vue:67", this.list);
+        common_vendor.index.__f__("log", "at components/contentList/contentList.vue:69", this.list);
       }
     },
     onScrollToLower() {
@@ -69,7 +72,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         f: common_vendor.t(item.sex === "1" ? "男" : "女"),
         g: item.sex === "1" ? 1 : "",
         h: item.sex === "2" ? 1 : "",
-        i: common_vendor.t(_ctx.formatDate(item.pkTime)),
+        i: common_vendor.t($options.formatDate(item.pkTime)),
         j: common_vendor.t(item.coin + "K"),
         k: common_vendor.o$1(($event) => $options.goDetail(item)),
         l: "4813d59a-0-" + i0
diff --git a/unpackage/dist/dev/mp-weixin/components/formatDate.js b/unpackage/dist/dev/mp-weixin/components/formatDate.js
index f4a8c03..3d0fa3b 100644
--- a/unpackage/dist/dev/mp-weixin/components/formatDate.js
+++ b/unpackage/dist/dev/mp-weixin/components/formatDate.js
@@ -1,2 +1,13 @@
 "use strict";
+function formatDate(timestamp) {
+  const date = new Date(timestamp * 1e3);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hour = String(date.getHours()).padStart(2, "0");
+  const minute = String(date.getMinutes()).padStart(2, "0");
+  const second = String(date.getSeconds()).padStart(2, "0");
+  return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+}
+exports.formatDate = formatDate;
 //# sourceMappingURL=../../.sourcemap/mp-weixin/components/formatDate.js.map
diff --git a/unpackage/dist/dev/mp-weixin/components/request.js b/unpackage/dist/dev/mp-weixin/components/request.js
index 6fc120c..6bf70b4 100644
--- a/unpackage/dist/dev/mp-weixin/components/request.js
+++ b/unpackage/dist/dev/mp-weixin/components/request.js
@@ -24,15 +24,17 @@ function request(urldata) {
                 }
               });
             } else {
-              this.$global.lastPage = common_vendor.index.page.route;
+              common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
               common_vendor.index.reLaunch({ url: "/pages/UserInformation/UserInformation" });
             }
           } else {
-            this.$global.lastPage = common_vendor.index.page.route;
+            common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
             common_vendor.index.navigateTo({ url: "/pages/login/login" });
           }
         },
         fail: function(res) {
+          common_vendor.index.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
+          common_vendor.index.navigateTo({ url: "/pages/login/login" });
           reject(res);
         }
       });
@@ -45,7 +47,7 @@ function request(urldata) {
         method,
         header,
         success: function(res) {
-          common_vendor.index.__f__("log", "at components/request.js:48", "请求成功2", res);
+          common_vendor.index.__f__("log", "at components/request.js:50", "请求成功2", res);
           resolve(res.data);
         },
         fail: function(res) {
diff --git a/unpackage/dist/dev/mp-weixin/pages/Home/Home.js b/unpackage/dist/dev/mp-weixin/pages/Home/Home.js
index 3ae7597..f98df7c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Home/Home.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Home/Home.js
@@ -14,6 +14,7 @@ const _sfc_main = {
   },
   methods: {
     goAdvertisement() {
+      common_vendor.index.navigateTo({ url: "/pages/pkDetail/pkDetail" });
     }
   },
   components: {
diff --git a/unpackage/dist/dev/mp-weixin/pages/UserInformation/UserInformation.js b/unpackage/dist/dev/mp-weixin/pages/UserInformation/UserInformation.js
index 98168c8..9fa68d5 100644
--- a/unpackage/dist/dev/mp-weixin/pages/UserInformation/UserInformation.js
+++ b/unpackage/dist/dev/mp-weixin/pages/UserInformation/UserInformation.js
@@ -11,7 +11,8 @@ const _sfc_main = {
       name: "",
       id: "",
       info: {},
-      userSig: ""
+      userSig: "",
+      lastPage: ""
     };
   },
   onLoad(option) {
@@ -27,6 +28,15 @@ const _sfc_main = {
         this.userSig = res.data;
       }
     });
+    common_vendor.index.getStorage({
+      key: "lastPage",
+      success: (res) => {
+        this.lastPage = "/" + res.data;
+      },
+      fail: () => {
+        this.lastPage = "/pages/Home/Home";
+      }
+    });
   },
   methods: {
     // 输入昵称
@@ -54,7 +64,7 @@ const _sfc_main = {
       }).then((res) => {
         this.userinfo = res;
       }).catch((err) => {
-        common_vendor.index.__f__("log", "at pages/UserInformation/UserInformation.vue:76", err);
+        common_vendor.index.__f__("log", "at pages/UserInformation/UserInformation.vue:86", err);
       });
       if (this.userinfo) {
         const res = await components_request.request({
@@ -77,8 +87,7 @@ const _sfc_main = {
           common_vendor.index.setStorageSync("userinfo", res.data.info);
           common_vendor.index.hideLoading();
           common_vendor.index.reLaunch({
-            url: this.$global.lastPage || "/pages/Home/Home"
-            // 默认页
+            url: this.lastPage
           });
         } else {
           common_vendor.index.showToast({
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
index f0f3303..d566e91 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -9,7 +9,8 @@ const _sfc_main = {
     return {
       userInfo: {},
       info: {},
-      userSig: ""
+      userSig: "",
+      lastPage: ""
     };
   },
   onLoad() {
@@ -19,6 +20,16 @@ const _sfc_main = {
         this.userInfo = res.userInfo;
       }
     });
+    common_vendor.index.getStorage({
+      key: "lastPage",
+      success: (res) => {
+        this.lastPage = "/" + res.data;
+        common_vendor.index.__f__("log", "at pages/login/login.vue:37", this.lastPage);
+      },
+      fail: () => {
+        this.lastPage = "/pages/Home/Home";
+      }
+    });
   },
   methods: {
     // 获取手机号
@@ -55,9 +66,9 @@ const _sfc_main = {
           common_vendor.index.setStorageSync("userinfo", this.info.data.info);
           common_vendor.index.hideLoading();
           components_TUILogin.TUIlogin(this.info.data.chatInfo.appId, this.info.data.info.id, this.userSig.userSig);
+          common_vendor.index.__f__("log", "at pages/login/login.vue:81", "跳的地址", this.lastPage);
           common_vendor.index.reLaunch({
-            url: this.$global.lastPage || "/pages/Home/Home"
-            // 默认页
+            url: this.lastPage
           });
         }
       } else {
diff --git a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.js b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.js
index 9ab2003..dcc9766 100644
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.js
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.js
@@ -1,6 +1,10 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const components_formatDate = require("../../components/formatDate.js");
+const components_VerifyLogin = require("../../components/VerifyLogin.js");
+const common_assets = require("../../common/assets.js");
 const _sfc_main = {
+  inject: ["$global"],
   data() {
     return {
       item: {}
@@ -10,19 +14,62 @@ const _sfc_main = {
     const eventChannel = this.getOpenerEventChannel();
     eventChannel.on("itemDetail", (data) => {
       this.item = data.item;
-      common_vendor.index.__f__("log", "at pages/pkDetail/pkDetail.vue:30", "接收到的数据:", this.item);
+      common_vendor.index.__f__("log", "at pages/pkDetail/pkDetail.vue:65", "接收到的数据:", this.item);
     });
   },
-  methods: {}
+  methods: {
+    formatDate: components_formatDate.formatDate,
+    Returnfunc() {
+      common_vendor.index.navigateBack({
+        delta: 1
+      });
+    },
+    open() {
+      this.$refs.popup.open("center");
+    },
+    invite() {
+    },
+    close() {
+      this.$refs.popup.close();
+    },
+    openChat() {
+      components_VerifyLogin.VerifyLogin().then(() => {
+        const conversationID = `C2C${this.item.senderId}`;
+        common_vendor.index.redirectTo({
+          url: `/TUIKit/components/TUIChat/index?conversationID=${conversationID}`
+        });
+      });
+    }
+  }
 };
+if (!Array) {
+  const _easycom_uni_popup2 = common_vendor.resolveComponent("uni-popup");
+  _easycom_uni_popup2();
+}
+const _easycom_uni_popup = () => "../../uni_modules/uni-popup/components/uni-popup/uni-popup.js";
+if (!Math) {
+  _easycom_uni_popup();
+}
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.t($data.item.anchorId),
-    b: common_vendor.t($data.item.sex === 1 ? "男" : "女"),
-    c: common_vendor.t($data.item.country),
-    d: common_vendor.t($data.item.coin),
-    e: common_vendor.t($data.item.remark),
-    f: common_vendor.t($data.item.pkTime)
+    a: common_assets._imports_0,
+    b: common_vendor.o$1((...args) => $options.Returnfunc && $options.Returnfunc(...args)),
+    c: common_assets._imports_1,
+    d: common_vendor.t($data.item.anchorId),
+    e: common_vendor.t($data.item.sex === 1 ? "男" : "女"),
+    f: common_vendor.t($data.item.country),
+    g: common_vendor.t($data.item.coin),
+    h: common_vendor.t($options.formatDate($data.item.pkTime)),
+    i: common_vendor.t($data.item.remark),
+    j: common_vendor.o$1(($event) => $options.openChat()),
+    k: common_vendor.o$1(($event) => $options.open()),
+    l: common_vendor.o$1(($event) => $options.invite()),
+    m: common_vendor.o$1(($event) => $options.close()),
+    n: common_vendor.sr("popup", "9639f721-0"),
+    o: common_vendor.p({
+      type: "center",
+      ["border-radius"]: "10px 10px 0 0"
+    })
   };
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-9639f721"]]);
diff --git a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.json b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.json
index 70fa642..4b8350a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.json
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.json
@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "PK详情",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "../../uni_modules/uni-popup/components/uni-popup/uni-popup"
+  }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxml b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxml
index 1052fe4..3e9c502 100644
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxml
@@ -1 +1 @@
-<view class="container data-v-9639f721"><view class="data-v-9639f721">主播名称{{a}}</view><view class="data-v-9639f721">主播性别{{b}}</view><view class="data-v-9639f721"> 国家{{c}}</view><view class="data-v-9639f721">金币{{d}}</view><view class="data-v-9639f721">主播备注{{e}}</view><view class="data-v-9639f721">PK时间{{f}}</view></view>
\ No newline at end of file
+<view class="Navigation data-v-9639f721"><image src="{{a}}" mode="scaleToFill" class="Navigationimg data-v-9639f721"/><image bindtap="{{b}}" src="{{c}}" mode="scaleToFill" class="Return data-v-9639f721"/></view><view class="container data-v-9639f721"><view class="individual data-v-9639f721"><view class="anchor data-v-9639f721"></view><view class="data-v-9639f721"><view class="data-v-9639f721">主播名称{{d}}</view><view class="data-v-9639f721">主播性别{{e}}</view><view class="data-v-9639f721"> 国家{{f}}</view></view></view><view class="data-v-9639f721">金币{{g}}</view><view class="data-v-9639f721">PK时间{{h}}</view><view class="data-v-9639f721">主播备注{{i}}</view><button class="data-v-9639f721" bindtap="{{j}}">聊了个天</button><button class="data-v-9639f721" bindtap="{{k}}">立即邀请PK</button></view><uni-popup wx:if="{{o}}" class="r data-v-9639f721" u-s="{{['d']}}" u-r="popup" u-i="9639f721-0" bind:__l="__l" u-p="{{o}}"><view class="popup-content data-v-9639f721"><view class="popup-title data-v-9639f721">您确定要邀请主播PK吗？</view><view class="popup-btn data-v-9639f721"><button class="invite data-v-9639f721" type="primary" bindtap="{{l}}">邀请</button><button class="cancel data-v-9639f721" type="default" bindtap="{{m}}">取消</button></view></view></uni-popup>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxss b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxss
index 5c45f57..5d82f2a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/pkDetail/pkDetail.wxss
@@ -1,2 +1,74 @@
 
 /* 样式定义 */
+.Navigation.data-v-9639f721 {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 200rpx;
+}
+.Navigationimg.data-v-9639f721 {
+  width: 100%;
+  height: 100%;
+}
+.Return.data-v-9639f721 {
+  position: absolute;
+  left: 60rpx;
+  bottom: 40rpx;
+  width: 60rpx;
+  height: 60rpx;
+}
+.container.data-v-9639f721 {
+  position: absolute;
+  top: 200rpx;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.individual.data-v-9639f721 {
+  display: flex;
+  /* justify-content: center; */
+  margin-top: 50rpx;
+}
+.anchor.data-v-9639f721 {
+  width: 200rpx;
+  height: 200rpx;
+  background-color: rgba(0, 0, 255, 0.369);
+  border-radius: 50%;
+}
+.popup-content.data-v-9639f721 {
+  width: 500rpx;
+  height: 300rpx;
+  background-color: #fff;
+  border-radius: 10px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.popup-title.data-v-9639f721 {
+  font-size: 30rpx;
+  margin-top: 50rpx;
+  text-align: center;
+}
+.popup-btn.data-v-9639f721 {
+  display: flex;
+  justify-content: space-around;
+  margin-top: 50rpx;
+}
+.invite.data-v-9639f721 {
+  width: 200rpx;
+  height: 80rpx;
+  font-size: 30rpx;
+  line-height: 80rpx;
+  border-radius: 20rpx;
+  background-color: #1aff0087;
+}
+.cancel.data-v-9639f721 {
+  width: 200rpx;
+  height: 80rpx;
+  font-size: 30rpx;
+  line-height: 80rpx;
+  margin-left: 30rpx;
+  border-radius: 20rpx;
+}
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
new file mode 100644
index 0000000..de72c0f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
@@ -0,0 +1,397 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const _sfc_main = {
+  name: "uniPopup",
+  components: {},
+  emits: ["change", "maskClick"],
+  props: {
+    // 开启动画
+    animation: {
+      type: Boolean,
+      default: true
+    },
+    // 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+    // message: 消息提示 ; dialog : 对话框
+    type: {
+      type: String,
+      default: "center"
+    },
+    // maskClick
+    isMaskClick: {
+      type: Boolean,
+      default: null
+    },
+    // TODO 2 个版本后废弃属性 ，使用 isMaskClick
+    maskClick: {
+      type: Boolean,
+      default: null
+    },
+    backgroundColor: {
+      type: String,
+      default: "none"
+    },
+    safeArea: {
+      type: Boolean,
+      default: true
+    },
+    maskBackgroundColor: {
+      type: String,
+      default: "rgba(0, 0, 0, 0.4)"
+    },
+    borderRadius: {
+      type: String
+    }
+  },
+  watch: {
+    /**
+     * 监听type类型
+     */
+    type: {
+      handler: function(type) {
+        if (!this.config[type])
+          return;
+        this[this.config[type]](true);
+      },
+      immediate: true
+    },
+    isDesktop: {
+      handler: function(newVal) {
+        if (!this.config[newVal])
+          return;
+        this[this.config[this.type]](true);
+      },
+      immediate: true
+    },
+    /**
+     * 监听遮罩是否可点击
+     * @param {Object} val
+     */
+    maskClick: {
+      handler: function(val) {
+        this.mkclick = val;
+      },
+      immediate: true
+    },
+    isMaskClick: {
+      handler: function(val) {
+        this.mkclick = val;
+      },
+      immediate: true
+    },
+    // H5 下禁止底部滚动
+    showPopup(show) {
+    }
+  },
+  data() {
+    return {
+      duration: 300,
+      ani: [],
+      showPopup: false,
+      showTrans: false,
+      popupWidth: 0,
+      popupHeight: 0,
+      config: {
+        top: "top",
+        bottom: "bottom",
+        center: "center",
+        left: "left",
+        right: "right",
+        message: "top",
+        dialog: "center",
+        share: "bottom"
+      },
+      maskClass: {
+        position: "fixed",
+        bottom: 0,
+        top: 0,
+        left: 0,
+        right: 0,
+        backgroundColor: "rgba(0, 0, 0, 0.4)"
+      },
+      transClass: {
+        backgroundColor: "transparent",
+        borderRadius: this.borderRadius || "0",
+        position: "fixed",
+        left: 0,
+        right: 0
+      },
+      maskShow: true,
+      mkclick: true,
+      popupstyle: "top"
+    };
+  },
+  computed: {
+    getStyles() {
+      let res = { backgroundColor: this.bg };
+      if (this.borderRadius || "0") {
+        res = Object.assign(res, { borderRadius: this.borderRadius });
+      }
+      return res;
+    },
+    isDesktop() {
+      return this.popupWidth >= 500 && this.popupHeight >= 500;
+    },
+    bg() {
+      if (this.backgroundColor === "" || this.backgroundColor === "none") {
+        return "transparent";
+      }
+      return this.backgroundColor;
+    }
+  },
+  mounted() {
+    const fixSize = () => {
+      const {
+        windowWidth,
+        windowHeight,
+        windowTop,
+        safeArea,
+        screenHeight,
+        safeAreaInsets
+      } = common_vendor.index.getWindowInfo();
+      this.popupWidth = windowWidth;
+      this.popupHeight = windowHeight + (windowTop || 0);
+      if (safeArea && this.safeArea) {
+        this.safeAreaInsets = screenHeight - safeArea.bottom;
+      } else {
+        this.safeAreaInsets = 0;
+      }
+    };
+    fixSize();
+  },
+  // TODO vue3
+  unmounted() {
+    this.setH5Visible();
+  },
+  activated() {
+    this.setH5Visible(!this.showPopup);
+  },
+  deactivated() {
+    this.setH5Visible(true);
+  },
+  created() {
+    if (this.isMaskClick === null && this.maskClick === null) {
+      this.mkclick = true;
+    } else {
+      this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick;
+    }
+    if (this.animation) {
+      this.duration = 300;
+    } else {
+      this.duration = 0;
+    }
+    this.messageChild = null;
+    this.clearPropagation = false;
+    this.maskClass.backgroundColor = this.maskBackgroundColor;
+  },
+  methods: {
+    setH5Visible(visible = true) {
+    },
+    /**
+     * 公用方法，不显示遮罩层
+     */
+    closeMask() {
+      this.maskShow = false;
+    },
+    /**
+     * 公用方法，遮罩层禁止点击
+     */
+    disableMask() {
+      this.mkclick = false;
+    },
+    // TODO nvue 取消冒泡
+    clear(e) {
+      e.stopPropagation();
+      this.clearPropagation = true;
+    },
+    open(direction) {
+      if (this.showPopup) {
+        return;
+      }
+      let innerType = ["top", "center", "bottom", "left", "right", "message", "dialog", "share"];
+      if (!(direction && innerType.indexOf(direction) !== -1)) {
+        direction = this.type;
+      }
+      if (!this.config[direction]) {
+        common_vendor.index.__f__("error", "at uni_modules/uni-popup/components/uni-popup/uni-popup.vue:310", "缺少类型：", direction);
+        return;
+      }
+      this[this.config[direction]]();
+      this.$emit("change", {
+        show: true,
+        type: direction
+      });
+    },
+    close(type) {
+      this.showTrans = false;
+      this.$emit("change", {
+        show: false,
+        type: this.type
+      });
+      clearTimeout(this.timer);
+      this.timer = setTimeout(() => {
+        this.showPopup = false;
+      }, 300);
+    },
+    // TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+    touchstart() {
+      this.clearPropagation = false;
+    },
+    onTap() {
+      if (this.clearPropagation) {
+        this.clearPropagation = false;
+        return;
+      }
+      this.$emit("maskClick");
+      if (!this.mkclick)
+        return;
+      this.close();
+    },
+    /**
+     * 顶部弹出样式处理
+     */
+    top(type) {
+      this.popupstyle = this.isDesktop ? "fixforpc-top" : "top";
+      this.ani = ["slide-top"];
+      this.transClass = {
+        position: "fixed",
+        left: 0,
+        right: 0,
+        backgroundColor: this.bg,
+        borderRadius: this.borderRadius || "0"
+      };
+      if (type)
+        return;
+      this.showPopup = true;
+      this.showTrans = true;
+      this.$nextTick(() => {
+        this.showPoptrans();
+        if (this.messageChild && this.type === "message") {
+          this.messageChild.timerClose();
+        }
+      });
+    },
+    /**
+     * 底部弹出样式处理
+     */
+    bottom(type) {
+      this.popupstyle = "bottom";
+      this.ani = ["slide-bottom"];
+      this.transClass = {
+        position: "fixed",
+        left: 0,
+        right: 0,
+        bottom: 0,
+        paddingBottom: this.safeAreaInsets + "px",
+        backgroundColor: this.bg,
+        borderRadius: this.borderRadius || "0"
+      };
+      if (type)
+        return;
+      this.showPoptrans();
+    },
+    /**
+     * 中间弹出样式处理
+     */
+    center(type) {
+      this.popupstyle = "center";
+      this.ani = ["fade"];
+      this.transClass = {
+        position: "fixed",
+        display: "flex",
+        flexDirection: "column",
+        bottom: 0,
+        left: 0,
+        right: 0,
+        top: 0,
+        justifyContent: "center",
+        alignItems: "center",
+        borderRadius: this.borderRadius || "0"
+      };
+      if (type)
+        return;
+      this.showPoptrans();
+    },
+    left(type) {
+      this.popupstyle = "left";
+      this.ani = ["slide-left"];
+      this.transClass = {
+        position: "fixed",
+        left: 0,
+        bottom: 0,
+        top: 0,
+        backgroundColor: this.bg,
+        borderRadius: this.borderRadius || "0",
+        display: "flex",
+        flexDirection: "column"
+      };
+      if (type)
+        return;
+      this.showPoptrans();
+    },
+    right(type) {
+      this.popupstyle = "right";
+      this.ani = ["slide-right"];
+      this.transClass = {
+        position: "fixed",
+        bottom: 0,
+        right: 0,
+        top: 0,
+        backgroundColor: this.bg,
+        borderRadius: this.borderRadius || "0",
+        display: "flex",
+        flexDirection: "column"
+      };
+      if (type)
+        return;
+      this.showPoptrans();
+    },
+    showPoptrans() {
+      this.$nextTick(() => {
+        this.showPopup = true;
+        this.showTrans = true;
+      });
+    }
+  }
+};
+if (!Array) {
+  const _easycom_uni_transition2 = common_vendor.resolveComponent("uni-transition");
+  _easycom_uni_transition2();
+}
+const _easycom_uni_transition = () => "../../../uni-transition/components/uni-transition/uni-transition.js";
+if (!Math) {
+  _easycom_uni_transition();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: $data.showPopup
+  }, $data.showPopup ? common_vendor.e({
+    b: $data.maskShow
+  }, $data.maskShow ? {
+    c: common_vendor.o$1($options.onTap),
+    d: common_vendor.p({
+      name: "mask",
+      ["mode-class"]: "fade",
+      styles: $data.maskClass,
+      duration: $data.duration,
+      show: $data.showTrans
+    })
+  } : {}, {
+    e: common_vendor.s($options.getStyles),
+    f: common_vendor.n($data.popupstyle),
+    g: common_vendor.o$1((...args) => $options.clear && $options.clear(...args)),
+    h: common_vendor.o$1($options.onTap),
+    i: common_vendor.p({
+      ["mode-class"]: $data.ani,
+      name: "content",
+      styles: $data.transClass,
+      duration: $data.duration,
+      show: $data.showTrans
+    }),
+    j: common_vendor.o$1((...args) => $options.touchstart && $options.touchstart(...args)),
+    k: common_vendor.n($data.popupstyle),
+    l: common_vendor.n($options.isDesktop ? "fixforpc-z-index" : "")
+  }) : {});
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+wx.createComponent(Component);
+//# sourceMappingURL=../../../../../.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json
new file mode 100644
index 0000000..3a0615f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-transition": "../../../uni-transition/components/uni-transition/uni-transition"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
new file mode 100644
index 0000000..1cc782d
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
@@ -0,0 +1 @@
+<view wx:if="{{a}}" class="{{['uni-popup', k, l]}}"><view bindtouchstart="{{j}}"><uni-transition wx:if="{{b}}" key="1" bindclick="{{c}}" u-i="3309e7c7-0" bind:__l="__l" u-p="{{d}}"/><uni-transition wx:if="{{i}}" u-s="{{['d']}}" key="2" bindclick="{{h}}" u-i="3309e7c7-1" bind:__l="__l" u-p="{{i}}"><view style="{{e}}" class="{{['uni-popup__wrapper', f]}}" bindtap="{{g}}"><slot/></view></uni-transition></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss
new file mode 100644
index 0000000..4014708
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss
@@ -0,0 +1,47 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-popup {
+  position: fixed;
+  z-index: 99;
+}
+.uni-popup.top, .uni-popup.left, .uni-popup.right {
+  top: 0;
+}
+.uni-popup .uni-popup__wrapper {
+  display: block;
+  position: relative;
+  /* iphonex 等安全区设置，底部安全区适配 */
+}
+.uni-popup .uni-popup__wrapper.left, .uni-popup .uni-popup__wrapper.right {
+  padding-top: 0;
+  flex: 1;
+}
+.fixforpc-z-index {
+  z-index: 999;
+}
+.fixforpc-top {
+  top: 0;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..31ac06c
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,116 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+class MPAnimation {
+  constructor(options, _this) {
+    this.options = options;
+    this.animation = common_vendor.index.createAnimation({
+      ...options
+    });
+    this.currentStepAnimates = {};
+    this.next = 0;
+    this.$ = _this;
+  }
+  _nvuePushAnimates(type, args) {
+    let aniObj = this.currentStepAnimates[this.next];
+    let styles = {};
+    if (!aniObj) {
+      styles = {
+        styles: {},
+        config: {}
+      };
+    } else {
+      styles = aniObj;
+    }
+    if (animateTypes1.includes(type)) {
+      if (!styles.styles.transform) {
+        styles.styles.transform = "";
+      }
+      let unit = "";
+      if (type === "rotate") {
+        unit = "deg";
+      }
+      styles.styles.transform += `${type}(${args + unit}) `;
+    } else {
+      styles.styles[type] = `${args}`;
+    }
+    this.currentStepAnimates[this.next] = styles;
+  }
+  _animateRun(styles = {}, config = {}) {
+    let ref = this.$.$refs["ani"].ref;
+    if (!ref)
+      return;
+    return new Promise((resolve, reject) => {
+      nvueAnimation.transition(ref, {
+        styles,
+        ...config
+      }, (res) => {
+        resolve();
+      });
+    });
+  }
+  _nvueNextAnimate(animates, step = 0, fn) {
+    let obj = animates[step];
+    if (obj) {
+      let {
+        styles,
+        config
+      } = obj;
+      this._animateRun(styles, config).then(() => {
+        step += 1;
+        this._nvueNextAnimate(animates, step, fn);
+      });
+    } else {
+      this.currentStepAnimates = {};
+      typeof fn === "function" && fn();
+      this.isEnd = true;
+    }
+  }
+  step(config = {}) {
+    this.animation.step(config);
+    return this;
+  }
+  run(fn) {
+    this.$.animationData = this.animation.export();
+    this.$.timer = setTimeout(() => {
+      typeof fn === "function" && fn();
+    }, this.$.durationTime);
+  }
+}
+const animateTypes1 = [
+  "matrix",
+  "matrix3d",
+  "rotate",
+  "rotate3d",
+  "rotateX",
+  "rotateY",
+  "rotateZ",
+  "scale",
+  "scale3d",
+  "scaleX",
+  "scaleY",
+  "scaleZ",
+  "skew",
+  "skewX",
+  "skewY",
+  "translate",
+  "translate3d",
+  "translateX",
+  "translateY",
+  "translateZ"
+];
+const animateTypes2 = ["opacity", "backgroundColor"];
+const animateTypes3 = ["width", "height", "left", "right", "top", "bottom"];
+animateTypes1.concat(animateTypes2, animateTypes3).forEach((type) => {
+  MPAnimation.prototype[type] = function(...args) {
+    this.animation[type](...args);
+    return this;
+  };
+});
+function createAnimation(option, _this) {
+  if (!_this)
+    return;
+  clearTimeout(_this.timer);
+  return new MPAnimation(option, _this);
+}
+exports.createAnimation = createAnimation;
+//# sourceMappingURL=../../../../../.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js.map
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
new file mode 100644
index 0000000..4506a70
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
@@ -0,0 +1,269 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const uni_modules_uniTransition_components_uniTransition_createAnimation = require("./createAnimation.js");
+const _sfc_main = {
+  name: "uniTransition",
+  emits: ["click", "change"],
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    },
+    modeClass: {
+      type: [Array, String],
+      default() {
+        return "fade";
+      }
+    },
+    duration: {
+      type: Number,
+      default: 300
+    },
+    styles: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    customClass: {
+      type: String,
+      default: ""
+    },
+    onceRender: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      isShow: false,
+      transform: "",
+      opacity: 1,
+      animationData: {},
+      durationTime: 300,
+      config: {}
+    };
+  },
+  watch: {
+    show: {
+      handler(newVal) {
+        if (newVal) {
+          this.open();
+        } else {
+          if (this.isShow) {
+            this.close();
+          }
+        }
+      },
+      immediate: true
+    }
+  },
+  computed: {
+    // 生成样式数据
+    stylesObject() {
+      let styles = {
+        ...this.styles,
+        "transition-duration": this.duration / 1e3 + "s"
+      };
+      let transform = "";
+      for (let i in styles) {
+        let line = this.toLine(i);
+        transform += line + ":" + styles[i] + ";";
+      }
+      return transform;
+    },
+    // 初始化动画条件
+    transformStyles() {
+      return "transform:" + this.transform + ";opacity:" + this.opacity + ";" + this.stylesObject;
+    }
+  },
+  created() {
+    this.config = {
+      duration: this.duration,
+      timingFunction: "ease",
+      transformOrigin: "50% 50%",
+      delay: 0
+    };
+    this.durationTime = this.duration;
+  },
+  methods: {
+    /**
+     *  ref 触发 初始化动画
+     */
+    init(obj = {}) {
+      if (obj.duration) {
+        this.durationTime = obj.duration;
+      }
+      this.animation = uni_modules_uniTransition_components_uniTransition_createAnimation.createAnimation(Object.assign(this.config, obj), this);
+    },
+    /**
+     * 点击组件触发回调
+     */
+    onClick() {
+      this.$emit("click", {
+        detail: this.isShow
+      });
+    },
+    /**
+     * ref 触发 动画分组
+     * @param {Object} obj
+     */
+    step(obj, config = {}) {
+      if (!this.animation)
+        return;
+      for (let i in obj) {
+        try {
+          if (typeof obj[i] === "object") {
+            this.animation[i](...obj[i]);
+          } else {
+            this.animation[i](obj[i]);
+          }
+        } catch (e) {
+          common_vendor.index.__f__("error", "at uni_modules/uni-transition/components/uni-transition/uni-transition.vue:148", `方法 ${i} 不存在`);
+        }
+      }
+      this.animation.step(config);
+      return this;
+    },
+    /**
+     *  ref 触发 执行动画
+     */
+    run(fn) {
+      if (!this.animation)
+        return;
+      this.animation.run(fn);
+    },
+    // 开始过度动画
+    open() {
+      clearTimeout(this.timer);
+      this.transform = "";
+      this.isShow = true;
+      let { opacity, transform } = this.styleInit(false);
+      if (typeof opacity !== "undefined") {
+        this.opacity = opacity;
+      }
+      this.transform = transform;
+      this.$nextTick(() => {
+        this.timer = setTimeout(() => {
+          this.animation = uni_modules_uniTransition_components_uniTransition_createAnimation.createAnimation(this.config, this);
+          this.tranfromInit(false).step();
+          this.animation.run(() => {
+            this.transform = "";
+            this.opacity = opacity || 1;
+          });
+          this.$emit("change", {
+            detail: this.isShow
+          });
+        }, 20);
+      });
+    },
+    // 关闭过度动画
+    close(type) {
+      if (!this.animation)
+        return;
+      this.tranfromInit(true).step().run(() => {
+        this.isShow = false;
+        this.animationData = null;
+        this.animation = null;
+        let { opacity, transform } = this.styleInit(false);
+        this.opacity = opacity || 1;
+        this.transform = transform;
+        this.$emit("change", {
+          detail: this.isShow
+        });
+      });
+    },
+    // 处理动画开始前的默认样式
+    styleInit(type) {
+      let styles = {
+        transform: ""
+      };
+      let buildStyle = (type2, mode) => {
+        if (mode === "fade") {
+          styles.opacity = this.animationType(type2)[mode];
+        } else {
+          styles.transform += this.animationType(type2)[mode] + " ";
+        }
+      };
+      if (typeof this.modeClass === "string") {
+        buildStyle(type, this.modeClass);
+      } else {
+        this.modeClass.forEach((mode) => {
+          buildStyle(type, mode);
+        });
+      }
+      return styles;
+    },
+    // 处理内置组合动画
+    tranfromInit(type) {
+      let buildTranfrom = (type2, mode) => {
+        let aniNum = null;
+        if (mode === "fade") {
+          aniNum = type2 ? 0 : 1;
+        } else {
+          aniNum = type2 ? "-100%" : "0";
+          if (mode === "zoom-in") {
+            aniNum = type2 ? 0.8 : 1;
+          }
+          if (mode === "zoom-out") {
+            aniNum = type2 ? 1.2 : 1;
+          }
+          if (mode === "slide-right") {
+            aniNum = type2 ? "100%" : "0";
+          }
+          if (mode === "slide-bottom") {
+            aniNum = type2 ? "100%" : "0";
+          }
+        }
+        this.animation[this.animationMode()[mode]](aniNum);
+      };
+      if (typeof this.modeClass === "string") {
+        buildTranfrom(type, this.modeClass);
+      } else {
+        this.modeClass.forEach((mode) => {
+          buildTranfrom(type, mode);
+        });
+      }
+      return this.animation;
+    },
+    animationType(type) {
+      return {
+        fade: type ? 0 : 1,
+        "slide-top": `translateY(${type ? "0" : "-100%"})`,
+        "slide-right": `translateX(${type ? "0" : "100%"})`,
+        "slide-bottom": `translateY(${type ? "0" : "100%"})`,
+        "slide-left": `translateX(${type ? "0" : "-100%"})`,
+        "zoom-in": `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+        "zoom-out": `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+      };
+    },
+    // 内置动画类型与实际动画对应字典
+    animationMode() {
+      return {
+        fade: "opacity",
+        "slide-top": "translateY",
+        "slide-right": "translateX",
+        "slide-bottom": "translateY",
+        "slide-left": "translateX",
+        "zoom-in": "scale",
+        "zoom-out": "scale"
+      };
+    },
+    // 驼峰转中横线
+    toLine(name) {
+      return name.replace(/([A-Z])/g, "-$1").toLowerCase();
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: $data.isShow,
+    b: $data.animationData,
+    c: common_vendor.n($props.customClass),
+    d: common_vendor.s($options.transformStyles),
+    e: common_vendor.o$1((...args) => $options.onClick && $options.onClick(...args))
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+wx.createComponent(Component);
+//# sourceMappingURL=../../../../../.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml
new file mode 100644
index 0000000..8fa2f75
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml
@@ -0,0 +1 @@
+<view hidden="{{!a}}" ref="ani" animation="{{b}}" class="{{c}}" style="{{d}}" bindtap="{{e}}"><slot></slot></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxss
new file mode 100644
index 0000000..e69de29