@@ -1,7 +1,6 @@ | |||
{ | |||
"usingComponents": { | |||
"list": "../../components/List/index", | |||
"select": "../../components/Select/index", | |||
"riverInfo": "../../components/riverInfo/index" | |||
}, | |||
"navigationBarTitleText": "全民护河" |
@@ -1,7 +1,6 @@ | |||
<!--pages/all/index.wxml--> | |||
<view class="protecityct_container"> | |||
<view class="protect_head"> | |||
<!-- <view class="select_location" bindtap="goSelectLocation">切换位置</view> --> | |||
<view class="search_container"> | |||
<image class="search_icon" src="../../assets/img/search.png"></image> | |||
<input class="task-search" type="text" placeholder="请输入河道名称进行查询" model:value="{{name}}" placeholder-class="placeholder-style" bindconfirm="search" bindblur="search"/> |
@@ -2,5 +2,5 @@ | |||
"usingComponents": { | |||
"select": "../../components/Select/index" | |||
}, | |||
"navigationBarTitleText": "全民护河" | |||
"navigationBarTitleText": "登录" | |||
} |
@@ -13,10 +13,13 @@ | |||
<view class="value_box"> | |||
<picker class="picker_box" bindchange="selectTenant" value="{{tenantCurrent}}" data-current="{{tenantCurrent}}" range="{{tenantOptions}}" range-key="name"> | |||
<view class="picker" wx:if="{{tenantId}}"> | |||
{{tenantOptions[tenantCurrent].name}} | |||
<text>{{tenantOptions[tenantCurrent].name}}</text> | |||
<image class="select_img" src="../../assets/first/select.png"></image> | |||
</view> | |||
<view wx:else class="picker" style="color: #A6A6A6; font-size: 26rpx;"> | |||
<text>请选择部门</text> | |||
<image class="select_img" src="../../assets/first/select.png"></image> | |||
</view> | |||
<view wx:else class="picker" style="color: #A6A6A6; font-size: 26rpx;">请选择部门</view> | |||
<image class="select_img" src="../../assets/first/select.png"></image> | |||
</picker> | |||
</view> | |||
<text class="tips">请选择部门</text> |
@@ -27,10 +27,11 @@ | |||
} | |||
.select_container { | |||
width: 100%; | |||
padding: 0 20rpx; | |||
height: 82rpx; | |||
background-color: #fff; | |||
display: flex; | |||
justify-content: space-around; | |||
justify-content: space-between; | |||
align-items: center; | |||
} | |||
@@ -62,8 +63,7 @@ | |||
margin-top: 20rpx; | |||
} | |||
.picker_box { | |||
width: 560rpx; | |||
padding: 0 30rpx 0 10rpx; | |||
width: 600rpx; | |||
font-size: 28rpx; | |||
color: #333333; | |||
display: flex; | |||
@@ -72,7 +72,8 @@ | |||
position: relative; | |||
} | |||
.picker { | |||
width: 500rpx; | |||
width: 600rpx; | |||
padding: 0 30rpx 0 10rpx; | |||
margin-right: 30rpx; | |||
overflow: hidden; | |||
white-space: nowrap; |