同步

pages/index/index.wxss

@@ -382,7 +382,7 @@ height: 746rpx;
 	white-space: nowrap;
 	color: var(--color-f40);
   font-weight: 601;
-  margin-top: 2px;
+  /* margin-top: 2px; */
 }
 .weui-btn {
 	margin-left: 0 !important;

pages/type/type/index.wxml

@@ -1,51 +1,35 @@
-<view class='g_flex_row_between g_h_all'>
+<view class="g_flex_row_between g_h_all">
   <!-- 左 -->
-	<scroll-view class="g_flex_none" scroll-y style='background-color:#F8F8F8;width:88px;height:100vh'>
+  <scroll-view class="g_flex_none" scroll-y style="background-color:#F8F8F8;width:88px;height:100vh">
-		<view wx:for="{{list}}" wx:for-item="item" wx:key="index"
+    <view wx:for="{{list}}" wx:for-item="item" wx:key="index" class="{{active == index ? 'label-box g_flex_column_center label-box-active' : 'label-box g_flex_column_center'}}" catchtap="handleTab" data-active="{{index}}" data-id="{{item.id}}">
-					class="{{active == index ? 'label-box g_flex_column_center label-box-active' : 'label-box g_flex_column_center'}}"
+      <view class="{{active == index ? 'label g_flex_c label-active' : 'label g_flex_c'}}">{{item.name}}({{item.num}})</view>
-					catchtap="handleTab"
-          data-active='{{index}}'
-          data-id='{{item.id}}'
-		>
-		  <view class="{{active == index ? 'label g_flex_c label-active' : 'label g_flex_c'}}"
-			>{{item.name}}({{item.num}})</view>
     </view>
   </scroll-view>
   <!-- 右 -->
-	<view class="g_flex_1" style='background-color:#fff;'>
+  <view class="g_flex_1" style="background-color:#fff;">
-		<scroll-view class="standardList category-obj" 
+    <scroll-view class="standardList category-obj" scroll-x="true" scroll-y="true" style="padding-top: 0;height:100vh" scroll-into-view="{{scrollInfoView}}" scroll-with-animation="true" bindscroll="bindCategoryScroll" bindscrolltolower="onScrollToLower">
-					 scroll-x="true" 
-					 scroll-y="true" 
-					 style="padding-top: 0;height:100vh"
-					 scroll-into-view="{{scrollInfoView}}"
-					 scroll-with-animation="true"
-           bindscroll='bindCategoryScroll'
-           bindscrolltolower="onScrollToLower"
-		>
       <view class="category-child category_0" id="category_0">
         <view wx:if="{{recordList != null && recordList.length > 0}}" style="padding-top: 0;">
           <view class="jcenter bgf br8">
             <view class="listcontainer" style="border-top: 1px solid #f3f3f3;">
-		          <view class="jobOne" hover-start-time="50" hover-stay-time="0" 
+              <view class="jobOne" hover-start-time="50" hover-stay-time="0" wx:for="{{recordList}}" data-id="{{item.id}}" bindtap="goDetail" wx:key="index" hover-class="{{item.recruitment == '1' ? 'ahover':''}}" style="background-color:{{item.recruitment == '1' ? '#fff':'#f5f5f5'}};border-bottom: {{item.recruitment == '1' ? '':'1px solid #ddd'}};">
-										wx:for="{{recordList}}" data-id="{{item.id}}" bindtap="goDetail" wx:key="index" 
-										hover-class="{{item.recruitment == '1' ? 'ahover':''}}" 
-										style="background-color:{{item.recruitment == '1' ? '#fff':'#f5f5f5'}};border-bottom: {{item.recruitment == '1' ? '':'1px solid #ddd'}};">
                 <view class="p1020 jobIn" hover-class="none">
                   <view class="display-flex">
                     <view class="flex-1 vsb">
                       <view class="display-flex">
                         <view class="storeName" style="font-size: 14px;max-width:300rpx;">{{item.jobName || item.aliasName}}</view>
-		                    <view class="hourPay" style="font-size: 14px;">{{item.salaryClassifyValue}}</view>
+                        <!-- <view class="hourPay" style="font-size: 14px;">{{item.salaryClassifyValue}}</view> -->
+                        <view class="hourPay" wx:if="{{item.salaryClassify == 7}}">月薪</view>
+                        <view class="hourPay" wx:else>{{item.salaryClassifyValue}}</view>
                       </view>
                       <view class="v-center mt12 mb12">
                         <view class="f12 c045 flex-1 display-flex">
                           <view hover-class="none" hover-stop-propagation="false" style="max-width:220px;">
-		                        <view class="overText fl" style="max-width: 150px;">
+                            <view class="overText fl" style="max-width: 150px;">{{item.district}}</view>
-		                          {{item.citys}}
+                            <view class="fl ml4" wx:if="{{item.distance != null && item.distance != '' && storeJobListSearchForm.sortTag == 2}}">{{ ' | ' + item.distanceKm}}</view>
-		                        </view>
-		                        <view class="fl ml4" wx:if="{{item.distance != null && item.distance != '' && storeJobListSearchForm.sortTag == 2}}"> {{ ' | ' + item.distanceKm}}</view>
                             <view class="fl ml4" wx:else>{{' | ' +item.age}}</view>
                           </view>
+                          <view class="fr f14s fw400" wx:if="{{item.jobType !=2 || item.salaryClassify == 7}}" style="color: var(--color-f40);">{{item.monthlyPay}}</view>
                           <!-- <view class="fr f14s fw400" style="color: var(--color-f40);">{{item.monthlyPay}}</view> -->
                         </view>
                       </view>
@@ -59,8 +43,7 @@
                           <view class="miniBtn disabled" hover-stop-propagation="false">立即报名</view>
                         </block>
                         <block wx:else>
-		                      <view class="miniBtn" catchtap="recordBill" data-job="{{item}}" hover-class="thover" 
+                          <view class="miniBtn" catchtap="recordBill" data-job="{{item}}" hover-class="thover" hover-stop-propagation="false">立即报名</view>
-													hover-stop-propagation="false">立即报名</view>
                         </block>
                       </view>
                     </view>
@@ -83,7 +66,7 @@
               <text style="font-size: 14px;color: #999999;line-height: 20px;">未登录时只能使用部分功能，申请加入稻田即可使用更多功能。</text>
             </view>
             <view class="mt12 f14 tc" bindtap="goLogin" style="color: #576b95;padding-bottom: 80px;">登录稻田</view>
-          </block> -->
+          </block>-->
         </block>
 
         <view wx:if="{{(recordList == null || recordList.length == 0) && pageShow}}" class="tc">
@@ -91,9 +74,7 @@
           <view class="tc f14 c045">暂无记录</view>
         </view>
       </view>
-		
     </scroll-view>
   </view>
 </view>
 <bottom-drawer show="{{recordShow}}" info="{{currentInfo}}" drawerType="recordShow" cancerShow="{{false}}" touchClose="{{true}}" bindhidedrawer="hidedrawershow" class="bottomDrawer" height="494px"></bottom-drawer>
-