Merge remote-tracking branch 'origin/master'

马宇豪

2023-07-21 fc38d1c92f01a224e8373c4425481bb1d85e2bf3

 pages/tabBar/examine/examine.vue

@@ -5,8 +5,11 @@
         <!-- 状态栏占位 -->
         <view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
         <!-- 真正的导航栏内容 -->
         <view class="navBar" >
            <view class="barText">工作通知审核</view>
         <view style="display: flex; flex-direction: column;" >
            <view class="navBar">
               <u-icon style=" margin-left: -25px;" name="arrow-left" color="black" size="17" @click="goBack" />
               <view class="barText">工作通知审核</view>
            </view>
         </view>
      </view>
      <!-- 页面内容 -->
@@ -69,7 +72,7 @@
            </view>
         </view>
      </view>
      <tabBar :currentPagePath="page"></tabBar>
      <!-- <tabBar :currentPagePath="page"></tabBar> -->
   </view>
</template>

@@ -78,7 +81,7 @@
   import {getExamine} from '../../../api/examine.js'
   export default {
      components:{
         tabBar
         // tabBar
      },
      data() {
         return {
@@ -126,6 +129,12 @@
         this.getExanineList();
      },
      methods: {
         goBack() {
            console.log("1111")
            uni.switchTab({
                url:'/pages/tabBar/firstPage/firstPage'
            });
         },
         getExanineList() {
            this.data.searchParams.reviewStatus = this.isReadOnly ? 1 : null;
            this.data.searchParams.emergType = this.checked ? 1 : null;
@@ -194,7 +203,7 @@
}
.navBarBox .navBar {
      background-color:lightgrey;
      height: 25px;
      height: 45px;
      display: flex;
      flex-direction: row;
      justify-content: center;