Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform

pages/index/index.wxss

@@ -353,7 +353,7 @@ height: 746rpx;
 	margin-bottom: 5px;
 }
 .storeName{
-  max-width: 360rpx;
+  max-width: 300rpx;
 }
 .logoClass {
 	width: 52px;

pages/jobListSearch/index.wxml

@@ -94,19 +94,18 @@
           <view class="f16 fw500 dib">{{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}}</view>
           <i class="iconfont icon-zhankai f12" style="margin: 1px 0px 0 6px"></i>
         </view>
-        <view class="csbf f14 c6 {{whichOneShow == 'gj' ?'active':''}} {{ activez!='' && activez!='all'?'activecolor':''}}" bindtap="chooseNl" data-type="gj">
+        <!-- <view class="csbf f14 c6 {{whichOneShow == 'gj' ?'active':''}} {{ activez!='' && activez!='all'?'activecolor':''}}" bindtap="chooseNl" data-type="gj">
           {{firstMenu}}
           <i class="iconfont icon-shouqi f12 {{ activez=='zuigao' || activez=='zuijin' ?'cf40':'c9'}} fst ml4" wx:if="{{whichOneShow == 'gj'}}"></i>
           <i class="iconfont icon-zhankai f12 {{ activez=='zuigao' || activez=='zuijin' ?'cf40':'c9'}} fst ml4" wx:else data-type="gj"></i>
           <scroll-view class="gjFixed" catchtouchmove="cc" wx:if="{{ whichOneShow == 'gj' }}">
             <view class="bgf tl c3 por filter filterprice sort" style="height:240px">
-              <!-- chooseM -->
               <view class="f16 fw500 p016 {{activez=='all'?'cf00 b1 ':''}}" data-id="all" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">综合排序</view>
               <view class="f16 fw500 p016 {{activez=='zuigao'?'cf00 b1 ':''}}" data-id="zuigao" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">工价优先</view>
               <view class="f16 fw500 p016 bb1 {{activez=='zuijin'?'cf00 b1':''}}" data-id="zuijin" bindtap="choiceFilter" style="line-height: 42px" hover-class="thover">距离优先</view>
             </view>
           </scroll-view>
-        </view>
+        </view> -->
         <view class="csbf c6 f14 {{whichOneShow == 'sex'?'active':''}} {{ sexid!='' && sexid!='-1'?'activecolor':''}}" bindtap="chooseNl" data-type="sex" style>
           {{ secondMenu }}
           <i class="iconfont icon-shouqi f12 {{ sexid!='-1' ?'cf40':'c9'}} fst ml4" wx:if="{{whichOneShow == 'sex'}}"></i>