Browse Source

列表样式整体调整

ZhangWenQiang 6 years ago
parent
commit
330b9bfb93

+ 14 - 9
pages/apply-list/index.wxml

@@ -11,25 +11,30 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <view>
                 <block wx:if="{{item.workDay}}">
-                  <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class">
+                  <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1">
                     {{tag}}
                   </i-tag>
                   <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
                 </block>
               </view>
             </view>
-            <view class='time'>{{item.settlementMethod?item.settlementMethod:""}}</view>
+            <block wx:if="{{item.settlementMethod}}">
+              <view class='time'>{{item.settlementMethod}}</view>
+            </block>
+            <block wx:else>
+              <view></view>
+            </block>
           </view>
           <view class='three'>
             <view class='area'>
@@ -56,7 +61,7 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.totalSalary:item.basicSalary}}
             </view>
           </view>
@@ -125,14 +130,14 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <text> {{globalTools.subStr(item.publishTime)}}-{{globalTools.subStr(item.endTime)}}</text>
             </view>
@@ -142,7 +147,7 @@
             <view class='area'>
               <image src='{{imgServerUrl}}/images/happyjob/address.png'></image>
               <block wx:if="{{item.activityWide}}">
-                <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class" style="margin-left:10rpx;">
+                <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1" style="margin-left:10rpx;">
                   {{tag}}
                 </i-tag>
               </block>
@@ -162,7 +167,7 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.totalSalary:item.basicSalary}}
             </view>
           </view>

+ 20 - 5
pages/apply-list/index.wxss

@@ -62,8 +62,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -129,17 +129,32 @@ page {
 }
 
 .box-item .two .time {
-  color: #706f6f;
+  color: #4391e1;
   font-size: 20rpx;
+  border: 2rpx solid rgba(67, 145, 225, 1);
+  border-radius: 14px;
+  padding: 4rpx 14rpx;
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
+  white-space: nowrap;
+  border: none !important;
+  background: rgba(255, 246, 229, 1) !important;
+  border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
+}
+
+.tag-class1 {
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
   background: rgba(245, 245, 245, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 14 - 9
pages/collection-list/index.wxml

@@ -11,25 +11,30 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <view>
                 <block wx:if="{{item.workDay}}">
-                  <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class">
+                  <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1">
                     {{tag}}
                   </i-tag>
                   <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
                 </block>
               </view>
             </view>
-            <view class='time'>{{item.settlementMethod?item.settlementMethod:""}}</view>
+            <block wx:if="{{item.settlementMethod}}">
+              <view class='time'>{{item.settlementMethod}}</view>
+            </block>
+            <block wx:else>
+              <view></view>
+            </block>
           </view>
           <view class='three'>
             <view class='area'>
@@ -56,7 +61,7 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.totalSalary:item.basicSalary}}
             </view>
           </view>
@@ -125,14 +130,14 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <text> {{globalTools.subStr(item.publishTime)}}-{{globalTools.subStr(item.endTime)}}</text>
             </view>
@@ -142,7 +147,7 @@
             <view class='area'>
               <image src='{{imgServerUrl}}/images/happyjob/address.png'></image>
               <block wx:if="{{item.activityWide}}">
-                <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class" style="margin-left:10rpx;">
+                <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1" style="margin-left:10rpx;">
                   {{tag}}
                 </i-tag>
               </block>
@@ -162,7 +167,7 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.totalSalary:item.basicSalary}}
             </view>
           </view>

+ 20 - 5
pages/collection-list/index.wxss

