miniprogram / match-west-road · 提交

转到一个项目

作者 wumengyu
提交 3a977337504336b3848944b2f2df43f6f5b687f1 1 个父辈 ce90a2f3

优化搜索

内嵌 并排对比
正在显示 8 个修改的文件 包含 25 行增加 和 10 行删除
@@ -194,13 +194,14 @@ @@ -194,13 +194,14 @@
194 </view> 194 </view>
195 <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true"> 195 <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
196 <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除--> 196 <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
  197 + <!--is_send = 1 不可参与-->
197 <button class="confirm-join-btn {{(is_send === 2 && detail.status === 8) || (is_send === 2 && detail.status === 2)?'black':''}}" form-type="submit"> 198 <button class="confirm-join-btn {{(is_send === 2 && detail.status === 8) || (is_send === 2 && detail.status === 2)?'black':''}}" form-type="submit">
198 <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text> 199 <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text>
199 <text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text> 200 <text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text>
200 <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼活动</text> 201 <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼活动</text>
201 <text wx:if="{{is_send === 2 && detail.status === 2 }}">确认拼活动</text> 202 <text wx:if="{{is_send === 2 && detail.status === 2 }}">确认拼活动</text>
202 <text wx:if="{{detail.status === 3}}">未拼成</text> 203 <text wx:if="{{detail.status === 3}}">未拼成</text>
203 - <text wx:if="{{detail.status === 4}}">已拼成</text> 204 + <text wx:if="{{detail.status === 4}}">待完成</text>
204 <text wx:if="{{detail.status === 5}}">已取消</text> 205 <text wx:if="{{detail.status === 5}}">已取消</text>
205 <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text> 206 <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
206 <!--<text wx:if="{{detail.status === 8}}">已拼成</text>--> 207 <!--<text wx:if="{{detail.status === 8}}">已拼成</text>-->
1 <!--pages/index/city-list/city-list.wxml--> 1 <!--pages/index/city-list/city-list.wxml-->
2 <view class="content"> 2 <view class="content">
3 <view class='tab_box'> 3 <view class='tab_box'>
4 - <view class="tab_item {{current==0?'active':''}}" data-current='{{0}}' bindtap='chargeTab'>国内</view>  
5 - <view class="tab_item {{current==1?'active':''}}" data-current='{{1}}' bindtap='chargeTab'>国际</view> 4 + <view class="tab_item {{current==0?'active':''}}" data-current='{{0}}' bindtap='chargeTab'>大陆境内</view>
  5 + <view class="tab_item {{current==1?'active':''}}" data-current='{{1}}' bindtap='chargeTab'>境外/港澳台</view>
6 </view> 6 </view>
7 <view class="right" wx:if="{{current===1}}"> 7 <view class="right" wx:if="{{current===1}}">
8 <input class="input" type="text" placeholder="搜索国家" bindinput="inputKey" bindfocus="inputFocus" value="{{searchValue}}" bindconfirm="startSearch" /> 8 <input class="input" type="text" placeholder="搜索国家" bindinput="inputKey" bindfocus="inputFocus" value="{{searchValue}}" bindconfirm="startSearch" />
9 - <image src="../../../images/search@2x.png" class="search-icon" bindtap="startSearch"></image> 9 + <text class="search-btn">搜索</text>
  10 + <!--<image src="../../../images/search@2x.png" class="search-icon" bindtap="startSearch"></image>-->
