Merge branch 'zhaoj'

src/pages/_user/bzrgz.vue

@@ -362,13 +362,13 @@ export default {
       if (this.checked.length == 0) {
         showToast("请选择被审核人!");
       } else {
-        this.checked.forEach((item) => {
-          if (item.statue != "0") {
-            return showToast("不可重复审核!");
-          }
+        if (this.checked.some((item=>item.statue != "0"))) {
+          return showToast("不可重复审核!");
+        } else{
           this.auditShow = true;
           this.show = true;
-        });
+        }
+        
       }
     },
     onSubmit(value) {

src/pages/djzl/index.vue

@@ -19,13 +19,13 @@ function handleClickCard(row) {
   }
 }
 
-
+console.log(user._role);
 let cateData = $ref([])
 let cateLoading = $ref(true)
 request({
   url: '/djzl/info_cate/api_tree',
   data: {
-    token: user._role === 'jz' ? child.token : user.token
+    token: user._role === 'jz' ? ( child ? child.token : user.token) : user.token
   }
 }).then(res => {
   cateData = res.data
@@ -59,10 +59,10 @@ function getList() {
     data: {
       nic_id: cate.nic_id,
       urltype: 1,
-      token: user._role === 'jz' ? child.token : user.token
+      token: user._role === 'jz' ? ( child ? child.token : user.token) : user.token
     }
   }).then(res => {
-    
+
   })
 }
 function handleOverlaySubmit() {
@@ -92,17 +92,17 @@ function onFinish(val) {
 
 <template>
   <van-sticky>
-    <van-nav-bar v-if="!user.token ||user._role === 'jz'" title="党建专栏" left-arrow @click-left="handleNavLeftClick">
+    <van-nav-bar v-if="!user.token || user._role === 'jz'" title="党建专栏" left-arrow @click-left="handleNavLeftClick">
     </van-nav-bar>
-    <van-nav-bar v-if="user.token && user._role!=='jz'" title="党建专栏" right-text="新建" @click-right="handleNavRightClick" left-arrow
-      @click-left="handleNavLeftClick">
+    <van-nav-bar v-if="user.token && user._role !== 'jz'" title="党建专栏" right-text="新建" @click-right="handleNavRightClick"
+      left-arrow @click-left="handleNavLeftClick">
     </van-nav-bar>
   </van-sticky>
 
   <van-tabs sticky swipeable>
     <van-tab v-for="cate in cateData" :title="cate.nic_name">
       <remote-list url="/djzl/info/index"
-        :d="{ nic_id: cate.nic_id, urltype: 1, token: user._role === 'jz' ? child.token : user.token }" class="mt-2">
+        :d="{ nic_id: cate.nic_id, urltype: 1, token: user._role === 'jz' ? ( child ? child.token : user.token) : user.token }" class="mt-2">
         <template #default="{ row: item }">
           <van-card :title="item.name" :thumb="(item.img)" @click="handleClickCard(item)">
             <template #price>

src/pages/djzl/xwxq.vue

@@ -22,7 +22,7 @@ request({
   url: '/djzl/info/detail',
   data: {
     ni_id: props.id,
-    token: user._role === 'jz' ? child.token : user.token
+    token: user._role === 'jz' ? ( child ? child.token : user.token) : user.token
   }
 }).then(res => {
   if (res.code === '1') {

src/pages/qzzx/index.vue

@@ -26,7 +26,7 @@ let cateLoading = $ref(true)
 request({
   url: '/news/info_cate/api_tree',
   data: {
-    token: user._role === 'jz' ? child.token : user.token
+    token: user._role === 'jz' ? ( child ? child.token : user.token) : user.token
   }
 }).then(res => {
   cateData = res.data
@@ -90,7 +90,7 @@ function onFinish(val) {
   <van-tabs sticky swipeable>
     <van-tab v-for="cate in cateData" :title="cate.nic_name">
       <remote-list url="/news/info/index"
-        :d="{ nic_id: cate.nic_id, urltype: 1, token: user._role === 'jz' ? child.token : user.token }" class="mt-2">
+        :d="{ nic_id: cate.nic_id, urltype: 1, token: user._role === 'jz' ? ( child ? child.token : user.token) : user.token }" class="mt-2">
         <template #default="{ row: item }">
           <van-card :title="item.name" :thumb="(item.img)" @click="handleClickCard(item)">
             <template #price>

src/pages/qzzx/xwxq.vue

@@ -22,7 +22,7 @@ request({
   url: '/news/info/detail',
   data: {
     ni_id: props.id,
-    token: user._role === 'jz' ? child.token : user.token
+    token: user._role === 'jz' ? ( child ? child.token : user.token) : user.token
   }
 }).then(res => {
   if (res.code === '1') {