From 6e741f941bd0fbe4e05485f7834ff018d1c6e871 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Tue, 23 Apr 2024 09:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                             |  1 +
 src/pages.json                          | 20 ++++++--
 src/pages/login/LoginForm.vue           | 14 +++---
 src/pages/revert/index.vue              | 63 ++++++++++++++++++++++++-
 src/pages/task/index.vue                |  4 +-
 src/pages/task/task_hygienes_submit.vue | 19 ++++++--
 src/pages/task/task_ledgers_submit.vue  |  8 ++++
 src/store/modules/user.js               |  4 +-
 src/utils/request.js                    |  2 +-
 9 files changed, 113 insertions(+), 22 deletions(-)
 create mode 100644 src/pages/task/task_ledgers_submit.vue

diff --git a/src/App.vue b/src/App.vue
index f73b740..f0312f7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,5 @@
 <script>
+// import { useUserStoreWithOut } from "@/store/modules/user";
 export default {
   onLaunch: function () {
     console.log('App Launch')
diff --git a/src/pages.json b/src/pages.json
index eff52a7..bfe4d7e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -46,7 +46,8 @@
           "style": {
             "navigationBarTitleText": "业绩数据"
           }
-        },{
+        },
+        {
           "path": "upload/index",
           "style": {
             "navigationBarTitleText": "上传数据"
@@ -127,6 +128,12 @@
             "navigationBarTitleText": "清洁任务提交"
           }
         },
+        {
+          "path": "task_ledgers_submit",
+          "style": {
+            "navigationBarTitleText": "数据上报"
+          }
+        },
         {
           "path": "detail",
           "style": {
@@ -134,7 +141,8 @@
           }
         }
       ]