10 <!--<view class="iconfont icon-arrow-down"></view>--> 11 <!--<view class="iconfont icon-arrow-down"></view>-->
11 </view> 12 </view>
12 <view class="city-box {{current===1?'margin':''}}"> 13 <view class="city-box {{current===1?'margin':''}}">
@@ -78,8 +78,9 @@ page { @@ -78,8 +78,9 @@ page {
78 height: 34rpx; 78 height: 34rpx;
79 } 79 }
80 .input { 80 .input {
81 - width: 90%; 81 + /* width: 90%; */
82 height:58rpx; 82 height:58rpx;
  83 + flex:1;
83 color: #666666; 84 color: #666666;
84 padding-left: 20rpx; 85 padding-left: 20rpx;
85 font-size: 28rpx; 86 font-size: 28rpx;
@@ -129,4 +130,11 @@ page { @@ -129,4 +130,11 @@ page {
129 } 130 }
130 .margin { 131 .margin {
131 margin-top: 160rpx; 132 margin-top: 160rpx;
  133 +}
  134 +.search-btn {
  135 + width:80rpx;
  136 + margin-left:20rpx;
  137 + text-align: center;
  138 + font-size: 28rpx;
  139 + color: #666666;
132 } 140 }
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼餐</text> 203 <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼餐</text>
204 <text wx:if="{{is_send === 2 && detail.status === 2 }}">确认拼餐</text> 204 <text wx:if="{{is_send === 2 && detail.status === 2 }}">确认拼餐</text>
205 <text wx:if="{{detail.status === 3}}">未拼成</text> 205 <text wx:if="{{detail.status === 3}}">未拼成</text>
206 - <text wx:if="{{detail.status === 4}}">已拼成</text> 206 + <text wx:if="{{detail.status === 4}}">待完成</text>
207 <text wx:if="{{detail.status === 5 || detail.status === 10}}">已取消</text> 207 <text wx:if="{{detail.status === 5 || detail.status === 10}}">已取消</text>
208 <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text> 208 <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
209 <!--<text wx:if="{{detail.status === 8}}">已拼成</text>--> 209 <!--<text wx:if="{{detail.status === 8}}">已拼成</text>-->
1 { 1 {
2 - "navigationBarTitleText": "饭票" 2 + "navigationBarTitleText": "餐票"
3 } 3 }
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </block> 65 </block>
66 <block wx:if="{{detail.is_canCheck === 2}}"> 66 <block wx:if="{{detail.is_canCheck === 2}}">
67 <!--2是不可以点,且灰色--> 67 <!--2是不可以点,且灰色-->
68 - <text class="confirm-btn gray add-width" wx:if="{{detail.status === 4}}" bindtap="">待完成</text><!--待完成时并且活动时间已开始，发布人可点击完成--> 68 + <text class="confirm-btn gray {{detail.is_canCancel ===1?'':'add-width'}}" wx:if="{{detail.status === 4}}" bindtap="">待完成</text><!--待完成时并且活动时间已开始，发布人可点击完成-->
69 </block> 69 </block>
70 <text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text> 70 <text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text>
71 </block> 71 </block>
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <input placeholder='请输入搜索相关内容' bindfocus="inputFocus" bindinput="inputKey" value="{{searchValue}}" bindconfirm="startSearch" placeholder-class='input_size'/> 6 <input placeholder='请输入搜索相关内容' bindfocus="inputFocus" bindinput="inputKey" value="{{searchValue}}" bindconfirm="startSearch" placeholder-class='input_size'/>
7 <!--<view class="iconfont icon-jia1 jia1" catchtap="clearInput"></view>--> 7 <!--<view class="iconfont icon-jia1 jia1" catchtap="clearInput"></view>-->
8 </view> 8 </view>
9 - <!--<view class="search-text" bindtap="startSearch">搜索</view>--> 9 + <view class="search-text" bindtap="startSearch">搜索</view>
10 </view> 10 </view>
11 11
12 <view class="history_box" wx:if="{{postList.length<=0}}"> 12 <view class="history_box" wx:if="{{postList.length<=0}}">
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <!--<image src="../../images/lishi@2x.png" class="thumb"></image>--> 43 <!--<image src="../../images/lishi@2x.png" class="thumb"></image>-->
44 <image src="{{item.pic}}" class="thumb"></image> 44 <image src="{{item.pic}}" class="thumb"></image>
45 <view class="lish-right"> 45 <view class="lish-right">
46 - <view class="title">{{item.address}}</view> 46 + <view class="title">{{item.name}}</view>
47 <view class="time">{{item.time}}</view> 47 <view class="time">{{item.time}}</view>
48 <view class="name-box"> 48 <view class="name-box">
49 <!--<image src="../../images/avatar@2x.png" class="avatar"></image>--> 49 <!--<image src="../../images/avatar@2x.png" class="avatar"></image>-->
@@ -64,6 +64,7 @@ page { @@ -64,6 +64,7 @@ page {
64 font-size: 22rpx; 64 font-size: 22rpx;
65 } 65 }
66 .lish-right .name-box .avatar{ 66 .lish-right .name-box .avatar{
  67 + border-radius:50%;
67 width: 40rpx; 68 width: 40rpx;
68 height: 40rpx; 69 height: 40rpx;
69 margin-right: 16rpx; 70 margin-right: 16rpx;
@@ -101,7 +102,11 @@ page { @@ -101,7 +102,11 @@ page {
101 font-size: 30rpx; 102 font-size: 30rpx;
102 } 103 }
103 .search-text { 104 .search-text {
  105 + width:80rpx;
  106 + text-align: center;
  107 + margin-left: 20rpx;
104 font-size: 26rpx; 108 font-size: 26rpx;
  109 + color:#666666;
105 } 110 }
106 .history_box { 111 .history_box {
107 display: flex; 112 display: flex;