@@ -62,8 +62,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -129,17 +129,32 @@ page {
 }
 
 .box-item .two .time {
-  color: #706f6f;
+  color: #4391e1;
   font-size: 20rpx;
+  border: 2rpx solid rgba(67, 145, 225, 1);
+  border-radius: 14px;
+  padding: 4rpx 14rpx;
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
+  white-space: nowrap;
+  border: none !important;
+  background: rgba(255, 246, 229, 1) !important;
+  border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
+}
+
+.tag-class1 {
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
   background: rgba(245, 245, 245, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 1 - 1
pages/detail/index.js

@@ -470,7 +470,7 @@ Page({
       if (data.data.isFavorite) {
         showToast('收藏成功');
       } else {
-        showToast('取消收藏成功');
+        showToast('取消收藏');
       }
       self.setData({
         isFarovite: data.data.isFavorite

+ 1 - 1
pages/detail/index.wxml

@@ -628,7 +628,7 @@
 <!-- btn -->
 <view class="btn-group fixed-footer">
   <form bindsubmit="applyJob" report-submit='true' wx:if="{{positionCategory!=4 && !isApply}}">
-    <button class="distance selfBtn" form-type="submit">免费申请工作</button>
+    <button class="distance selfBtn" form-type="submit">申请岗位</button>
   </form>
   <form bindsubmit="applyPt" report-submit='true' wx:if="{{positionCategory==4 && !isApply}}">
     <button class="distance selfBtn" form-type="submit">申请开团</button>

+ 3 - 3
pages/fuli/index.wxml

@@ -42,16 +42,16 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.salary}}
           </view>
         </view>
         <view class='two'>
           <view class='limit'>
             <view>
-              <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+              <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
             </view>
-            <text> {{globalTools.subStr(item.publishTime)}}-{{globalTools.subStr(item.endTime)}}</text>
+            <text> {{globalTools.subStr(item.publishTime)}} - {{globalTools.subStr(item.endTime)}}</text>
           </view>
           <view class='time'>{{item.settlementMethod}}</view>
         </view>

+ 9 - 5
pages/fuli/index.wxss

@@ -194,8 +194,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -237,17 +237,21 @@ page {
 }
 
 .box-item .two .time {
-  color: #706f6f;
+  color: #4391e1;
   font-size: 20rpx;
+  border: 2rpx solid rgba(67, 145, 225, 1);
+  border-radius: 14px;
+  padding: 4rpx 14rpx;
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
   background: rgba(245, 245, 245, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 1 - 1
pages/fulltime/index.wxml

@@ -62,7 +62,7 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.totalSalary?item.totalSalary:item.basicSalary}}
           </view>
         </view>

+ 7 - 6
pages/fulltime/index.wxss

@@ -138,8 +138,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -210,13 +210,14 @@ page {
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
-  background: rgba(245, 245, 245, 1) !important;
+  background: rgba(255, 246, 229, 1) !important;
   border-radius: 14px !important;
-  padding: 4rpx 10rpx;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 7 - 7
pages/index/index.wxml

@@ -78,18 +78,18 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.salary}}
           </view>
         </view>
         <view class='two'>
           <view class='limit'>
             <view>
-              <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+              <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
             </view>
             <view>
               <block wx:if="{{item.workDay}}">
-                <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class">
+                <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1">
                   {{tag}}
                 </i-tag>
                 <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
@@ -120,14 +120,14 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.salary}}
           </view>
         </view>
         <view class='two'>
           <view class='limit'>
             <view>
-              <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+              <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
             </view>
             <text> {{globalTools.subStr(item.publishTime)}} - {{globalTools.subStr(item.endTime)}}</text>
           </view>
@@ -137,7 +137,7 @@
           <view class='area'>
             <image src='{{imgServerUrl}}/images/happyjob/address.png'></image>
             <block wx:if="{{item.activityWide}}">
-              <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class" style="margin-left:10rpx;">
+              <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1" style="margin-left:10rpx;">
                 {{tag}}
               </i-tag>
             </block>
@@ -157,7 +157,7 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.totalSalary?item.totalSalary:item.basicSalary}}
           </view>
         </view>

+ 21 - 8
pages/index/index.wxss

