feat:测试页位置迁移,适配 tabbar
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
"pages/index/index",
|
"pages/index/index",
|
||||||
"pages/shape/index",
|
"pages/shape/index",
|
||||||
"pages/debug/debug",
|
"pages/debug/debug",
|
||||||
"pages/shapePrint/index"
|
"demoPages/shapePrint/index"
|
||||||
],
|
],
|
||||||
"window": {},
|
"window": {},
|
||||||
"style": "v2",
|
"style": "v2",
|
||||||
|
|||||||
@@ -1,36 +1,38 @@
|
|||||||
.word-picker {
|
.word-picker-content {
|
||||||
padding: 28rpx;
|
padding: 28rpx;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
.word-picker-title {
|
.word-picker-title {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
color: #141414;
|
color: #141414;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin-bottom: 28rpx;
|
margin-bottom: 28rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-class {
|
.nav-class {
|
||||||
// background-color: red;
|
// background-color: red;
|
||||||
// width: 890rpx;
|
// width: 890rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tab-class {
|
.tab-class {
|
||||||
// width: 220rpx;
|
// width: 220rpx;
|
||||||
// flex-basis: auto !important;
|
// flex-basis: auto !important;
|
||||||
// display: inline-block;
|
// display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tab-active-class {
|
.tab-active-class {
|
||||||
color: #93d333;
|
color: #93d333;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wrap-class {
|
.wrap-class {
|
||||||
margin-bottom: 28rpx;
|
margin-bottom: 28rpx;
|
||||||
// background-color: blue;
|
// background-color: blue;
|
||||||
}
|
}
|
||||||
|
|
||||||
.word-list-wrapper {
|
.word-list-wrapper {
|
||||||
padding: 28rpx 0;
|
padding: 28rpx 0;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
height: 500rpx;
|
height: 500rpx;
|
||||||
@@ -68,10 +70,10 @@
|
|||||||
height: 28rpx;
|
height: 28rpx;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.selected-words {
|
.selected-words {
|
||||||
padding: 28rpx;
|
padding: 28rpx;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #141414;
|
color: #141414;
|
||||||
@@ -80,13 +82,11 @@
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: #93d333;
|
color: #93d333;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-area {
|
.btn-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-bottom: 96rpx;
|
// margin-bottom: 96rpx;
|
||||||
padding: 0 28rpx;
|
padding: 0 28rpx;
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -6,10 +6,11 @@
|
|||||||
round
|
round
|
||||||
closeable="{{true}}"
|
closeable="{{true}}"
|
||||||
close-on-click-overlay="{{true}}"
|
close-on-click-overlay="{{true}}"
|
||||||
safe-area-inset-bottom="{{true}}"
|
safe-area-inset-bottom="{{false}}"
|
||||||
position="bottom"
|
position="bottom"
|
||||||
custom-style="height: 70%"
|
custom-style="height:75%"
|
||||||
custom-class="word-picker">
|
custom-class="word-picker">
|
||||||
|
<view class="word-picker-content">
|
||||||
<view class="word-picker-title">请选择文字</view>
|
<view class="word-picker-title">请选择文字</view>
|
||||||
<van-tabs
|
<van-tabs
|
||||||
wx:if="{{show}}"
|
wx:if="{{show}}"
|
||||||
@@ -52,7 +53,8 @@
|
|||||||
class="selected-word-text"
|
class="selected-word-text"
|
||||||
wx:for="{{selectedWords}}"
|
wx:for="{{selectedWords}}"
|
||||||
wx:key="index"
|
wx:key="index"
|
||||||
>{{item}}{{index !== selectedWords.length - 1 ? '、' : ''}}</text
|
>{{item}}{{index !== selectedWords.length - 1 ? '、' :
|
||||||
|
''}}</text
|
||||||
>
|
>
|
||||||
</view>
|
</view>
|
||||||
<view class="btn-area">
|
<view class="btn-area">
|
||||||
@@ -68,4 +70,5 @@
|
|||||||
清空
|
清空
|
||||||
</toy-button>
|
</toy-button>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|||||||
@@ -79,6 +79,6 @@
|
|||||||
clickable
|
clickable
|
||||||
data-name="shapePrint"
|
data-name="shapePrint"
|
||||||
is-link
|
is-link
|
||||||
url="/pages/shapePrint/index" />
|
url="/demoPages/shapePrint/index" />
|
||||||
</van-cell-group>
|
</van-cell-group>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
"list": [
|
"list": [
|
||||||
{
|
{
|
||||||
"name": "测试图形绘制",
|
"name": "测试图形绘制",
|
||||||
"pathName": "pages/shapePrint/index",
|
"pathName": "demoPages/shapePrint/index",
|
||||||
"query": "",
|
"query": "",
|
||||||
"scene": null,
|
"scene": null,
|
||||||
"launchMode": "default"
|
"launchMode": "default"
|
||||||
|
|||||||
Reference in New Issue
Block a user