-    },{
+    },
+    {
       "root": "pages/expense-account",
       "pages": [
         {
@@ -142,14 +150,16 @@
           "style": {
             "navigationBarTitleText": "报销管理"
           }
-        },{
+        },
+        {
           "path": "submit",
           "style": {
             "navigationBarTitleText": "报销提交"
           }
         }
       ]
-    },{
+    },
+    {
       "root": "pages/work",
       "pages": [
         {
@@ -167,7 +177,7 @@
     "navigationBarBackgroundColor": "#FFFFFF",
     "backgroundColor": "#FFFFFF",
     "navigationStyle": "custom",
-    "backgroundColorTop":"#FFFFFF",
+    "backgroundColorTop": "#FFFFFF",
     "app-plus": {
       "bounce": "none",
       "scrollIndicator": "none"
diff --git a/src/pages/login/LoginForm.vue b/src/pages/login/LoginForm.vue
index 5f1c5cf..f859ab8 100644
--- a/src/pages/login/LoginForm.vue
+++ b/src/pages/login/LoginForm.vue
@@ -44,17 +44,17 @@ import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 
 const form = ref({
-  username: 'admin',
-  password: 'admin',
+  username: '',
+  password: '',
 })
 
 const handleClick = async () => {
   try {
-    const { username, password } = form.value
-    await userStore.login({
-      username,
-      password,
-    })
+    // const { username, password } = form.value
+    // await userStore.login({
+    //   username,
+    //   password,
+    // })
     uni.switchTab({
       url: '/pages/home/index',
     })
diff --git a/src/pages/revert/index.vue b/src/pages/revert/index.vue
index 746ff85..9daab3c 100644
--- a/src/pages/revert/index.vue
+++ b/src/pages/revert/index.vue
@@ -1,12 +1,13 @@
 <template>
   <view>
-    <CuNavbar title="上报"></CuNavbar>
+    <CuNavbar :isBack="isBack" title="上报"></CuNavbar>
     <uv-sticky>
       <view class="bg-white h-80rpx flex items-center px-base">
         <view>2024-03-21</view>
         <uv-icon class="ml-10rpx" size="20rpx" name="arrow-down-fill"></uv-icon>
       </view>
     </uv-sticky>
+    {{ store.is_lottery_store }}
     <uv-form
       class="mt-30rpx"
       labelPosition="left"
@@ -14,6 +15,22 @@
       labelWidth="130rpx"
     >
       <view class="px-base space-y-20rpx">
+        <view class="card">
+          <view class="pl-20rpx">
+            <uv-form-item label="日期" prop="userInfo.sex">
+              <uv-input
+                disabled
+                disabledColor="#ffffff"
+                placeholder="请选择日期"
+                :border="`none`"
+              >
+              </uv-input>
+              <template v-slot:right>
+                <uv-icon name="arrow-right"></uv-icon>
+              </template>
+            </uv-form-item>
+          </view>
+        </view>
         <view class="card">
           <TitleComp title="电彩"></TitleComp>
           <view class="pl-20rpx">
@@ -101,13 +118,55 @@
 </template>
 
 <script setup>
+import { http } from '@/utils/request'
 import CuNavbar from '@/components/cu-navbar/index'
 import TitleComp from '@/components/title-comp/index'
 import { addUnit, sys } from '@climblee/uv-ui/libs/function/index'
-import { computed } from 'vue'
+import { computed, ref, onBeforeMount, reactive } from 'vue'
+import { useUserStore } from '@/store/modules/user'
+
+const userStore = useUserStore()
+
+const userInfo = computed(() => userStore.userInfo || {})
+const store = computed(() => userInfo.value.store)
+
+const form = reactive({
+  dateTime: Number(new Date()),
+  items: [],
+  new_customers: '',
+  sales: '',
+  expenditure: '',
+  handover_amount: '',
+  photos: [],
+})
+
+const props = defineProps({
+  isBack: {
+    type: Boolean,
+    default: false,
+  },
+})
 const style = computed(() => {
   const style = {}
   style.bottom = addUnit(sys().windowBottom, 'px')
   return style
 })
+
+onBeforeMount(() => {
+  if (!store.value.is_lottery_store) {
+    getTypeList()
+  }
+})
+
+const getTypeList = () => {
+  http
+    .get('/keywords', {
+      params: {
+        parent_key: 'lottery_type',
+      },
+    })
+    .then((res) => {
+      console.log(res)
+    })
+}
 </script>
diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue
index 64a472c..0ad4f28 100644
--- a/src/pages/task/index.vue
+++ b/src/pages/task/index.vue
@@ -63,7 +63,9 @@ const tabList = ref([
   {
     name: '任务审核',
     apiUrl: '/workflow',
-    params: {},
+    params: {
+      // aaa:111
+    },
   },
 ])
 
diff --git a/src/pages/task/task_hygienes_submit.vue b/src/pages/task/task_hygienes_submit.vue
index 2abdc04..e53130c 100644
--- a/src/pages/task/task_hygienes_submit.vue
+++ b/src/pages/task/task_hygienes_submit.vue
@@ -87,19 +87,28 @@ const onSubmit = async () => {
   if (loading.value) return
   loading.value = true
   try {
-    const resData = await http.post(`/tasks/${id.value}/submit`, {
-      id: id.value,
-      description: form.description,
-      photos: form.photos.map((item) => item.url),
+    await http.request({
+      url: `/tasks/${id.value}/submit`,
+      method: 'POST',
+      header: {
+        Accept: 'application/json',
+      },
+      data: {
+        task_hygiene: {
+          description: form.description,
+          photos: form.photos.map((item) => item.url),
+        },
+      },
     })
     uni.showToast({
       title: '提交成功',
       icon: 'none',
     })
     formRef.value.resetFields()
-    uni.$emit('ex:submit', resData)
+    uni.$emit('task:submit', resData)
     uni.navigateBack()
   } catch (error) {
+    console.log(error)
   } finally {
     loading.value = false
   }
diff --git a/src/pages/task/task_ledgers_submit.vue b/src/pages/task/task_ledgers_submit.vue
new file mode 100644
index 0000000..b974213
--- /dev/null
+++ b/src/pages/task/task_ledgers_submit.vue
@@ -0,0 +1,8 @@
+<template>
+  <view>
+    <RevertPage :isBack="true"></RevertPage>
+  </view>
+</template>
+<script setup>
+import RevertPage from "@/pages/revert/index";
+</script>
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b254698..6683039 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,7 +6,8 @@ export const useUserStore = defineStore({
     id: 'app-user',
     state: () => ({
         userInfo: null,
-        token: null,
+        token: '22|ua3STGluZFzDeV1nOs4I3S9s2UCDtQp9AtVLT2jN0535e0a5',
+        roles: []
     }),
     getters: {
         getUserInfo(state) {
@@ -35,6 +36,7 @@ export const useUserStore = defineStore({
             return new Promise((resolve, reject) => {
                 http.get('/auth/profile').then(async (res) => {
                     this.userInfo = res
+                    this.roles = res.role
                     resolve(res);
                 }).catch(err => {
                     reject(err);
diff --git a/src/utils/request.js b/src/utils/request.js
index cc2ad4b..eca3777 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -47,7 +47,7 @@ http.interceptors.response.use(async (response) => {
 
     // 处理响应结果
     const { statusCode, data } = response
-    if (statusCode !== 200 && statusCode !== 201) {
+    if (statusCode >= 400) {
         uni.showToast({
             title: data.message || '服务器错误',
             icon: 'none'