最新代码

src/pages.json

@@ -43,8 +43,7 @@
     {
       "path": "pages/class/evaluate",
       "style": {
-        "navigationBarTitleText": "培训评价",
-        "onReachBottomDistance": 50
+        "navigationBarTitleText": "培训评价"
       }
     },
     {

src/pages/class/addressBook.vue

@@ -56,7 +56,6 @@ onLoad((options: any) => {
 })
 
 const search = (val: any) => {
-  addressBookList.value = []
   listQuery.Name = val.value
   init()
 }
@@ -77,9 +76,8 @@ const init = async () => {
   if (res.code == 200) {
     if (res.total > 10) status.value = "loadmore"
     else status.value = "nomore"
-    addressBookList.value = res.data
+    addressBookList.value = [...addressBookList.value, ...res.data]
     listQuery.total = res.total
-    console.log(res.data)
   }
 }
 // 上拉加载数据
@@ -97,6 +95,7 @@ onReachBottom(() => {
 <style lang="scss" scoped>
 .address-book-item-container {
   padding: 0 30rpx;
+  box-sizing: border-box;
 
   .uni-searchbar {
     padding: 0;

src/pages/class/components/arrangeItem.vue

@@ -53,7 +53,7 @@ const props = defineProps({
 
 const show = ref(false)
 const infoRef = ref()
-const arrangeDetail = ["上课中", "未开始", "已下课"]
+const arrangeDetail = ["未开始", "上课中", "已下课"]
 
 const arrangeStatus = computed(() => {
   const statusObj = {

src/pages/class/components/classItem.vue

@@ -56,7 +56,7 @@
     v-model="show"
     :classId="classItem.classId"
     :Url="classItem.Url"
-    @init="emits('init')"
+    @init="emits('init', current)"
   />
 </template>
 

src/pages/class/components/saveQrCode.vue

@@ -29,7 +29,6 @@
 </template>
 
 <script setup lang="ts">
-import { qrCodeUrl } from "@/utils/example"
 import { baseUrl } from "@/utils/request"
 import { toast } from "@/utils/util"
 
@@ -60,8 +59,8 @@ const updateImage = () => {
         success: ({ data }: any) => {
           const res = JSON.parse(data)
           if (res.code == 200) {
-            emits("update:modelValue", false)
             emits("init")
+            emits("update:modelValue", false)
             toast("更新成功")
           }
         },

src/pages/class/evaluate.vue

@@ -107,8 +107,7 @@
 
 <script setup lang="ts">
 // import headers from "@/components/header/index.vue"
-import { remarkOn, remarkDetail } from "@/api/class"
-import { toast, zconfirm } from "@/utils/util"
+import { remarkDetail } from "@/api/class"
 
 const disabled = ref(false)
 const evaluateData = reactive({

src/pages/class/index.vue

@@ -123,11 +123,10 @@ const init = async () => {
     else status.value = "nomore"
     classList.value = [...classList.value, ...res.data]
     listQuery.total = res.total
-    console.log(classList.value)
   }
 }
 
-init()
+tabsChange(tabsState.current)
 </script>
 
 <style lang="scss" scoped>

src/pages/course/components/detailsItem.vue

@@ -105,8 +105,8 @@ const tagList = [
 // 未签退：QD + ''
 // 签到请假：QDQJ + ''
 // 签退请假: QD + QTQJ
-// 已补签：QDBJ + ''
-// 签退补签: '' + QDBJ
+// 已补签：QDBQ + ''
+// 签退补签: QD + QTBQ
 
 const state: any = computed(() => {
   let data = tagList[1] // 默认值
@@ -115,18 +115,18 @@ const state: any = computed(() => {
 
   const conditions = {
     "QD-QT": tagList[0],
-    QD: tagList[2],
-    QDQJ: tagList[3],
+    "QD-": tagList[2],
+    "QDQJ-": tagList[3],
     "QD-QTQJ": tagList[4],
-    QDBQ: tagList[5],
-    "QD-QDBJ": tagList[6],
+    "QDBQ-": tagList[5],
+    "QD-QTBQ": tagList[6],
   } as any
 
   const key = `${SingIn || ""}-${SingOut || ""}`
+
   if (conditions.hasOwnProperty(key)) {
     data = conditions[key]
   }
-
   data = { ...data, SingInText, SingOutText }
   return data
 })
@@ -150,7 +150,7 @@ const signOutStatus = (status: string) => {
     return "已补签"
   } else if (status) {
     return status === "QTBQ"
-      ? "已补签"
+      ? "签退补签"
       : status === "QT"
       ? "已签退"
       : status === "QTQJ"
@@ -186,7 +186,7 @@ const submit = async (reason: string) => {
         FStudentId: {
           FNUMBER: props.detailItem.studentNum,
         },
-        FDate: dayjs().format("YYYY-MM-DD"),
+        FDate: dayjs().format("YYYY-MM-DD HH:mm:ss"),
         FLocation: "",
         FLocationDetails: "",
         FCockinType: "",

src/pages/course/seeMore.vue

@@ -15,7 +15,7 @@
               width="100rpx"
               height="100rpx"
               border-radius="10"
-              :src="src"
+              :src="baseUrl + '/' + item.Url"
             />
             <view class="info-text">
               <text>{{ item.teachName }}</text>
@@ -47,7 +47,7 @@
 
 <script setup lang="ts">
 import { useCourseStore } from "@/store/modules/courseStore"
-import { src } from "@/utils/example"
+import { baseUrl } from "@/utils/request"
 
 const courseStore = useCourseStore()
 

src/pages/home/index.vue

@@ -10,7 +10,7 @@
         border-radius="30"
       />
       <text class="name">{{ globalStore.infoData.Name }}</text>
-      <view class="info">
+      <view v-if="globalStore.Phone" class="info">
         <text>{{
           globalStore.infoData.Type == "BZR" ? "班主任" : "讲师"
         }}</text>

src/pages/setPositioning/components/setPositionItem.vue

@@ -19,12 +19,12 @@
           <text
             >应用范围：{{
               positionItem.type
-                ? positionItem.type
+                ? positionItem.type == "1"
                   ? "同步班级所有课程的考勤定位"
                   : "仅当前课程考勤定位"
                 : "未设置"
-            }}</text
-          >
+            }}
+          </text>
         </view>
       </template>
       <template #foot>

src/utils/request.ts

@@ -5,6 +5,7 @@ export const baseUrl = "/k3cloud"
 // 部署到iis上用的
 // export const baseUrl = "https://weixin3.lingqingkeji.com/k3cloud"
 // export const baseUrl = "/XiBU"
+
 const globalStore = useGlobalStore()
 
 // 封装公共申请办法