更新代码

src/pages/class/courseArrange.vue

@@ -44,6 +44,7 @@ const listQuery = reactive({
   pageSize: 10,
   total: 0,
   classId: "",
+  Name: "",
 })
 
 const status = ref("loadmore")
@@ -58,7 +59,7 @@ onReachBottom(() => {
   // 判断是否还有下一页数据
   if (listQuery.pageIndex * listQuery.pageSize >= listQuery.total)
     return (status.value = "nomore")
-  // // 判断是否正在请求其它数据，如果是，则不发起额外的请求
+  // 判断是否正在请求其它数据，如果是，则不发起额外的请求
   if (status.value === "loading") return
   listQuery.pageIndex += 1
   init()

src/pages/course/components/detailsItem.vue

@@ -17,7 +17,7 @@
                 <text>上课签到：</text>
                 <view class="content">
                   <text>{{
-                    singInStatus(detailItem.State[0]?.Value[0].SingIn)
+                    signInStatus(detailItem.State[0]?.Value[0].SingIn)
                   }}</text>
                   <text
                     v-show="state.SingInText != ' ' && state.SingInText"
@@ -34,7 +34,7 @@
                 <text>下课签退：</text>
                 <view class="content">
                   <text>{{
-                    singOutStatus(detailItem.State[0]?.Value[0].SingOut)
+                    signOutStatus(detailItem.State[0]?.Value[0].SingOut)
                   }}</text>
                   <text
                     v-show="state.SingOutText != ' ' && state.SingOutText"
@@ -107,21 +107,7 @@ const tagList = [
 // 签退请假: QD + QTQJ
 // 已补签：QDBJ + ''
 // 签退补签: '' + QDBJ
-const state1: any = computed(() => {
-  let data
-  const { SingIn, SingOut, SingInText, SingOutText } =
-    props.detailItem.State[0].Value[0]
-  if (SingIn == "QD" && SingOut == "QT") data = tagList[0]
-  if (!SingOut && !SingOut) data = tagList[1]
-  if (SingIn == "QD" && !SingOut) data = tagList[2]
-  if (SingIn == "QDQJ" && !SingOut) data = tagList[3]
-  if (SingIn == "QD" && SingOut == "QTQJ") data = tagList[4]
-  if (SingIn == "QDBQ" && !SingOut) data = tagList[5]
-  if (SingIn == "QD" && SingOut == "QDBJ") data = tagList[6]
-  data = { ...data, ...{ SingInText }, ...{ SingOutText } }
-  console.log(data)
-  return data
-})
+
 const state: any = computed(() => {
   let data = tagList[1] // 默认值
   const { SingIn, SingOut, SingInText, SingOutText } =
@@ -145,44 +131,34 @@ const state: any = computed(() => {
   return data
 })
 
-const singInStatus = (status: string) => {
-  let str = ""
+const signInStatus = (status: string) => {
   if (status) {
-    switch (status) {
-      case "QDBQ":
-        str = "已补签"
-        break
-      case "QD":
-        str = "已签到"
-        break
-      case "QDQJ":
-        str = "签到请假"
-        break
-    }
+    return status === "QDBQ"
+      ? "已补签"
+      : status === "QD"
+      ? "已签到"
+      : status === "QDQJ"
+      ? "签到请假"
+      : "未签到"
   } else {
-    str = "未签到"
+    return "未签到"
   }
-  return str
 }
 
-const singOutStatus = (status: string) => {
-  let str = ""
-  if (status) {
-    switch (status) {
-      case "QTBQ":
-        str = "已补签"
-        break
-      case "QT":
-        str = "已签退"
-        break
-      case "QTQJ":
-        str = "签退请假"
-        break
-    }
+const signOutStatus = (status: string) => {
+  if (props.detailItem?.State[0]?.Value[0].SingIn === "QDBQ") {
+    return "已补签"
+  } else if (status) {
+    return status === "QTBQ"
+      ? "已补签"
+      : status === "QT"
+      ? "已签退"
+      : status === "QTQJ"
+      ? "签退请假"
+      : "未签退"
   } else {
-    str = "未签退"
+    return "未签退"
   }
-  return str
 }
 
 const leave = () => {

src/utils/request.ts

-import config from "./config"
+import { useGlobalStore } from "@/store/useStore"
+import { hLoading, sLoading, toast } from "./util"
 
-// export const baseUrl = "/k3cloud"
+export const baseUrl = "/k3cloud"
 // 部署到iis上用的
 // export const baseUrl = "https://weixin3.lingqingkeji.com/k3cloud"
-export const baseUrl = "/XiBU"
+// export const baseUrl = "/XiBU"
+const globalStore = useGlobalStore()
 
 // 封装公共申请办法
 function request(
@@ -14,9 +16,16 @@ function request(
 ) {
   return new Promise<any>(function (resolve, reject) {
     let header: any
-    uni.showLoading({
-      title: "加载中...",
-    })
+    sLoading()
+    let pages = getCurrentPages()
+    let page = pages[pages.length - 1] // 当前页面
+    if (
+      page.route !== "pages/login/index" &&
+      page.route !== "pages/login/register" &&
+      JSON.stringify(globalStore.infoData) === "{}"
+    ) {
+      uni.reLaunch({ url: "/pages/login/index" })
+    }
     header = { "Content-Type": "application/json" }
     url = baseUrl + url
 
@@ -27,14 +36,11 @@ function request(
       header,
       responseType,
       success(res: any) {
-        uni.hideLoading()
+        hLoading()
         if (res.data.code == 200) {
           resolve(res)
         } else if (res.data.code == 500 || res.data.code === 401) {
-          uni.showToast({
-            title: res.data.msg,
-            icon: "none",
-          })
+          toast(res.data.msg)
           reject(res)
         } else if (res.data.code == 501 || res.data.code == 911) {
           uni.reLaunch({
@@ -53,7 +59,7 @@ function request(
         }
       },
       fail(err: any) {
-        uni.hideLoading()
+        hLoading()
         //申请失败
         uni.showToast({
           title: "连接服务器失败",