Parcourir la source

fix: 🐛 修复已知bug

zhangtao il y a 1 semaine
Parent
commit
6d10b2b1e4

+ 4 - 0
src/api/core/instance.ts

@@ -32,6 +32,10 @@ export const alovaInstance = createAlova({
       // console.log(`[Environment] ${import.meta.env.VITE_ENV_NAME}`);
     }
     uni.showLoading({ mask: true });
+    console.log(
+      BASE_URL,
+      "=================所连服务器==========================",
+    );
   },
 
   // Response handlers

+ 2 - 1
src/api/globals.d.ts

@@ -408,6 +408,7 @@ declare global {
         Config extends Alova2MethodConfig<FamilyMembers[]> & {
           params: {
             name: string;
+            courseId: string;
           };
         },
       >(
@@ -1080,7 +1081,7 @@ export interface AppOrderProInfo {
    */
   ticketNo?: string;
   /**
-   * 商品类型(1-学校 2-包场 3-无固定场 4-个人赛 5-团队赛 6-课程 7-保险)
+   * 商品类型(0-学校 1-包场 2-无固定场 3-个人赛 4-团队赛 5-课程 6-保险)
    */
   type?: number;
   /**

+ 0 - 2
src/components/classItem/index.vue

@@ -90,8 +90,6 @@ function handlePic(id: string) {
   handleGoPath(`/subPack/selectClass/index?id=${id}`);
 }
 function handlePost() {
-  if (props.item?.postponeNum == 0)
-    return uni.showToast({ title: "暂无可延期人员" });
   const { item } = props;
   handleGoPath(
     `/subPack/ExtensionClass/index?coursesId=${item?.coursesId}&id=${item?.id}`,

+ 3 - 3
src/config/index.ts

@@ -3,13 +3,13 @@ const mapEnvVersion = {
    * 	开发版
    */
   // develop: "http://192.168.1.166:8080/jeecg-boot",
-  // develop: "http://192.168.1.34:8080/jeecg-boot",
+  // develop: "http://192.168.0.217:8080/jeecg-boot",
   develop: "http://192.168.0.11:8080/jeecg-boot",
   /**
    * 	体验版
    */
-  trial: "http://192.168.1.166:8080/jeecg-boot",
-  // trial: "http://192.168.0.11:8080/jeecg-boot",
+  // trial: "http://192.168.1.166:8080/jeecg-boot",
+  trial: "http://192.168.0.11:8080/jeecg-boot",
   /**
    * 正式版
    */

+ 7 - 4
src/pages/index/index.vue

@@ -69,10 +69,13 @@ watch(
   () => isShowLoging.value,
   () => {
     if (isShowLoging.value) {
-      uni.showToast({
-        image: hxs,
-        title: "核销成功",
-      });
+      setTimeout(() => {
+        uni.showToast({
+          image: hxs,
+          title: "核销成功",
+        });
+        isShowLoging.value = false;
+      }, 1000);
     }
   },
 );

+ 7 - 0
src/subPack/EmployeeList/index.vue

@@ -69,6 +69,7 @@ const {
   pageSize,
   pageCount,
   total,
+  isLastPage,
   refresh,
   send: getList,
 } = usePagination(
@@ -82,6 +83,7 @@ const {
     initialPage: 1, // 初始页码,默认为1
     initialPageSize: 10, // 初始每页数据条数,默认为10
     immediate: false,
+    append: true,
   },
 );
 const { send: uploadStatus } = useRequest(
@@ -106,6 +108,11 @@ const { send: del } = useRequest(
     immediate: false,
   },
 );
+onReachBottom(() => {
+  if (!isLastPage.value) {
+    page.value++;
+  }
+});
 async function handleChange(e: SwitchBeforeChangeOption, id: string) {
   await uploadStatus(Number(e.value), id);
   refresh();

+ 1 - 0
src/subPack/Evaluation/index.vue

@@ -144,6 +144,7 @@ const {
     Apis.app.evaluateList({ params: { pageNo: page, pageSize: size } }),
   {
     data: (res) => res.records,
+    append: true,
   },
 );
 const { send: senMsg } = useRequest(

+ 1 - 1
src/subPack/Makeupclass/index.vue

@@ -128,7 +128,7 @@
             size="28rpx"
             color="#000000"
             bold
-            :text="`${item.startTime} ${item.name}`"
+            :text="`${dayjs(item.startTime).format('YYYY-MM-DD HH:mm')} ${dayjs(item.endTime).format('YYYY-MM-DD HH:mm')}  ${item.name}`"
           ></wd-text>
         </view>
       </view>

+ 20 - 15
src/subPack/ReservationClass/index.vue

@@ -30,21 +30,23 @@
           </view>
         </view>
       </view>
-      <view
-        v-if="data.length"
-        class="mt10rpx py10rpx rounded-xl px24rpx"
-        v-for="item in data"
-        @click="selectStudent(item)"
-        :key="item.id"
-        hover-class="hover:bg-gray-100"
-      >
-        <view class="text-28rpx">
-          {{ item.fullName }}
-        </view>
-        <view class="mt12rpx text-[rgb(0,0,0,0.3)] text-24rpx"
-          >{{ item.phone }}
+      <scroll-view scroll-y class="max-h-600rpx">
+        <view
+          v-if="data.length"
+          class="mt10rpx py10rpx rounded-xl px24rpx"
+          v-for="item in data"
+          @click="selectStudent(item)"
+          :key="item.id"
+          hover-class="hover:bg-gray-100"
+        >
+          <view class="text-28rpx">
+            {{ item.fullName }}
+          </view>
+          <view class="mt12rpx text-[rgb(0,0,0,0.3)] text-24rpx"
+            >{{ item.phone }}
+          </view>
         </view>
-      </view>
+      </scroll-view>
     </view>
   </view>
   <fixdbtn block size="large" @click="handleSubmit">提交</fixdbtn>
@@ -57,7 +59,10 @@ import { useWatcher } from "alova/client";
 const inputValue = ref("");
 const selectedTags = ref<FamilyMembers[]>([]);
 const { data } = useWatcher(
-  () => Apis.app.getFamilyMembersByName({ params: { name: inputValue.value } }),
+  () =>
+    Apis.app.getFamilyMembersByName({
+      params: { name: inputValue.value, courseId: coursePriceRulesId.value },
+    }),
   [inputValue],
   { debounce: 500, immediate: false, initialData: [] },
 );

+ 4 - 2
src/subPack/classInspection/index.vue

@@ -54,10 +54,12 @@ const {
   {
     data: (res) => res.records,
     initialPage: 1, // 初始页码,默认为1
-    initialPageSize: 10, // 初始每页数据条数,默认为10
+    initialPageSize: 10, // 初始每页数据条数,默认为10,
+    append: true,
   },
 );
 onShow(async () => {
+  data.value = [];
   await getData();
 });
 function handleClickLeft() {
@@ -65,7 +67,7 @@ function handleClickLeft() {
 }
 
 function handleBottom() {
-  if (isLastPage.value) {
+  if (!isLastPage.value) {
     page.value++;
   }
 }

+ 3 - 1
src/subPack/writeOff/index.vue

@@ -33,7 +33,9 @@
             v-for="item in data.appOrderProInfoVerifyVOS"
             :key="item.appOrderProInfo.id"
           >
-            <view>券号:{{ item.appOrderProInfo.ticketNo }}</view>
+            <view v-if="item.appOrderProInfo.type != 6"
+              >券号:{{ item.appOrderProInfo.ticketNo }}</view
+            >
             <wd-checkbox
               :model-value="item.isinId"
               checked-color="#fdd143"

+ 7 - 2
src/subPack/writeOffDetaile/index.vue

@@ -79,15 +79,20 @@
 import img1 from "@/subPack/static/hxmx.png";
 import { GoodsType } from "@/config";
 import dayjs from "dayjs";
-const { data, refresh } = usePagination(
+const { data, refresh, isLastPage, page } = usePagination(
   (pageNo, pageSize) =>
     Apis.app.pageAppIsinVerifyRecords({ params: { pageNo, pageSize } }),
-  { initialData: [], data: (res) => res.records },
+  { initialData: [], data: (res) => res.records, append: true },
 );
 const { send } = useRequest(
   (appIsinId) => Apis.app.repealVerifyRecord({ params: { appIsinId } }),
   { immediate: false },
 );
+onReachBottom(() => {
+  if (!isLastPage.value) {
+    page.value++;
+  }
+});
 function handleSuccess() {
   uni.showToast({
     image: img1,