From 8921d1b871c9c2de2c9c981c51062b96510e56ed Mon Sep 17 00:00:00 2001
From: joey <joeyswork@126.com>
Date: Tue, 22 Jul 2025 15:48:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B5=8B=E8=AF=95=E9=A1=B5=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=BF=81=E7=A7=BB=EF=BC=8C=E9=80=82=E9=85=8D=20tabbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.json                          |   2 +-
 .../components/word-picker/word-picker.less   | 144 +++++++++---------
 .../components/word-picker/word-picker.wxml   | 117 +++++++-------
 .../{pages => demoPages}/shapePrint/index.js  |   0
 .../shapePrint/index.json                     |   0
 .../shapePrint/index.less                     |   0
 .../shapePrint/index.wxml                     |   0
 .../{pages => demoPages}/shapePrint/shapes.js |   0
 miniprogram/pages/debug/debug.wxml            |   2 +-
 project.private.config.json                   |   2 +-
 10 files changed, 135 insertions(+), 132 deletions(-)
 rename miniprogram/{pages => demoPages}/shapePrint/index.js (100%)
 rename miniprogram/{pages => demoPages}/shapePrint/index.json (100%)
 rename miniprogram/{pages => demoPages}/shapePrint/index.less (100%)
 rename miniprogram/{pages => demoPages}/shapePrint/index.wxml (100%)
 rename miniprogram/{pages => demoPages}/shapePrint/shapes.js (100%)

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">
-    <view class="word-picker-title">请选择文字</view>
-    <van-tabs
-        wx:if="{{show}}"
-        id="tabs"
-        animated
-        color="#93d333"
-        ellipsis="{{false}}"
-        line-width="90rpx"
-        nav-class="nav-class"
-        tab-class="tab-class"
-        wrap-class="wrap-class"
-        tab-active-class="tab-active-class"
-        swipeable="{{true}}"
-        active="{{currentTab}}"
-        bind:change="onTabChange">
-        <van-tab
-            wx:for="{{wordList}}"
-            wx:for-index="categoryIndex"
-            wx:key="categoryIndex"
-            title="{{wordList[categoryIndex].categoryName}}">
-            <view class="word-list-wrapper">
-                <view class="word-list">
-                    <view
-                        class="word-item {{wxs.isSelected(selectedWords, item) ? 'selected' : ''}}"
-                        wx:for="{{wordList[categoryIndex].words}}"
-                        wx:key="index"
-                        data-word="{{item}}"
-                        bind:tap="onWordClick">
-                        <text class="word-item-text">{{item}}</text>
-                        <!-- <text class="word-item-icon icon-success"></text> -->
+    <view class="word-picker-content">
+        <view class="word-picker-title">请选择文字</view>
+        <van-tabs
+            wx:if="{{show}}"
+            id="tabs"
+            animated
+            color="#93d333"
+            ellipsis="{{false}}"
+            line-width="90rpx"
+            nav-class="nav-class"
+            tab-class="tab-class"
+            wrap-class="wrap-class"
+            tab-active-class="tab-active-class"
+            swipeable="{{true}}"
+            active="{{currentTab}}"
+            bind:change="onTabChange">
+            <van-tab
+                wx:for="{{wordList}}"
+                wx:for-index="categoryIndex"
+                wx:key="categoryIndex"
+                title="{{wordList[categoryIndex].categoryName}}">
+                <view class="word-list-wrapper">
+                    <view class="word-list">
+                        <view
+                            class="word-item {{wxs.isSelected(selectedWords, item) ? 'selected' : ''}}"
+                            wx:for="{{wordList[categoryIndex].words}}"
+                            wx:key="index"
+                            data-word="{{item}}"
+                            bind:tap="onWordClick">
+                            <text class="word-item-text">{{item}}</text>
+                            <!-- <text class="word-item-icon icon-success"></text> -->
+                        </view>
                     </view>
+                    <view class="word-item-empty"></view>
                 </view>
-                <view class="word-item-empty"></view>
-            </view>
-        </van-tab>
-    </van-tabs>
-    <view class="selected-words">
-        已选文字：
-        <text
-            class="selected-word-text"
-            wx:for="{{selectedWords}}"
-            wx:key="index"
-            >{{item}}{{index !== selectedWords.length - 1 ? '、' : ''}}</text
-        >
-    </view>
-    <view class="btn-area">
-        <toy-button type="primary" bind:click="onChange" width="400rpx">
-            （已选{{selectedWords.length}}个） 确定
-        </toy-button>
-        <toy-button
-            type="white"
-            bind:click="onClear"
-            width="210rpx"
-            icon="clear"
-            icon-class-prefix="toy-icon">
-            清空
-        </toy-button>
+            </van-tab>
+        </van-tabs>
+        <view class="selected-words">
+            已选文字：
+            <text
+                class="selected-word-text"
+                wx:for="{{selectedWords}}"
+                wx:key="index"
+                >{{item}}{{index !== selectedWords.length - 1 ? '、' :
+                ''}}</text
+            >
+        </view>
+        <view class="btn-area">
+            <toy-button type="primary" bind:click="onChange" width="400rpx">
+                （已选{{selectedWords.length}}个） 确定
+            </toy-button>
+            <toy-button
+                type="white"
+                bind:click="onClear"
+                width="210rpx"
+                icon="clear"
+                icon-class-prefix="toy-icon">
+                清空
+            </toy-button>
+        </view>
     </view>
 </van-popup>
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" />
     </van-cell-group>
 </view>
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"