diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index c410241..0e0969d 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -1,7 +1,23 @@
-
- {{popurl}}
-
+
@@ -13,8 +29,17 @@
// popurl:''
// }
// },
- emits:["open","close"],
+ emits: ["input", "open", "close"],
props:{
+ // true 组件显示 false 组件隐藏
+ value: {
+ Type: Boolean,
+ default: false
+ },
+ modelValue: {
+ Type: Boolean,
+ default: false
+ },
// 需要打开的地址
popurl:{
Type:String,
@@ -23,7 +48,23 @@
isshow:{
Type:Boolean,
defult:false
- }
+ },
+ // 是否显示右上角关闭按钮
+ showClose: {
+ Type: Boolean,
+ default: true
+ },
+ // 关闭的x 图像
+ closeImage: {
+ Type: String,
+ default: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAEyUlEQVR42sSZeWwNURTGp4OqtBo7sSXELragdkpQsRRJ1Zr4hyJiJ9YgxNIg1qANiT+E1i5IY0kVVWtQEbuEKLFGUSH27/ANN5PXmTvzupzkl/tm8t6b7517lnvvC0lKSjJ8WmnQAUSDFqABqALKgl8gD7wE90E2SAeXwFf1SxISErQeVtKHwCgwFsSDSIf3hYFKoCkYDBaDdyAViHdueHmoF6FtwDLQ23b/E7gM7oIcejIERIDaoBFoC8qA8mA8SQNz6W1XC9GY+nCQCCYAk/c+gF0gBZwH312+IxR0BCPBUIaH2A+wHsxHCHxx+gLT5QGN6a2JfG8uvVCDws9oiDQYlxkMGfHyQvARlADTwcXk5OT6foV2kS8ATXidymlcyen1a/Jjl9IJh3hPkjELYqO8Cu0KjjNZvtETw5jFBWXPmGSTGQKSeOn5iQ0kVLL0CINfPNcPbDMKyRCbGzEMBJ+ZD8cChYFdqGTqfsWT8otPGoVsEHsMwxDFs3shNsxJ6BrQ0Po8OGUUkVHsNCVml+cntB1jUWwn2GEUsTEMrASbDK+2CCQ0kYX6nfLLisMmKqUr0S60M+jG10vAm+JSCa8+x7CKlzHwaktV6DiObzUzPJIxFO1BQ12wGtTReO9GetVgY/kjNJzZbcWmTjHfxw51AsRqvL8eOAtmsJuFu3g1l+1ZLB5eDTVZ3K0P7tL0TkWOpSg61kVkBtuuNRthGs+wtJST5aQI7cEbkkRXNYVKgX6kIdYuUhYzMQwxN8tiExCLFqHNeSF9/aem0BzGp5PYQCJ7c/Gsk1RfuSD6U1dNpcDf9ZigTmKbMRZ9iVTsHscGJluW2FMf1SSQWGnBmaB6kCJVTVVNJZE++Cx9drEllS1KMCINpURFmEbBWA63Fz9s95cGIdJgp/zXmT4pZcOvSUzuZttTbblmnc3PIjjmidDXvKgdhMh0JdbzuCjWrbNOVovjS5P7bkPJ/mBESkz2BO0166ybNeJ431S2q+01NntuIq3E0amzjiZtk9tssWyTDzO4525bACK9NAUn68TtkNhpEXpOSagRml+S6iLSSeweHv242Qhl13rRyvoDvDlKyTQny/ZQJ+1iH7vVbEx7OR5UiKVIO7VicgvHCtwrudloMIV7/0uadVYW57O4Wvvi8v4pymlKkrpwvsDeLLZAY2pkwbAB3PSQfC+4cH7l4k1ZH8zkZRq8ecO+Z5rN40JJqnXFuGfaxPCTLjcn0OZOpnArXw8HY4paIbw5CcMgXq6HN2/mt6+XGLrN15tBryIUGavMpCTrfKcDCKkAceA9S8nhAOehhSUyhXpkBxxnP4YM1InugP7cBkjBPcqVUWFYCEROxXiQz5JlXV+IfKh7mpfJac+lZ6V87QXVClBkTc7YWsWTPSDyitfzUTlJlj8TbvE6jluDOdwZ+jX57GLO3ADeuyZrDYi86vV81FD2UVGsmT+5Zl0BnkhoseOEaogL46pqO4v/IqUEyalIR4h85BgjHv6+aUWRMbb7EstX6O0cpT1Gco0ry8fWygLDMjmDnQeBt3Qe7uVfkeugDwVLcsVzGsuwLXbV+I63XNAkG5r/hvgRqgqWs6pJPKrsbvz/Q6yyun0w/h6lP+BnzrCpfPMT2L8FGAA7k1GZ/vnaqAAAAABJRU5ErkJggg=="
+ },
+ },
+ created() {
+ let that = this;
+ if (that.getValue()) {
+ that.open();
+ }
},
watch:{
popurl(){
@@ -32,27 +73,201 @@
return that.popurl
}
},
- // onLoad(e) {
- // console.log(e);
- // if(e){
- // this.popurl =e
- // }
- // }
- created(e) {
- let that = this
- that.open(e)
- // console.log("popup",e)
- //this.popurl =
- },
mounted() {},
methods: {
open(e) {
console.log("zujian popup open",e)
- }
+ },
+ getValue() {
+ // #ifndef VUE3
+ return this.value;
+ // #endif
+
+ // #ifdef VUE3
+ return this.modelValue;
+ // #endif
+ },
+
+ // 监听 - 弹出层收起
+ close(s) {
+ let that = this;
+ if (new Date().getTime() - that.openTime < 400) {
+ return false;
+ }
+ if (s == "mask") {
+ if (that.maskCloseAble !== false) {
+ that.$emit("input", false);
+ that.$emit("close", "mask");
+ that.$emit("update:modelValue", false);
+ }
+ } else {
+ that.$emit("input", false);
+ that.$emit("close", "close");
+ that.$emit("update:modelValue", false);
+ }
+ },
},
}
-
\ No newline at end of file
diff --git a/components/wh-popup/index.vue b/components/wh-popup/index.vue
index 9c06151..acb36da 100644
--- a/components/wh-popup/index.vue
+++ b/components/wh-popup/index.vue
@@ -48,14 +48,7 @@
-
- 数量
-
-
-
-
-
+
diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue
index 8de9fc6..f6af081 100644
--- a/pages/reg/reg.vue
+++ b/pages/reg/reg.vue
@@ -50,9 +50,9 @@
-
+
-
+
@@ -61,13 +61,13 @@
import store from '@/store'
import * as LoginApi from '@/api/login'
import * as Verify from '@/utils/verify'
- // import Popup from '@/components/popup/popup'
+ import Popup from '@/components/popup/popup'
import whpop from './components/WhPopup'
export default {
components: {
// nothing
- // "popup":Popup
+ "popup":Popup,
whpop
},