diff --git a/ldcake-ui/components/c-watermark/c-watermark.vue b/ldcake-ui/components/c-watermark/c-watermark.vue
new file mode 100644
index 0000000000000000000000000000000000000000..486e3791eb46686d9b3541c406c840c7fe74e3ba
--- /dev/null
+++ b/ldcake-ui/components/c-watermark/c-watermark.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ldcake-ui/package.json b/ldcake-ui/package.json
index 8461c25a9c7810f48506e30a2d2a5613d59cdaf9..0ef6dbbdadb6e1c936aad5dda1c2faca1d959435 100644
--- a/ldcake-ui/package.json
+++ b/ldcake-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ldcake-ui",
- "version": "1.0.17",
+ "version": "1.0.18",
"description": "基于uni-app的UI组件库",
"main": "index.js",
"scripts": {
diff --git a/mixins/common.js b/mixins/common.js
index 56682ebd41423843099566ad09e629d046f8baf6..8772a533c8eda84a105b4998e56e0239977b7860 100644
--- a/mixins/common.js
+++ b/mixins/common.js
@@ -30,6 +30,10 @@ export default {
name: '信号(signal)',
url: '/pages/components/signal/signal'
},
+ {
+ name: '水印(watermark)',
+ url: '/pages/components/watermark/watermark'
+ },
],
toolList: [
{
diff --git a/pages.json b/pages.json
index 415a8df39bfab5f57423fa06c30dfad83f15feb3..35f6cfd012b95e0a65050bd020c2f6f8b7c96fa6 100644
--- a/pages.json
+++ b/pages.json
@@ -81,6 +81,15 @@
}
}
+ ,{
+ "path" : "pages/components/watermark/watermark",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/components/captcha/captcha.vue b/pages/components/captcha/captcha.vue
index 48c611daa0e4da08d380efa470e018bf138bee8a..a48603f5872a56e7fa64579cc4d563072c96b0d6 100644
--- a/pages/components/captcha/captcha.vue
+++ b/pages/components/captcha/captcha.vue
@@ -20,10 +20,12 @@
second: 20
}
},
- onLoad({title}) {
+ onLoad({
+ title
+ }) {
this.setNavigationBarTitle(title)
},
- methods:{
+ methods: {
handleSend(val) {
this.isStart = val
}
@@ -32,6 +34,5 @@
+
diff --git a/pages/components/watermark/watermark.vue b/pages/components/watermark/watermark.vue
new file mode 100644
index 0000000000000000000000000000000000000000..212924a43b5ef3039b67c0202839f346e6166dfe
--- /dev/null
+++ b/pages/components/watermark/watermark.vue
@@ -0,0 +1,24 @@
+
+
+
+
+ 演示效果
+
+ 页面背景水印效果
+
+
+
+
+
+
+
+
+