合并分支 'lhj' 到 'master'

Lhj



查看合并请求 !2

@@ -55,11 +55,11 @@ App({
           'token': token || ''
         },
         postData;
-      data.header ? (token ? (header['token'] = token, delete data.header) : setTimeout(() => {
-        // wx.navigateTo({
-        //   url: '/pages/register/register',
-        // })
-      }, 1000)) : ""
+      // data.header ? (token ? (header['token'] = token, delete data.header) : setTimeout(() => {
+      //   wx.navigateTo({
+      //     url: '/pages/register/register',
+      //   })
+      // }, 1100)) : ""
       //网络请求  
       wx.request({
         url: this.globalData.baseUrl + url,
@@ -87,6 +87,16 @@ App({
               icon: 'none',
             })
             reject(res.data)
+            if (res.data.code == '401') {
+              if (!app.globalData.register){
+                // setTimeout(() => {
+                  wx.navigateTo({
+                    url: '/pages/register/register',
+                  })
+                // }, 1200)
+              }
+              
+            }
           }
           (showLoad || showLoad == undefined) ? wx.hideLoading(): "";
           wx.hideNavigationBarLoading()

@@ -99,7 +99,7 @@ page {
 .news_detail_item {
   border-bottom: 2rpx solid #f5f5f5;
   display: flex;
-  padding: 24rpx 0;
+  padding: 15rpx 0;
 }
 
 .news_detail_item:last-child {

@@ -3,5 +3,5 @@
   "navigationBarTitleText": "党建工作",
   "navigationBarBackgroundColor": "#169BD5",
   "navigationBarTextStyle": "white",
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": false
 }
\ No newline at end of file

@@ -85,7 +85,7 @@ page{
 .news_detail_item{
     border-bottom:2rpx solid #f5f5f5; 
     display: flex;
-    padding: 24rpx 0;
+    padding: 15rpx 0;
 }
 .news_detail_item:last-child{
     border: none;

@@ -19,7 +19,8 @@ Page({
     ifData:!1,
     navScrollLeft:0,
     noMore:!0,
-    beautiful_switch:0
+    beautiful_switch:0,
+    selectindex:0
   },
   changeShow(){
     this.setData({
@@ -97,7 +98,18 @@ Page({
     })
   },
   tabCharge(e) {
+    
     let s = this, singleWidth = s.data.windowWidth / 7, cur = e.currentTarget.dataset.index+1;
+
+    if (e.currentTarget.dataset.idx == -1) {
+     s.setData({
+        selectindex:0
+      })
+    } else{
+      s.setData({
+        selectindex: e.currentTarget.dataset.idx
+      })
+    }
     s.setData({
       beautiful_switch: e.currentTarget.dataset.beau,
       companyList:[],

@@ -8,15 +8,15 @@
     
   </view> -->
   <scroll-view class='tab_box' scroll-left="{{navScrollLeft}}" scroll-x='true' scroll-with-animation='true'>
-    <view class="tab_item {{current==0?'active':''}}" data-current='0' bindtap='tabCharge' data-beau="0">全部</view>
+    <view class="tab_item {{selectindex==0?'active':''}}" data-current='0' bindtap='tabCharge' data-idx='-1' data-beau="0">全部</view>
 
-    <view class="tab_item zuiactive" data-current='0' bindtap='tabCharge' data-beau="1">
+    <view class="tab_item zuiactive" data-idx='-2' data-current='0' bindtap='tabCharge' data-beau="1">
     最美企业
 
     <view class="iconfont icon-huangguan"></view>
     </view>
     <block wx:for="{{typeList}}" wx:key=''>
-      <view class="tab_item {{current == item.id?'active':''}}" data-current='{{item.id}}' bindtap='tabCharge' data-index='{{index}}' data-beau="0">{{item.name}}</view>
+      <view class="tab_item {{selectindex == item.id?'active':''}}" data-idx="{{item.id}}" data-current='{{item.id}}' bindtap='tabCharge' data-index='{{index}}' data-beau="0">{{item.name}}</view>
     </block>
   </scroll-view>
   <view class='iconfont icon-gengduo1' bindtap='changeShow'></view>

@@ -12,6 +12,7 @@ page {
   left: 0;
   display: flex;
   z-index: 10;
+  
 }
 
 .tab_box {
@@ -20,6 +21,9 @@ page {
   white-space: nowrap;
   overflow: hidden;
   line-height: 80rpx;
+  display:flex;
+  padding-left: 10rpx
+  
 }
 
 .tab_item {
@@ -27,7 +31,7 @@ page {
   color: #999;
   display: inline-block;
   position: relative;
-  padding: 0 30rpx;
+  padding: 0 12rpx;
   height: 100%;
   text-align: center;
 }