@@ -252,9 +252,9 @@
 
 .box-item .one .salary {
   font-size: 32rpx;
-  font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-family: ArialMT;
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -288,7 +288,6 @@
 }
 
 .box-item .two .limit i-tag {
-  /* margin-left: 10rpx; */
 }
 
 .box-item .two .limit text {
@@ -312,7 +311,6 @@
 }
 
 .box-item .two .limit_1 i-tag {
-  /* margin-left: 10rpx; */
 }
 
 .box-item .two .limit_1 text {
@@ -320,17 +318,32 @@
 }
 
 .box-item .two .time {
-  color: #706f6f;
+  color: #4391e1;
   font-size: 20rpx;
+  border: 2rpx solid rgba(67, 145, 225, 1);
+  border-radius: 14px;
+  padding: 4rpx 14rpx;
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
+  white-space: nowrap;
+  border: none !important;
+  background: rgba(255, 246, 229, 1) !important;
+  border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
+}
+
+.tag-class1 {
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
   background: rgba(245, 245, 245, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 14 - 9
pages/interview/index.wxml

@@ -11,25 +11,30 @@
               {{item.hpPosition.position.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.hpPosition.position.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <view>
                 <block wx:if="{{item.hpPosition.position.workDay}}">
-                  <i-tag wx:for="{{globalTools.splitStr1(item.hpPosition.position.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class">
+                  <i-tag wx:for="{{globalTools.splitStr1(item.hpPosition.position.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1">
                     {{tag}}
                   </i-tag>
                   <text>(共计{{globalTools.splitStr1(item.hpPosition.position.workDay,',').length}}天)</text>
                 </block>
               </view>
             </view>
-            <view class='time'>{{item.hpPosition.position.settlementMethod?item.hpPosition.position.settlementMethod:""}}</view>
+            <block wx:if="{{item.hpPosition.position.settlementMethod}}">
+              <view class='time'>{{item.hpPosition.position.settlementMethod}}</view>
+            </block>
+            <block wx:else>
+              <view></view>
+            </block>
           </view>
           <view class='three'>
             <view class='area'>
@@ -56,7 +61,7 @@
               {{item.hpPosition.position.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.hpPosition.position.totalSalary:item.hpPosition.position.basicSalary}}
             </view>
           </view>
@@ -125,14 +130,14 @@
               {{item.hpPosition.position.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.hpPosition.position.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <text> {{globalTools.subStr(item.hpPosition.position.publishTime)}}-{{globalTools.subStr(item.hpPosition.position.endTime)}}</text>
             </view>
@@ -142,7 +147,7 @@
             <view class='area'>
               <image src='{{imgServerUrl}}/images/happyjob/address.png'></image>
               <block wx:if="{{item.hpPosition.position.activityWide}}">
-                <i-tag wx:for="{{globalTools.splitStr1(item.hpPosition.position.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class" style="margin-left:10rpx;">
+                <i-tag wx:for="{{globalTools.splitStr1(item.hpPosition.position.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1" style="margin-left:10rpx;">
                   {{tag}}
                 </i-tag>
               </block>
@@ -162,7 +167,7 @@
               {{item.hpPosition.position.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.hpPosition.position.totalSalary:item.hpPosition.position.basicSalary}}
             </view>
           </view>

+ 21 - 5
pages/interview/index.wxss

@@ -62,8 +62,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -129,17 +129,33 @@ page {
 }
 
 .box-item .two .time {
-  color: #706f6f;
+  color: #4391e1;
   font-size: 20rpx;
+  border: 2rpx solid rgba(67, 145, 225, 1);
+  border-radius: 14px;
+  padding: 4rpx 14rpx;
 }
 
+
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
+  white-space: nowrap;
+  border: none !important;
+  background: rgba(255, 246, 229, 1) !important;
+  border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
+}
+
+.tag-class1 {
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
   background: rgba(245, 245, 245, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 1 - 1
pages/jipin/index.wxml

@@ -62,7 +62,7 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.totalSalary?item.totalSalary:item.basicSalary}}
           </view>
         </view>

+ 7 - 6
pages/jipin/index.wxss

@@ -138,8 +138,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -180,7 +180,6 @@ page {
   margin-left: 10rpx;
 }
 
-
 .box-item .two .limit_1 {
   display: flex;
   flex-direction: row;
@@ -211,12 +210,14 @@ page {
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
-  background: rgba(245, 245, 245, 1) !important;
+  background: rgba(255, 246, 229, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 8 - 3
pages/parttime/index.wxml

@@ -63,14 +63,14 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.salary}}
           </view>
         </view>
         <view class='two'>
           <view class='limit'>
             <view>
-              <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+              <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
             </view>
             <view>
               <block wx:if="{{item.workDay}}">
@@ -81,7 +81,12 @@
               </block>
             </view>
           </view>
-          <view class='time'>{{item.settlementMethod?item.settlementMethod:''}}</view>
+          <block wx:if="{{item.settlementMethod}}">
+            <view class='time'>{{item.settlementMethod}}</view>
+          </block>
+          <block wx:else>
+            <view></view>
+          </block>
         </view>
         <view class='three'>
           <view class='area'>

+ 9 - 5
pages/parttime/index.wxss

@@ -194,8 +194,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -237,17 +237,21 @@ page {
 }
 
 .box-item .two .time {
-  color: #706f6f;
+  color: #4391e1;
   font-size: 20rpx;
+  border: 2rpx solid rgba(67, 145, 225, 1);
+  border-radius: 14px;
+  padding: 4rpx 14rpx;
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
   background: rgba(245, 245, 245, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 1 - 1
pages/pt/index.wxml

@@ -12,7 +12,7 @@
             <image src='{{imgServerUrl}}/images/happyjob/pt.png'></image>
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.totalSalary?item.totalSalary:item.basicSalary}}
           </view>
         </view>

+ 7 - 5
pages/pt/index.wxss

@@ -82,8 +82,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -154,12 +154,14 @@ page {
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
-  background: rgba(245, 245, 245, 1) !important;
+  background: rgba(255, 246, 229, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 1 - 1
pages/reward/index.wxml

@@ -62,7 +62,7 @@
             {{item.positionName}}
           </view>
           <view class='salary'>
-            <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+            <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
             {{item.totalSalary?item.totalSalary:item.basicSalary}}
           </view>
         </view>

+ 7 - 6
pages/reward/index.wxss

@@ -138,8 +138,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -210,13 +210,14 @@ page {
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
-  background: rgba(245, 245, 245, 1) !important;
+  background: rgba(255, 246, 229, 1) !important;
   border-radius: 14px !important;
-  padding: 4rpx 10rpx;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
 }
 
 .box-item .three {

+ 14 - 9
pages/search-result/search-result.wxml

@@ -11,25 +11,30 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <view>
                 <block wx:if="{{item.workDay}}">
-                  <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class">
+                  <i-tag wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1">
                     {{tag}}
                   </i-tag>
                   <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
                 </block>
               </view>
             </view>
-            <view class='time'>{{item.settlementMethod?item.settlementMethod:""}}</view>
+            <block wx:if="{{item.settlementMethod}}">
+              <view class='time'>{{item.settlementMethod}}</view>
+            </block>
+            <block wx:else>
+              <view></view>
+            </block>
           </view>
           <view class='three'>
             <view class='area'>
@@ -56,7 +61,7 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.totalSalary:item.basicSalary}}
             </view>
           </view>
@@ -125,14 +130,14 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.salary}}
             </view>
           </view>
           <view class='two'>
             <view class='limit'>
               <view>
-                <image src='{{imgServerUrl}}/images/happyjob/limit.png'></image>
+                <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
               <text> {{globalTools.subStr(item.publishTime)}}-{{globalTools.subStr(item.endTime)}}</text>
             </view>
@@ -142,7 +147,7 @@
             <view class='area'>
               <image src='{{imgServerUrl}}/images/happyjob/address.png'></image>
               <block wx:if="{{item.activityWide}}">
-                <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class" style="margin-left:10rpx;">
+                <i-tag wx:for="{{globalTools.splitStr1(item.activityWide,',')}}" wx:key="*this" wx:for-item="tag" i-class="tag-class1" style="margin-left:10rpx;">
                   {{tag}}
                 </i-tag>
               </block>
@@ -162,7 +167,7 @@
               {{item.positionName}}
             </view>
             <view class='salary'>
-              <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image>
+              <!-- <image src='{{imgServerUrl}}/images/happyjob/dollor.png'></image> -->
               {{item.totalSalary?item.totalSalary:item.basicSalary}}
             </view>
           </view>

+ 20 - 5
pages/search-result/search-result.wxss

@@ -62,8 +62,8 @@ page {
 .box-item .one .salary {
   font-size: 32rpx;
   font-family: Arial-BoldMT;
-  font-weight: bold;
-  color: rgba(30, 98, 167, 1);
+  font-weight: 400;
+  color: rgba(255, 78, 37, 1);
 }
 
 .box-item .one .salary image {
@@ -129,17 +129,32 @@ page {
 }
 
 .box-item .two .time {
-  color: #706f6f;
+  color: #4391e1;
   font-size: 20rpx;
+  border: 2rpx solid rgba(67, 145, 225, 1);
+  border-radius: 14px;
+  padding: 4rpx 14rpx;
 }
 
 .tag-class {
-  background: #e2f4fe !important;
-  margin-right: 6rpx;
+  margin-right: 8rpx;
+  white-space: nowrap;
+  border: none !important;
+  background: rgba(255, 246, 229, 1) !important;
+  border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  color: #ff903f;
+  font-size: 20rpx;
+}
+
+.tag-class1 {
+  margin-right: 8rpx;
   white-space: nowrap;
   border: none !important;
   background: rgba(245, 245, 245, 1) !important;
   border-radius: 14px !important;
+  margin-bottom: 12rpx;
+  font-size: 20rpx;
 }
 
 .box-item .three {

File diff suppressed because it is too large
+ 97 - 1
ui/tag/index.wxss