diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index 6cad87b..9da73b1 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -463,7 +463,6 @@
       <button class="loginOut" type hover-class="none" style="background-color:#ccc;width: 260px;" hover-stop-propagation>已报名</button>
     </view>
     <view wx:else>
-<<<<<<< HEAD
     <view class="" wx:if="{{fromScene}}">
       <button class="loginOut wxBtn ysd-base-bgcolor" hover-class="loginBtnHov" bindtap="backIndex">返回首页</button>
     </view>
@@ -472,17 +471,6 @@
     </view>
     <view class="" wx:else>
       <button class="loginOut" type hover-class="none" style="background-color:#ccc;width: {{!fromScene ? '260px' :''}};" hover-stop-propagation>暂时停招</button>
-=======
-      <view class wx:if="{{fromScene}}">
-        <button class="loginOut wxBtn ysd-base-bgcolor" hover-class="loginBtnHov" bindtap="backIndex">返回首页</button>
-      </view>
-      <view class wx:if="{{!isMaskShow}}">
-        <button type="primary" style="width: {{!fromScene ? '260px' :''}};" class="loginOut" bindtap="goNewEnroll">立即报名</button>
-      </view>
-      <view class wx:else>
-        <button class="loginOut" type hover-class="none" style="background-color:#ccc;width: {{!fromScene ? '260px' :''}};" hover-stop-propagation>暂时停招</button>
-      </view>
->>>>>>> 1628dadd3c48137b944d348038f60649f28cf760
     </view>
   </view>
 </view>
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index aa754ca..775e0e2 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -36,47 +36,25 @@
                 <view class="listcontainer p010">
                   <view class="jobOne bgf mb10 br8" 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="box-shadow: 0px 2px 9px 0px #eeeeee;">
                     <view class="p1020 jobIn" hover-class="none">
-                      <!-- <image style="width: 80px;height: 80px;position: absolute;right: 100px;z-index:99" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/tingzhao.svg" wx:if="{{item.state == 1 && item.recruitment == 2}}"></image>
-
-                      <image style="width: 72px;height: 72px;position: absolute;right: 100px;" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/weishangxian.svg" wx:if="{{item.state == 0}}"></image> -->
-
                       <view class="display-flex">
                         <view class="flex-1 vsb">
                           <view class="display-flex">
                             <view class="storeName">{{item.jobName || item.aliasName}}</view>
-                            <view class="baomingBtn v-center" hover-stop-propagation><i class="iconfont icon-baoming1"></i>报名</view>
+                            <view class="baomingBtn v-center" hover-stop-propagation>
+                              <i class="iconfont icon-baoming1"></i>报名
+                            </view>
                           </view>
                           <view class="v-center mt12 mb12">
-                            <view class="f16 c3 flex-1 display-flex">
-                              {{item.monthlyPay}}元/月，{{item.age}}
-                              <!-- <view class="overflowOmit" hover-class="none" hover-stop-propagation="false" style="max-width:220px">
-                                {{item.district == "" ?'':item.district + ' | ' }}
-                                <block wx:if="{{item.distance != null && item.distance != '' && storeJobListSearchForm.sortTag == 2}}">{{item.distanceKm}}</block>
-                                <block wx:else>{{item.age}}</block>
-                              </view>
-                              <view class="fr f14s fw400" style="color: var(--color-f40);">{{item.monthlyPay}}</view> -->
-                            </view>
+                            <view class="f16 c3 flex-1 display-flex">{{item.monthlyPay}}元/月，{{item.age}}</view>
                           </view>
                           <view class="display-flex">
                             <view class="v-center">
-                              <image class="dlLogo" src="//matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/yicaigongzuo.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
+                              <image class="dlLogo" src="//matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/yicaigongzuo.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload />
                               <text class="f12 c045 ml8">郑州一才工作</text>
                             </view>
                             <view>
-                               <text class="f12 c045 ml8">1分钟前</text>
+                              <text class="f12 c045 ml8">1分钟前</text>
                             </view>
-                              
-                            <!-- <block wx:if="{{item.state == 1 && item.recruitment == 2}}">
-                              <view class="miniBtn disabled" hover-stop-propagation="false">报名</view>
-                            </block>
-                            <block wx:else>
-                              <view class="miniBtn" catchtap="recordBill" data-job="{{item}}" hover-class="thover" hover-stop-propagation="false">报名</view>
-                            </block> -->
-
-                            <!-- <view class="miniBtn" bindtap="recordBill" data-job="{{item}}" hover-class="thover" hover-stop-propagation="false">报名</view> -->
-                            <!-- <view class="fsa bz f12 fee" wx:if="{{agencyStatus == 1 || corpUserFlag == true}}"> 
-                              <view class="inner" hover-class="none" hover-stop-propagation="false">费</view>{{item.fuWuFei ? item.fuWuFei : '-' }}
-                            </view>-->
                           </view>
                         </view>
                       </view>