diff --git a/miniprogram/app.json b/miniprogram/app.json
index 4ddeeec..87fa4fc 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -3,7 +3,7 @@
"pages/index/index",
"pages/shape/index",
"pages/debug/debug",
- "pages/shapePrint/index"
+ "demoPages/shapePrint/index"
],
"window": {},
"style": "v2",
diff --git a/miniprogram/components/word-picker/word-picker.less b/miniprogram/components/word-picker/word-picker.less
index 05706a7..4860914 100644
--- a/miniprogram/components/word-picker/word-picker.less
+++ b/miniprogram/components/word-picker/word-picker.less
@@ -1,92 +1,92 @@
-.word-picker {
+.word-picker-content {
padding: 28rpx;
background-color: #ffffff;
+ overflow: hidden;
+}
- .word-picker-title {
- font-size: 32rpx;
- color: #141414;
- font-weight: bold;
- text-align: center;
- margin-bottom: 28rpx;
- }
+.word-picker-title {
+ font-size: 32rpx;
+ color: #141414;
+ font-weight: bold;
+ text-align: center;
+ margin-bottom: 28rpx;
+}
- .nav-class {
- // background-color: red;
- // width: 890rpx;
- }
+.nav-class {
+ // background-color: red;
+ // width: 890rpx;
+}
- .tab-class {
- // width: 220rpx;
- // flex-basis: auto !important;
- // display: inline-block;
- }
+.tab-class {
+ // width: 220rpx;
+ // flex-basis: auto !important;
+ // display: inline-block;
+}
- .tab-active-class {
- color: #93d333;
- }
+.tab-active-class {
+ color: #93d333;
+}
- .wrap-class {
- margin-bottom: 28rpx;
- // background-color: blue;
- }
+.wrap-class {
+ margin-bottom: 28rpx;
+ // background-color: blue;
+}
- .word-list-wrapper {
- padding: 28rpx 0;
- overflow-y: auto;
- height: 500rpx;
+.word-list-wrapper {
+ padding: 28rpx 0;
+ overflow-y: auto;
+ height: 500rpx;
- .word-list {
- display: grid;
- grid-template-columns: repeat(6, 72rpx);
- grid-template-rows: repeat(1, 72rpx);
- gap: 40rpx;
+ .word-list {
+ display: grid;
+ grid-template-columns: repeat(6, 72rpx);
+ grid-template-rows: repeat(1, 72rpx);
+ gap: 40rpx;
+ justify-content: center;
+ // box-shadow: 0 0 -10rpx rgba(0, 0, 0, 0.2);
+ // align-items: flex-start;
+
+ .word-item {
+ width: 72rpx;
+ height: 72rpx;
+ border-radius: 16rpx;
+ background: rgba(240, 240, 240, 1);
+ box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15);
+ display: flex;
+ align-items: center;
justify-content: center;
- // box-shadow: 0 0 -10rpx rgba(0, 0, 0, 0.2);
- // align-items: flex-start;
+ font-size: 28rpx;
+ color: #141414;
- .word-item {
- width: 72rpx;
- height: 72rpx;
- border-radius: 16rpx;
- background: rgba(240, 240, 240, 1);
- box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15);
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 28rpx;
- color: #141414;
-
- &.selected {
- background: rgb(147, 211, 51);
- color: #ffffff;
- box-shadow: 0px 2px 4px rgba(147, 211, 51, 0.15);
- }
+ &.selected {
+ background: rgb(147, 211, 51);
+ color: #ffffff;
+ box-shadow: 0px 2px 4px rgba(147, 211, 51, 0.15);
}
}
-
- .word-item-empty {
- height: 28rpx;
- width: 100%;
- }
}
-
- .selected-words {
- padding: 28rpx;
- font-size: 28rpx;
- color: #141414;
-
- .selected-words-text {
- font-weight: bold;
- color: #93d333;
- }
+ .word-item-empty {
+ height: 28rpx;
+ width: 100%;
}
+}
- .btn-area {
- display: flex;
- justify-content: space-between;
- margin-bottom: 96rpx;
- padding: 0 28rpx;
+
+.selected-words {
+ padding: 28rpx;
+ font-size: 28rpx;
+ color: #141414;
+
+ .selected-words-text {
+ font-weight: bold;
+ color: #93d333;
}
+}
+.btn-area {
+ display: flex;
+ justify-content: space-between;
+ // margin-bottom: 96rpx;
+ padding: 0 28rpx;
}
\ No newline at end of file
diff --git a/miniprogram/components/word-picker/word-picker.wxml b/miniprogram/components/word-picker/word-picker.wxml
index c00c577..50b50ed 100644
--- a/miniprogram/components/word-picker/word-picker.wxml
+++ b/miniprogram/components/word-picker/word-picker.wxml
@@ -6,66 +6,69 @@
round
closeable="{{true}}"
close-on-click-overlay="{{true}}"
- safe-area-inset-bottom="{{true}}"
+ safe-area-inset-bottom="{{false}}"
position="bottom"
- custom-style="height: 70%"
+ custom-style="height:75%"
custom-class="word-picker">
- 请选择文字
-
-
-
-
-
- {{item}}
-
+
+ 请选择文字
+
+
+
+
+
+ {{item}}
+
+
+
-
-
-
-
-
- 已选文字:
- {{item}}{{index !== selectedWords.length - 1 ? '、' : ''}}
-
-
-
- (已选{{selectedWords.length}}个) 确定
-
-
- 清空
-
+
+
+
+ 已选文字:
+ {{item}}{{index !== selectedWords.length - 1 ? '、' :
+ ''}}
+
+
+
+ (已选{{selectedWords.length}}个) 确定
+
+
+ 清空
+
+
diff --git a/miniprogram/pages/shapePrint/index.js b/miniprogram/demoPages/shapePrint/index.js
similarity index 100%
rename from miniprogram/pages/shapePrint/index.js
rename to miniprogram/demoPages/shapePrint/index.js
diff --git a/miniprogram/pages/shapePrint/index.json b/miniprogram/demoPages/shapePrint/index.json
similarity index 100%
rename from miniprogram/pages/shapePrint/index.json
rename to miniprogram/demoPages/shapePrint/index.json
diff --git a/miniprogram/pages/shapePrint/index.less b/miniprogram/demoPages/shapePrint/index.less
similarity index 100%
rename from miniprogram/pages/shapePrint/index.less
rename to miniprogram/demoPages/shapePrint/index.less
diff --git a/miniprogram/pages/shapePrint/index.wxml b/miniprogram/demoPages/shapePrint/index.wxml
similarity index 100%
rename from miniprogram/pages/shapePrint/index.wxml
rename to miniprogram/demoPages/shapePrint/index.wxml
diff --git a/miniprogram/pages/shapePrint/shapes.js b/miniprogram/demoPages/shapePrint/shapes.js
similarity index 100%
rename from miniprogram/pages/shapePrint/shapes.js
rename to miniprogram/demoPages/shapePrint/shapes.js
diff --git a/miniprogram/pages/debug/debug.wxml b/miniprogram/pages/debug/debug.wxml
index d0e3fe2..7ec3159 100644
--- a/miniprogram/pages/debug/debug.wxml
+++ b/miniprogram/pages/debug/debug.wxml
@@ -79,6 +79,6 @@
clickable
data-name="shapePrint"
is-link
- url="/pages/shapePrint/index" />
+ url="/demoPages/shapePrint/index" />
diff --git a/project.private.config.json b/project.private.config.json
index c83aa6f..09099c6 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -25,7 +25,7 @@
"list": [
{
"name": "测试图形绘制",
- "pathName": "pages/shapePrint/index",
+ "pathName": "demoPages/shapePrint/index",
"query": "",
"scene": null,
"launchMode": "default"