From 94d092f0ad1a87a34a999452c0b3eb0fd1bdaf82 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Thu, 30 May 2024 22:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/guide/judge.vue  |  5 ++---
 src/pages/revert/admin.vue |  4 ++--
 src/pages/revert/index.vue | 11 +++++++++--
 src/pages/task/index.vue   |  3 +++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/pages/guide/judge.vue b/src/pages/guide/judge.vue
index 60071c3..aa96a72 100644
--- a/src/pages/guide/judge.vue
+++ b/src/pages/guide/judge.vue
@@ -1,7 +1,6 @@
 <template>
   <view class="content">
     <template v-if="list.length">
-      {{ list.value }}
       <uv-swiper
         height="100vh"
         :list="list"
@@ -11,8 +10,8 @@
         circular
       ></uv-swiper>
 
-      <div class="" id="timer">
-        <div id="info" @click="launchApp">跳过</div>
+      <div class="z-99999 bg-red" id="timer"  @click.stop="launchApp">
+        <div id="info">跳过</div>
         <div class="circleProgress_wrapper">
           <div class="wrapper right">
             <div class="circleProgress rightcircle"></div>
diff --git a/src/pages/revert/admin.vue b/src/pages/revert/admin.vue
index 17d0bb4..e74fb20 100644
--- a/src/pages/revert/admin.vue
+++ b/src/pages/revert/admin.vue
@@ -45,7 +45,7 @@
             <view class="pl-20rpx">
               <uv-form-item label="销售" :prop="`items.${i}.sales`">
                 <uv-input
-                  @input="salesChange"
+                 
                   v-model="item.sales"
                   :border="`none`"
                   type="digit"
@@ -55,7 +55,7 @@
               <uv-line color="#f5f5f5"></uv-line>
               <uv-form-item label="兑奖" :prop="`items.${i}.expenditure`">
                 <uv-input
-                  @input="expenditureChange"
+                 
                   v-model="item.expenditure"
                   :border="`none`"
                   type="digit"
diff --git a/src/pages/revert/index.vue b/src/pages/revert/index.vue
index a0253a7..975aed6 100644
--- a/src/pages/revert/index.vue
+++ b/src/pages/revert/index.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
-    <Admin v-if="checkPermission(['admin'])"></Admin>
-    <Base  v-else/>
+    <Admin v-if="checkPermission(['admin']) && rules.length===1"></Admin>
+    <Base v-else />
   </view>
 </template>
 
@@ -9,4 +9,11 @@
 import checkPermission from '@/utils/permission'
 import Base from './base.vue'
 import Admin from './admin.vue'
+import { useUserStore } from '@/store/modules/user'
+import { ref, computed } from 'vue'
+const userStore = useUserStore()
+
+const rules = computed(() => {
+  return userStore.roles
+})
 </script>
diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue
index f0dbd6a..182b0d2 100644
--- a/src/pages/task/index.vue
+++ b/src/pages/task/index.vue
@@ -128,6 +128,9 @@ const tabChange = ({ index }) => {
 const applyClick = (item) => {
   const type = item.taskable_type
   const status = item.taskable.status
+
+  if(type==='task_hygienes' && status===1) return
+
   let url
   if (status === 2 || status == 4 || type=='task_ledgers') {
     const date = status != 3 || status != 5 ? `&date=${item.taskable.date}` : ''