From 4cd369bc1c26ebdecb3d00913ab5626d3d176a4d Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Mon, 9 Oct 2023 15:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/clock/clock - 副本.vue | 1197 +++++++++++++++++ pages/clock/clock.vue | 88 +- pages/eBook/bookContent - 副本.vue | 802 +++++++++++ pages/talkBook/talkBookDetail.vue | 8 + static/haoyou.png | Bin 0 -> 3063 bytes static/quan.png | Bin 0 -> 8627 bytes uni_modules/uni-popup/changelog.md | 68 + .../components/uni-popup-dialog/keypress.js | 45 + .../uni-popup-dialog/uni-popup-dialog.vue | 275 ++++ .../uni-popup-message/uni-popup-message.vue | 143 ++ .../uni-popup-share/uni-popup-share.vue | 189 +++ .../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.vue | 473 +++++++ uni_modules/uni-popup/package.json | 87 ++ uni_modules/uni-popup/readme.md | 17 + 20 files changed, 3462 insertions(+), 30 deletions(-) create mode 100644 pages/clock/clock - 副本.vue create mode 100644 pages/eBook/bookContent - 副本.vue create mode 100644 static/haoyou.png create mode 100644 static/quan.png 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.vue create mode 100644 uni_modules/uni-popup/package.json create mode 100644 uni_modules/uni-popup/readme.md diff --git a/pages/clock/clock - 副本.vue b/pages/clock/clock - 副本.vue new file mode 100644 index 0000000..56b86e0 --- /dev/null +++ b/pages/clock/clock - 副本.vue @@ -0,0 +1,1197 @@ + + + + + \ No newline at end of file diff --git a/pages/clock/clock.vue b/pages/clock/clock.vue index 20a4089..6368ee1 100644 --- a/pages/clock/clock.vue +++ b/pages/clock/clock.vue @@ -134,6 +134,11 @@ 今日签到随想 + + @@ -166,7 +171,7 @@ + @click="addTextShow = true">说点什么 @@ -186,6 +191,7 @@ export default { data() { return { + placeholder: '开始输入...', dayCurrent: 0, // 载入页面时的显示页数 showBack: false, currentIndex: 0, @@ -264,6 +270,17 @@ ...mapState(['userInfo']) }, methods: { + onEditorReady() { + // #ifdef MP-BAIDU + this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor'); + // #endif + + // #ifdef APP-PLUS || H5 ||MP-WEIXIN + uni.createSelectorQuery().select('#editor').context((res) => { + this.editorCtx = res.context + }).exec() + // #endif + }, // 获取书籍信息 getBookInfo() { this.$http @@ -513,7 +530,7 @@ }, // 快捷签到 kuickSign() { - + if (!this.taskInfo.id) { uni.showToast({ title: '当天未发布打卡任务,不可签到哦', @@ -521,36 +538,35 @@ }) return false } - let data = { - "bookId": this.bookid, - "userId": this.userInfo.id, - "tid": this.taskInfo.id, - "days": this.currentDay + let data = { + "bookId": this.bookid, + "userId": this.userInfo.id, + "tid": this.taskInfo.id, + "days": this.currentDay + } + $http.request({ + url: 'book/clockinPunch/save', + method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + data, + header: { //默认 无 说明：请求头 + 'Content-Type': 'application/json' + }, + }).then(res => { + if (res.code == 0) { + //console.log(res, '快捷签到') + uni.showToast({ + title: '签到成功', + icon: 'success' + }) + this.addTextShow = false + this.formData.content = '' + this.formData.images = [] + this.getmySign() + this.getAllSign(this.taskInfo) } - $http.request({ - url: 'book/clockinPunch/save', - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - data, - header: { //默认 无 说明：请求头 - 'Content-Type': 'application/json' - }, - }).then(res => { - if (res.code == 0) { - //console.log(res, '快捷签到') - uni.showToast({ - title: '签到成功', - icon: 'success' - }) - return false - this.addTextShow = false - this.formData.content = '' - this.formData.images = [] - this.getmySign() - this.getAllSign(this.taskInfo) - } - }); - + }); + }, // 说点什么 goToSign() { @@ -715,6 +731,18 @@ diff --git a/pages/talkBook/talkBookDetail.vue b/pages/talkBook/talkBookDetail.vue index 539a324..05a2810 100644 --- a/pages/talkBook/talkBookDetail.vue +++ b/pages/talkBook/talkBookDetail.vue @@ -96,6 +96,14 @@ if (res.code == 0) { console.log(res, 'res') this.bookInfo = res.book + + if(!this.bookInfo.author || this.bookInfo.author == null){ + this.bookInfo.author = { + 'authorName' : '未知' + } + console.log(this.bookInfo.author.authorName,'this.bookInfo.author.authorName') + } + //console.log(this.bookInfo.author.authorName,'this.bookInfo.author.authorName') this.voicesImg = res.book.images // this.bookInfo.name = res.book.name this.isBuy = res.book.isBuy diff --git a/static/haoyou.png b/static/haoyou.png new file mode 100644 index 0000000000000000000000000000000000000000..3b1575e98f99da29021936f1e18e1ab8310f0ed1 GIT binary patch literal 3063 zcmcJRM^qDR7KXnx2)&9BBSa9v1eKgH^n z?=2sHncN9Fq9ij1Pd9S-4u4!L9FuhugCU6CN8!UaTu;aDRcx(iP7mN-IJzWipq)6-pB(aB!$KPb9ubKyLr9o+|;W}H@98btA0^Axo0HG!R zaf2ebSi<2RU?omdd2{^CJ4ff@pZ@v?P~}0dwUg;T4Rs@vYq6;|CK#K3;VXuFd-ODy zmJ=B`1nAiO$_CXu)TTM13^6LjMSMMa->pY%E}?KD?>q-J%zhyN-L)kdvmS5v(^+rc z{c!Qj*U{*={=e*6y@29OhQTTl!Y(&fAn7T(hzN4S!18j~t4bNXT7|~Uu+E4iMife& z^4yh?zDT@fJ2<~JQ`x4v_~67-AtHno7d*ZdgPd$szU()FEL88f|BbjCAr7KeTWp~l z4NK)3-1S5+vekO_3q6<+;O*I7o^Kc~PQ4EIdjL2OG!$&V%%?LD;HF`d>bJp}$TJ_| zk$oFYKVLb-KR=r$0Zy;F|0?j_Zjr_zfB5yQtD7j;jgm4!Z@~BM2{$NG8RFpeb$?ymqEomnAr(VL<1%7i0 z;8xDr(cmbnEqnbt3LYP1>Se+3=_Fu_-*A1LI#(M@ zJxbWn2t$12m#e6G-zBLd!PyoBW!kisrM}kX0v)S+NWnzqe%T^asABh=Q?5zgxfM9X z{^Q!3*Ij|d)OSAb@DwZzpOp~o=sDYEe=R;1cr9)i{EF9QH&1ibO*eaA!cA*MNtBz4 zT;xn$-U~*Z=R6FjO38k=EUv@|fd_&6q`8-}D~0E=E(2k?>^j~^o><9n7NuF`XzAOt zYRf%>Q&L#+483=naUk_zMP3ZFKdL{vd@b!u$AMi!q^Ry2ly+TX)&w^Rf~k|Xh_3p? zxM7*X%h+C^ZC+e;VN^GJgX7Nw;=83O5tdJX zwueE@O``f^Al}X1dt$LA*t@N_tk9=p;v@TK5{xS0BNoEPrXxCr z=nThvNcDY#V;i~P>h1GUZTnwaJ7v9hI?^i)(5I+gS5Gj`<#yp=G#IF&FkiEWwVVHq z?D+i5*7>OBKTmwu#DEIZM$(hi6bPkCt5V7FtMz-ECea}JmxVs#HlDielivIH2Fn#E zl(X|zW%o&ItyMw*jLO*jUDNB(@dO(^N=I zyzJao&hf-~_O8-uwjkrQP$k-fH;X>h`pv8lav=`{xlQ9uOy9l>yNDeKMQ= z^2~a6XUNk|OHDyCukhNVlOjmXjOrK4R|JsKwcvu(rgEl~AD3rRf=n(cnUA4ec1 zrv*N=HkB*ie-b+ll#=BE!Vy*p*_x zKJCNa;@1%1jP(e4DYX$o`@KIXQq-S4WjBc+QJ{f!6_ded@&BJP6{0VS_AFeqWHq)FrOA`&q|H4bv568ps zT(Z;PwxU1;^h^=>)aY=Y z7*B|$VPPN=tvaH5c|!)5``!)W4U^a235NYyT<;&ERluukT9C{)C2(Dty$fC)#+|cQ z7lB{wx8KJW?gn1@(PwV*qcZ%nl2RA7;8Hdbl23}^Qr7U$sIYnMR!*k@z<$QXV9X5% z7Wf6t@+oAmsdG-^Owa1?tg_yNw1z`^kL(*0CN#pau(*pM+T{SbYs#NsJpNV=#Hp2!RChmIQtrH~22%X;U@mh$whs`09JSgt@_ zsTpTuIHP>wlg+?i<}8o!W1wwFESn4>p5yv*?t?*TK@fO0b$IBSx(DLtH#wJw@ZY9` zZiK!Wo0u|OsX1^cP!)n#%(v7ngr?=-f6<(df-DZ`V3!(C3rAU8HZ~2{anCep&)H}j z1&)c{+T>Tu;ZKrEs_02#4M9fIDENXjYkV>@FOOAp`ht+HdDEQ*{gYp<1b`H8`Hk1_ z@g;9nS@Lt$^4}_^4PXulKCQNe115Duj~8@K^l%Ob9`0{3tbM8C1yQ%^cV9H^z4;+K z+Bj-ttfA?XQ}M>s=gYd4vUqL>N>6vSz4R67O=<1He+vBgXqGxZQqXs9V=l|JcNF2r zONxx0yNV#m=_I?rbBd$2gGwW&he`>NxoVzw*{4W*$81+zXZUH)-A8Yljx`Oc1o)v4 zZ=1O>VPhyD0jVx^F^%poS|FFrFoDVQ8=vMT{)w-d9l%;%OO2|8Bom);hq9I5DhXO- zzCR>vc!JL!hKbcWw6ioPkA~cqQ()U?9diXm&n!NC{-ddS^09w^@>!4~Kk$1Q1^67j g`v0o_|E_&bzV)qclw7ODL7@kF+D62eS`HEa0UTVQc>n+a literal 0 HcmV?d00001 diff --git a/static/quan.png b/static/quan.png new file mode 100644 index 0000000000000000000000000000000000000000..52a8f3d6d640cc6ef778cd0a8b86cb729ec0c7d6 GIT binary patch literal 8627 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 FV1m5LTps`c literal 0 HcmV?d00001 diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md new file mode 100644 index 0000000..bc59f07 --- /dev/null +++ b/uni_modules/uni-popup/changelog.md @@ -0,0 +1,68 @@ +## 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..b5eee79 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue @@ -0,0 +1,275 @@ + + + + + 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 @@ + + + + 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..01b34d6 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue @@ -0,0 +1,189 @@ + + + + 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.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue new file mode 100644 index 0000000..54afee2 --- /dev/null +++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue @@ -0,0 +1,473 @@ + + + + diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json new file mode 100644 index 0000000..f40556b --- /dev/null +++ b/uni_modules/uni-popup/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-popup", + "displayName": "uni-popup 弹出层", + "version": "1.8.3", + "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" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md new file mode 100644 index 0000000..fdad4b3 --- /dev/null +++ b/uni_modules/uni-popup/readme.md @@ -0,0 +1,17 @@ + + +## Popup 弹出层 +> **组件名：uni-popup** +> 代码块： `uPopup` +> 关联组件：`uni-transition` + + +弹出层组件，在应用中弹出一个消息提示窗口、提示框等 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 + + + + +