Fix 修复小程序部分日期查询出错问题

UI/XYH.APP/src/components/listCard.vue

@@ -29,15 +29,15 @@ const emits = defineEmits<{
 }>()
 
 const isActivity = computed(() => {
-  return props.type.search("activity") >= 0
+  return props.type && props.type.search("activity") >= 0
 })
 
 const isHelp = computed(() => {
-  return props.type.search("help") >= 0
+  return props.type && props.type.search("help") >= 0
 })
 
 const isNews = computed(() => {
-  return props.type.search("news") >= 0
+  return props.type && props.type.search("news") >= 0
 })
 
 const isHot = computed(() => {

UI/XYH.APP/src/pages-sub/activity/myActivity.vue

@@ -145,12 +145,14 @@ function search() {
         params.isAsc = "desc"
         break
       case "week":
-        params.beginActivityDate = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
-        params.endActivityDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+        params.params = {}
+        params.params["beginActivityDate"] = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
+        params.params["endActivityDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
         break
       case "month":
-        params.beginActivityDate = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
-        params.endActivityDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+        params.params = {}
+        params.params["beginActivityDate"] = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
+        params.params["endActivityDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
         break
 
       default:

UI/XYH.APP/src/pages-sub/favorite/activity.vue

@@ -99,12 +99,14 @@ function onSearch() {
   }
   switch (searchType.value) {
     case "week":
-      params.beginDate = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
-      params.endDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+      params.params = {}
+      params.params["beginActivityDate"] = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
+      params.params["endActivityDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
       break
     case "month":
-      params.beginDate = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
-      params.endDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+      params.params = {}
+      params.params["beginActivityDate"] = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
+      params.params["endActivityDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
       break
   }
   queryParams.value = params

UI/XYH.APP/src/pages-sub/favorite/help.vue

@@ -100,12 +100,14 @@ function onSearch() {
   }
   switch (searchType.value) {
     case "week":
-      params.beginDate = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
-      params.endDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+      params.params = {}
+      params.params["beginDate"] = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
+      params.params["endDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
       break
     case "month":
-      params.beginDate = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
-      params.endDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+      params.params = {}
+      params.params["beginDate"] = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
+      params.params["endDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
       break
   }
   queryParams.value = params

UI/XYH.APP/src/pages-sub/favorite/news.vue

@@ -100,12 +100,14 @@ function onSearch() {
   }
   switch (searchType.value) {
     case "week":
-      params.beginDate = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
-      params.endDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+      params.params = {}
+      params.params["beginDate"] = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
+      params.params["endDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
       break
     case "month":
-      params.beginDate = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
-      params.endDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+      params.params = {}
+      params.params["beginDate"] = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
+      params.params["endDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
       break
   }
   queryParams.value = params

UI/XYH.APP/src/pages/activity/index.vue

@@ -93,12 +93,14 @@ function search() {
         params.isAsc = "desc"
         break
       case "week":
-        params.beginActivityDate = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
-        params.endActivityDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+        params.params = {}
+        params.params["beginActivityDate"] = dayjs().startOf("day").add(-7, "day").format("YYYY-MM-DD HH:mm:ss")
+        params.params["endActivityDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
         break
       case "month":
-        params.beginActivityDate = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
-        params.endActivityDate = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
+        params.params = {}
+        params.params["beginActivityDate"] = dayjs().startOf("day").add(-30, "day").format("YYYY-MM-DD HH:mm:ss")
+        params.params["endActivityDate"] = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss")
         break
 
       default:

UI/XYH.APP/src/pages/help/index.vue

@@ -48,6 +48,8 @@ const searchDropdownValue = ref([])
 const queryParams = ref({
   title: "",
   auditStatus: 1,
+  orderByColumn: "readCount",
+  isAsc: "desc",
 })
 const searchPlaceholder = ref("搜索校友互助标题")
 
@@ -83,13 +85,16 @@ function onSearch() {
 }
 
 function search() {
-  const params = {
+  const params: any = {
     auditStatus: 1,
     title: searchInputValue.value || "",
     category: searchDropdownValue.value[0] || "",
     orderByColumn: "readCount",
     isAsc: "desc",
   }
+  if (searchType.value) {
+    params.category = searchType.value
+  }
   queryParams.value = params
 }
 

UI/XYH.APP/src/pages/news/index.vue

@@ -42,6 +42,8 @@ const searchDropdownValue = ref([])
 const queryParams = ref({
   title: "",
   auditStatus: 1,
+  orderByColumn: "readCount",
+  isAsc: "desc",
 })
 const searchPlaceholder = ref("搜索校友资讯标题")
 
@@ -71,13 +73,16 @@ function onSearch() {
 }
 
 function search() {
-  const params = {
+  const params: any = {
     auditStatus: 1,
     title: searchInputValue.value || "",
     category: searchDropdownValue.value[0] || "",
     orderByColumn: "readCount",
     isAsc: "desc",
   }
+  if (searchType.value) {
+    params.category = searchType.value
+  }
   queryParams.value = params
 }
 

UI/XYH.VUE/vite.config.ts

@@ -120,8 +120,8 @@ export default defineConfig(({ mode, command }) => {
 			open: true,
 			proxy: {
 				"/dev-api": {
-					//target: "http://127.0.0.1:5051",
-					target: "http://xyhapi.yue.shvber.com:4031",
+					target: "http://127.0.0.1:5051",
+					//target: "http://xyhapi.yue.shvber.com:4031",
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/dev-api/, "")
 				}