diff --git a/miniprogram/app.json b/miniprogram/app.json index 57bacf7..da968f4 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -1,6 +1,7 @@ { "pages": [ "pages/index/index", + "pages/shape/index", "pages/debug/debug", "pages/shapePrint/index" ], @@ -24,13 +25,20 @@ } }, "tabBar": { + "color": "#323232", + "selectedColor": "#FCD200", + "backgroundColor": "#fff", "list": [ { "pagePath": "pages/index/index", + "iconPath": "assets/tabBar/icon-word.png", + "selectedIconPath": "assets/tabBar/icon-word-active.png", "text": "识字" }, { - "pagePath": "pages/shapePrint/index", + "pagePath": "pages/shape/index", + "iconPath": "assets/tabBar/icon-shape.png", + "selectedIconPath": "assets/tabBar/icon-shape-active.png", "text": "图形" } ] diff --git a/miniprogram/assets/tabBar/icon-shape-active.png b/miniprogram/assets/tabBar/icon-shape-active.png new file mode 100644 index 0000000..fb56cf8 Binary files /dev/null and b/miniprogram/assets/tabBar/icon-shape-active.png differ diff --git a/miniprogram/assets/tabBar/icon-shape.png b/miniprogram/assets/tabBar/icon-shape.png new file mode 100644 index 0000000..0c5336e Binary files /dev/null and b/miniprogram/assets/tabBar/icon-shape.png differ diff --git a/miniprogram/assets/tabBar/icon-word-active.png b/miniprogram/assets/tabBar/icon-word-active.png new file mode 100644 index 0000000..53f91c9 Binary files /dev/null and b/miniprogram/assets/tabBar/icon-word-active.png differ diff --git a/miniprogram/assets/tabBar/icon-word.png b/miniprogram/assets/tabBar/icon-word.png new file mode 100644 index 0000000..e150c34 Binary files /dev/null and b/miniprogram/assets/tabBar/icon-word.png differ diff --git a/miniprogram/assets/tabBar/old/icon-shape-active.png b/miniprogram/assets/tabBar/old/icon-shape-active.png new file mode 100644 index 0000000..d3ee371 Binary files /dev/null and b/miniprogram/assets/tabBar/old/icon-shape-active.png differ diff --git a/miniprogram/assets/tabBar/old/icon-shape-active2.png b/miniprogram/assets/tabBar/old/icon-shape-active2.png new file mode 100644 index 0000000..bbbc3a6 Binary files /dev/null and b/miniprogram/assets/tabBar/old/icon-shape-active2.png differ diff --git a/miniprogram/assets/tabBar/old/icon-shape.png b/miniprogram/assets/tabBar/old/icon-shape.png new file mode 100644 index 0000000..f84289f Binary files /dev/null and b/miniprogram/assets/tabBar/old/icon-shape.png differ diff --git a/miniprogram/assets/tabBar/old/icon-word-active.png b/miniprogram/assets/tabBar/old/icon-word-active.png new file mode 100644 index 0000000..8dbea7f Binary files /dev/null and b/miniprogram/assets/tabBar/old/icon-word-active.png differ diff --git a/miniprogram/assets/tabBar/old/icon-word-active2.png b/miniprogram/assets/tabBar/old/icon-word-active2.png new file mode 100644 index 0000000..136c70d Binary files /dev/null and b/miniprogram/assets/tabBar/old/icon-word-active2.png differ diff --git a/miniprogram/assets/tabBar/old/icon-word.png b/miniprogram/assets/tabBar/old/icon-word.png new file mode 100644 index 0000000..9247f0d Binary files /dev/null and b/miniprogram/assets/tabBar/old/icon-word.png differ diff --git a/miniprogram/pages/shape/index.json b/miniprogram/pages/shape/index.json new file mode 100644 index 0000000..0539588 --- /dev/null +++ b/miniprogram/pages/shape/index.json @@ -0,0 +1,13 @@ +{ + "navigationBarTitleText": "涂鸦丫-图形", + "navigationBarBackgroundColor": "#FFD719", + "homeButton": true, + "backgroundColor": "#F6F6F6", + "enablePullDownRefresh": false, + "usingComponents": { + "van-divider": "@vant/weapp/divider/index", + "van-icon": "@vant/weapp/icon/index", + "van-popup": "@vant/weapp/popup/index", + "toy-button": "../../ui/button/button" + } +} diff --git a/miniprogram/pages/shape/index.less b/miniprogram/pages/shape/index.less new file mode 100644 index 0000000..2e0eedf --- /dev/null +++ b/miniprogram/pages/shape/index.less @@ -0,0 +1,37 @@ +page { + background-color: #f6f6f6; +} + +.page-container { + background-color: #f6f6f6; + padding: 0 24rpx; + box-sizing: border-box; + + .empty { + height: 190rpx; + } + + .wrapper { + background-color: #ffffff; + border-radius: 20rpx; + padding: 24rpx; + box-shadow: 0 3rpx 4rpx rgba(0, 0, 0, 0.15); + margin: 30rpx 0; + display: flex; + flex-direction: column; + + .wrapper-title { + font-size: 32rpx; + color: #141414; + margin-bottom: 24rpx; + font-weight: bold; + text-align: center; + } + } + + .btn-area { + display: flex; + flex-direction: row; + justify-content: space-between; + } +} \ No newline at end of file diff --git a/miniprogram/pages/shape/index.ts b/miniprogram/pages/shape/index.ts new file mode 100644 index 0000000..646a4ab --- /dev/null +++ b/miniprogram/pages/shape/index.ts @@ -0,0 +1,11 @@ +Page({ + data: { + shapeList: [], + }, + + onLoad() { + this.setData({ + shapeList: [], + }); + }, +}); \ No newline at end of file diff --git a/miniprogram/pages/shape/index.wxml b/miniprogram/pages/shape/index.wxml new file mode 100644 index 0000000..c140015 --- /dev/null +++ b/miniprogram/pages/shape/index.wxml @@ -0,0 +1,22 @@ + + + 自定义涂鸦卡 + + + 选择图形 + + + 随机生成 + + + + + diff --git a/tsconfig.json b/tsconfig.json index 309f3f7..26b593b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,6 @@ "lib": ["ES2020"], "typeRoots": ["./node_modules/@types", "./typings"] }, - "include": ["./**/*.ts"], + "include": ["./**/*.ts", "miniprogram/demoPages/shapePrint/index.js"], "exclude": ["node_modules"] }