页面样式调整

pages/apply-list/index.wxml

@@ -22,9 +22,14 @@
               </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-class1">
-                    {{tag}}
-                  </i-tag>
+                  <block wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag">
+                    <block wx:if="{{index == 0}}">
+                      {{tag}} ~
+                    </block>
+                    <block wx:if="{{index == (globalTools.splitStr1(item.workDay,',').length-1)}}">
+                      {{tag}}
+                    </block>
+                  </block>
                   <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
                 </block>
               </view>
@@ -139,7 +144,7 @@
               <view>
                 <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>

pages/collection-list/index.wxml

@@ -22,9 +22,14 @@
               </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-class1">
-                    {{tag}}
-                  </i-tag>
+                  <block wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag">
+                    <block wx:if="{{index == 0}}">
+                      {{tag}} ~
+                    </block>
+                    <block wx:if="{{index == (globalTools.splitStr1(item.workDay,',').length-1)}}">
+                      {{tag}}
+                    </block>
+                  </block>
                   <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
                 </block>
               </view>
@@ -139,7 +144,7 @@
               <view>
                 <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>

pages/detail/index.wxml

@@ -227,25 +227,24 @@
         </view>
       </view>
     </block>
-    <view class='three_1'>
-      <view class='sex'>
-        <view class='left'>工作时间:</view>
-        <view class='right'>
-          <block wx:if="{{postitionDetail.workDate}}">
-            {{postitionDetail.workDate}}
-          </block>
-          <block wx:if="{{postitionDetail.workDay}}">
-            {{postitionDetail.workDay}}
-          </block>
-          <block wx:if="{{postitionDetail.startWorkTime}}">
-            <text>{{postitionDetail.startWorkTime}}~{{postitionDetail.endWordTime}}</text>
-          </block>
-          <block wx:if="{{postitionDetail.workTime}}">
-            <text>{{postitionDetail.workTime}}</text>
-          </block>
+    <block wx:if="{{postitionDetail.workDate || postitionDetail.workDay}}">
+      <view class='three_1'>
+        <view class='sex'>
+          <view class='left'>工作时间:</view>
+          <view class='right'>
+            <block wx:if="{{postitionDetail.workDate}}">{{postitionDetail.workDate}}</block>
+            <block wx:if="{{postitionDetail.workDay}}">{{postitionDetail.workDay}}</block>
+          </view>
+        </view>
+        <view class='sex'>
+          <view class='left'></view>
+          <view class='right'>
+            <block wx:if="{{postitionDetail.startWorkTime}}">{{postitionDetail.startWorkTime}}~{{postitionDetail.endWordTime}}</block>
+            <block wx:if="{{postitionDetail.workTime}}">{{postitionDetail.workTime}}</block>
+          </view>
         </view>
       </view>
-    </view>
+    </block>
     <view class='four'>
       <view class='title'>
         <view class="name {{detailIndex == 0?'active':''}}" data-top="{{basePos}}" bindtap='goDeatil' data-index='0'>基本信息</view>
@@ -275,6 +274,10 @@
         <view class='left'>综合工资:</view>
         <view class='right'>{{postitionDetail.totalSalary}}</view>
       </view>
+      <view class="basesalay" wx:if="{{postitionDetail.otherSalary}}">
+        <view class='left'>岗位奖励:</view>
+        <view class='right'>{{postitionDetail.otherSalary}}</view>
+      </view>
       <view class="basesalay" wx:if="{{postitionDetail.payDay}}">
         <view class='left'>发工资日:</view>
         <view class='right'>{{postitionDetail.payDay}}</view>

pages/fuli/index.wxml

@@ -51,7 +51,7 @@
             <view>
               <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>

pages/index/index.wxml

@@ -88,9 +88,14 @@
             </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-class1">
-                  {{tag}}
-                </i-tag>
+                <block wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag">
+                  <block wx:if="{{index == 0}}">
+                    {{tag}} ~
+                  </block>
+                  <block wx:if="{{index == (globalTools.splitStr1(item.workDay,',').length-1)}}">
+                    {{tag}}
+                  </block>
+                </block>
                 <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
               </block>
             </view>
@@ -127,7 +132,7 @@
             <view>
               <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>

pages/interview/index.wxml

@@ -22,9 +22,14 @@
               </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-class1">
-                    {{tag}}
-                  </i-tag>
+                  <block wx:for="{{globalTools.splitStr1(item.hpPosition.position.workDay,',')}}" wx:key="*this" wx:for-item="tag">
+                    <block wx:if="{{index == 0}}">
+                      {{tag}} ~
+                    </block>
+                    <block wx:if="{{index == (globalTools.splitStr1(item.workDay,',').length-1)}}">
+                      {{tag}}
+                    </block>
+                  </block>
                   <text>(共计{{globalTools.splitStr1(item.hpPosition.position.workDay,',').length}}天)</text>
                 </block>
               </view>
@@ -139,7 +144,7 @@
               <view>
                 <image src='{{imgServerUrl}}/images/happyjob/time.png'></image>
               </view>
-              <text> {{globalTools.subStr(item.hpPosition.position.publishTime)}}-{{globalTools.subStr(item.hpPosition.position.endTime)}}</text>
+              <text> {{globalTools.subStr(item.hpPosition.position.publishTime)}} ~ {{globalTools.subStr(item.hpPosition.position.endTime)}}</text>
             </view>
             <view class='time'>{{item.hpPosition.position.settlementMethod}}</view>
           </view>

pages/parttime/index.wxml

@@ -74,9 +74,14 @@
             </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">
-                  {{tag}}
-                </i-tag>
+                <block wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag">
+                  <block wx:if="{{index == 0}}">
+                    {{tag}} ~
+                  </block>
+                  <block wx:if="{{index == (globalTools.splitStr1(item.workDay,',').length-1)}}">
+                    {{tag}}
+                  </block>
+                </block>
                 <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
               </block>
             </view>

pages/parttime/index.wxss

@@ -208,7 +208,7 @@ page {
   justify-content: space-between;
   color: #909090;
   font-size: 24rpx;
-  margin-top: 30rpx;
+  margin-top: 24rpx;
   align-items: center;
 }
 

pages/search-result/search-result.wxml

@@ -22,9 +22,14 @@
               </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-class1">
-                    {{tag}}
-                  </i-tag>
+                  <block wx:for="{{globalTools.splitStr1(item.workDay,',')}}" wx:key="*this" wx:for-item="tag">
+                    <block wx:if="{{index == 0}}">
+                      {{tag}} ~
+                    </block>
+                    <block wx:if="{{index == (globalTools.splitStr1(item.workDay,',').length-1)}}">
+                      {{tag}}
+                    </block>
+                  </block>
                   <text>(共计{{globalTools.splitStr1(item.workDay,',').length}}天)</text>
                 </block>
               </view>
@@ -139,7 +144,7 @@
               <view>
                 <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>