Просмотр исходного кода

Add 添加资讯列表及详情

Yue 2 лет назад
Родитель
Сommit
ffbef3c14f

+ 1 - 6
SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/amActivity/service/impl/AmNewsServiceImpl.java

@@ -95,12 +95,7 @@ public class AmNewsServiceImpl implements IAmNewsService {
         //lqw.eq(StringUtils.isNotBlank(bo.getIsClose()), AmNews::getIsClose, bo.getIsClose());
         lqw.eq(StringUtils.isNotBlank(bo.getImages()), AmNews::getImages, bo.getImages());
         lqw.orderByDesc(AmNews::getIsHead);
-        if (bo.getIsHot().equals("1")) {
-            lqw.orderByDesc(AmNews::getIsHot);
-        }
-        if (StringUtils.isNotBlank(bo.getCreateBy())) {
-            lqw.orderByDesc(AmNews::getCreateTime);
-        }
+       
         return lqw;
     }
 

+ 2 - 3
SERVER/YanZhongXYH/xyh-system/src/main/resources/mapper/amActivity/AmNewsMapper.xml

@@ -35,7 +35,6 @@
                am.publish_user,
                am.is_head,
                am.is_hot,
-               am.is_sys,
                am.images,
                am.is_close,
                am.del_flag,
@@ -48,9 +47,9 @@
                IFNULL(ams.readCount, 0)     AS readCount,
                IFNULL(ams.starCount, 0)     AS starCount,
                IFNULL(ams.favoriteCount, 0) AS favoriteCount
-        FROM am_help AS am
+        FROM am_news AS am
                  LEFT JOIN (SELECT source_id, COUNT(source_id) AS count FROM am_comment GROUP BY source_id) AS ac
-                           ON ac.source_id = am.help_id
+                           ON ac.source_id = am.news_id
                  LEFT JOIN (SELECT source_id,
                                    SUM(read_status)     AS readCount,
                                    SUM(star_status)     AS starCount,

+ 9 - 5
UI/XYH.APP/src/components/comment.vue

@@ -147,16 +147,20 @@ function loadComments() {
 
 function loadAmStatistics() {
   apis.amActivity.statisticsApi.getAmStatistics(props.sourceId).then((res) => {
-    amStatistics.value = res
+    if (res) {
+      amStatistics.value = res
+    }
   })
 }
 
 function loadStatistics() {
   apis.amActivity.statisticsApi.getStatisticsBySourceId(props.sourceId).then((res) => {
-    commentCount.value = res.commentCount
-    readCount.value = res.readCount
-    starCount.value = res.starCount
-    favoriteCount.value = res.favoriteCount
+    if (res) {
+      commentCount.value = res.commentCount
+      readCount.value = res.readCount
+      starCount.value = res.starCount
+      favoriteCount.value = res.favoriteCount
+    }
   })
 }
 

+ 108 - 0
UI/XYH.APP/src/pages-sub/news/detail.vue

@@ -0,0 +1,108 @@
+<template>
+  <view class="page-container">
+    <vb-cell-group v-if="ready">
+      <view class="flex-column pos-r p-15">
+        <view
+          class="pos-a px-8 py-3 fs-12 text-white"
+          :class="getStatusClass"
+          style="top: 0; right: 0; border-radius: 0 0 0 var(--vb-cell-group-radius)"
+        >
+          {{ getStatus }}
+        </view>
+        <view class="py-5 fs-20 font-bold">{{ news.title }}</view>
+        <view class="d-fcv py-10 ps-5 text-gray-5">
+          {{ formatDate(news.pubishDate, "YYYY-MM-DD") }} {{ news.categoryName }}
+        </view>
+
+        <view class="my-5 text-indent">
+          {{ news.content }}
+        </view>
+        <view class="mt-10" v-if="images.length > 0">
+          <view class="d-fc my-5 py-5 w-100" v-for="(v, i) in images" :key="i">
+            <image class="br-10" :src="v" mode=""></image>
+          </view>
+        </view>
+      </view>
+    </vb-cell-group>
+    <Comment :source-id="newsId" source-type="news"></Comment>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import dayjs from "dayjs"
+import apis from "@/api"
+import route from "@/route"
+import configs from "@/core/config"
+import Comment from "@/components/comment.vue"
+
+const params = route.getRouteParams("newsDetail")
+const ready = ref(false)
+const news = ref<any>({})
+const newsId = ref(params.id)
+
+function formatDate(date: any, format = "YYYY-MM-DD") {
+  return dayjs(new Date(date)).format(format)
+}
+const getStatusClass = computed(() => {
+  if (news.value.close == "1") {
+    return "bg-danger"
+  }
+  if (dayjs(news.value.expiryDate).isBefore(new Date())) {
+    return "bg-warning"
+  }
+  if (news.value.auditStatus == "1") {
+    return "bg-vb"
+  }
+  if (news.value.auditStatus == "0") {
+    return "bg-gray-5"
+  }
+  return ""
+})
+
+const getStatus = computed(() => {
+  if (news.value.close == "1") {
+    return "已结束"
+  }
+  if (dayjs(news.value.expiryDate).isBefore(new Date())) {
+    return "已过期"
+  }
+  if (news.value.auditStatus == "1") {
+    return "报名中"
+  }
+  if (news.value.auditStatus == "0") {
+    return "审核中"
+  }
+  return ""
+})
+
+const isClose = computed(() => {
+  return news.value.close == "1" || dayjs(news.value.expiryDate).isBefore(new Date())
+})
+
+const images = computed(() => {
+  if (news.value.images) {
+    return news.value.images.split(",").map((item: string) => configs.baseUrl + "/oss/preview/" + item)
+  }
+  return []
+})
+
+function loadData() {
+  if (newsId.value) {
+    apis.amActivity.newsApi.getNews(newsId.value).then((res) => {
+      news.value = res
+      ready.value = true
+    })
+  }
+}
+
+function read() {
+  apis.amActivity.statisticsApi.read(newsId.value, "news").then(() => {})
+}
+function init() {
+  loadData()
+  read()
+}
+onMounted(init)
+</script>
+
+<style scoped></style>

+ 320 - 309
UI/XYH.APP/src/pages.json

@@ -1,310 +1,321 @@
 {
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
-      "^qiun-(.*)": "@/components/uCharts/qiun-$1/qiun-$1.vue",
-      "^vb-(.*)": "@/components/vber/$1/vb-$1.vue"
-    }
-  },
-  "pages": [
-    //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-    {
-      "path": "pages/index/welcome",
-      "style": {
-        "navigationBarTitleText": "盐城中学校友会"
-      }
-    },
-    {
-      "path": "pages/account/login",
-      "style": {
-        "navigationBarTitleText": "登录"
-      }
-    },
-    {
-      "path": "pages/account/register",
-      "style": {
-        "navigationBarTitleText": "注册新用户"
-      }
-    },
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "首页"
-      }
-    },
-    {
-      "path": "pages/mine/index",
-      "style": {
-        "navigationBarTitleText": "个人中心"
-      }
-    },
-    {
-      "path": "pages/common/webview/index",
-      "style": {
-        "navigationBarTitleText": "浏览网页"
-      }
-    },
-    {
-      "path": "pages/common/textview/index",
-      "style": {
-        "navigationBarTitleText": "浏览文本"
-      }
-    },
-    {
-      "path": "pages/account/forgetPwd",
-      "style": {
-        "navigationBarTitleText": "忘记密码"
-      }
-    },
-    {
-      "path": "pages/account/systemLogin",
-      "style": {
-        "navigationBarTitleText": "后台管理系统"
-      }
-    },
-    {
-      "path": "pages/alumnus/index",
-      "style": {
-        "navigationBarTitleText": "校友通讯录"
-      }
-    },
-    {
-      "path": "pages/activity/index",
-      "style": {
-        "navigationBarTitleText": "校友活动"
-      }
-    },
-    {
-      "path": "pages/help/index",
-      "style": {
-        "navigationBarTitleText": "校友互助"
-      }
-    },
-    {
-      "path": "pages/news/index",
-      "style": {
-        "navigationBarTitleText": "新闻资讯"
-      }
-    }
-  ],
-  "subPackages": [
-    {
-      "root": "pages-sub/mine",
-      "pages": [
-        {
-          "path": "profile/edit",
-          "style": {
-            "navigationBarTitleText": "完善个人信息"
-          }
-        },
-        {
-          "path": "profile/avatar",
-          "style": {
-            "navigationBarTitleText": "上传头像"
-          }
-        },
-        {
-          "path": "setting",
-          "style": {
-            "navigationBarTitleText": "应用设置"
-          }
-        },
-        {
-          "path": "privacy",
-          "style": {
-            "navigationBarTitleText": "隐私设置"
-          }
-        },
-        {
-          "path": "pwd",
-          "style": {
-            "navigationBarTitleText": "修改密码"
-          }
-        },
-        {
-          "path": "about",
-          "style": {
-            "navigationBarTitleText": "关于我们"
-          }
-        },
-        {
-          "path": "help",
-          "style": {
-            "navigationBarTitleText": "常见问题"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages-sub/alumnus",
-      "pages": [
-        {
-          "path": "detail",
-          "style": {
-            "navigationBarTitleText": "校友主页"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages-sub/activity",
-      "pages": [
-        {
-          "path": "edit",
-          "style": {
-            "navigationBarTitleText": "创建活动"
-          }
-        },
-        {
-          "path": "detail",
-          "style": {
-            "navigationBarTitleText": "活动详情"
-          }
-        },
-        {
-          "path": "apply",
-          "style": {
-            "navigationBarTitleText": "活动报名"
-          }
-        },
-        {
-          "path": "applyList",
-          "style": {
-            "navigationBarTitleText": "报名列表"
-          }
-        },
-        {
-          "path": "applyAudit",
-          "style": {
-            "navigationBarTitleText": "报名审核"
-          }
-        },
-        {
-          "path": "myActivity",
-          "style": {
-            "navigationBarTitleText": "我的活动"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages-sub/help",
-      "pages": [
-        {
-          "path": "detail",
-          "style": {
-            "navigationBarTitleText": "互助详情"
-          }
-        },
-        {
-          "path": "edit",
-          "style": {
-            "navigationBarTitleText": "编辑互助"
-          }
-        },
-        {
-          "path": "myHelp",
-          "style": {
-            "navigationBarTitleText": "我的互助"
-          }
-        }
-      ]
-    }
-  ],
-  "tabBar": {
-    "color": "#8a8a8a",
-    "selectedColor": "#0e9489",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/images/tabbar/home2.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/activity/index",
-        "iconPath": "static/images/tabbar/activity.png",
-        "selectedIconPath": "static/images/tabbar/activity2.png",
-        "text": "活动"
-      },
-      {
-        "pagePath": "pages/help/index",
-        "iconPath": "static/images/tabbar/help.png",
-        "selectedIconPath": "static/images/tabbar/help2.png",
-        "text": "互助"
-      },
-      {
-        "pagePath": "pages/alumnus/index",
-        "iconPath": "static/images/tabbar/alumnus.png",
-        "selectedIconPath": "static/images/tabbar/alumnus2.png",
-        "text": "通讯录"
-      },
-      {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/images/tabbar/mine.png",
-        "selectedIconPath": "static/images/tabbar/mine2.png",
-        "text": "个人中心"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "盐城中学校友会",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "usingComponents": {
-      //这里为方便,全局引入了所有组件,也可以在某个page下单独引用某个组件
-      // "van-action-sheet": "/wxcomponents/vant/dist/action-sheet/index",
-      // "van-area": "/wxcomponents/vant/dist/area/index",
-      // // "van-badge": "/wxcomponents/vant/dist/badge/index",
-      // // "van-badge-group": "/wxcomponents/vant/dist/badge-group/index",
-      // "van-button": "/wxcomponents/vant/dist/button/index",
-      // "van-card": "/wxcomponents/vant/dist/card/index",
-      // "van-cell": "/wxcomponents/vant/dist/cell/index",
-      // "van-cell-group": "/wxcomponents/vant/dist/cell-group/index",
-      // "van-checkbox": "/wxcomponents/vant/dist/checkbox/index",
-      // "van-checkbox-group": "/wxcomponents/vant/dist/checkbox-group/index",
-      // "van-col": "/wxcomponents/vant/dist/col/index",
-      // "van-dialog": "/wxcomponents/vant/dist/dialog/index",
-      // "van-field": "/wxcomponents/vant/dist/field/index",
-      // // "van-goods-action": "/wxcomponents/vant/dist/goods-action/index",
-      // // "van-goods-action-icon": "/wxcomponents/vant/dist/goods-action-icon/index",
-      // // "van-goods-action-button": "/wxcomponents/vant/dist/goods-action-button/index",
-      // "van-icon": "/wxcomponents/vant/dist/icon/index",
-      // "van-loading": "/wxcomponents/vant/dist/loading/index",
-      // "van-nav-bar": "/wxcomponents/vant/dist/nav-bar/index",
-      // "van-notice-bar": "/wxcomponents/vant/dist/notice-bar/index",
-      // "van-notify": "/wxcomponents/vant/dist/notify/index",
-      // "van-panel": "/wxcomponents/vant/dist/panel/index",
-      // "van-popup": "/wxcomponents/vant/dist/popup/index",
-      // "van-progress": "/wxcomponents/vant/dist/progress/index",
-      // "van-radio": "/wxcomponents/vant/dist/radio/index",
-      // "van-radio-group": "/wxcomponents/vant/dist/radio-group/index",
-      // "van-row": "/wxcomponents/vant/dist/row/index",
-      // "van-search": "/wxcomponents/vant/dist/search/index",
-      // "van-slider": "/wxcomponents/vant/dist/slider/index",
-      // "van-stepper": "/wxcomponents/vant/dist/stepper/index",
-      // "van-steps": "/wxcomponents/vant/dist/steps/index",
-      // "van-submit-bar": "/wxcomponents/vant/dist/submit-bar/index",
-      // "van-swipe-cell": "/wxcomponents/vant/dist/swipe-cell/index",
-      // "van-switch": "/wxcomponents/vant/dist/switch/index",
-      // // "van-switch-cell": "/wxcomponents/vant/dist/switch-cell/index",
-      // "van-tab": "/wxcomponents/vant/dist/tab/index",
-      // "van-tabs": "/wxcomponents/vant/dist/tabs/index",
-      // "van-tabbar": "/wxcomponents/vant/dist/tabbar/index",
-      // "van-tabbar-item": "/wxcomponents/vant/dist/tabbar-item/index",
-      // "van-tag": "/wxcomponents/vant/dist/tag/index",
-      // "van-toast": "/wxcomponents/vant/dist/toast/index",
-      // "van-transition": "/wxcomponents/vant/dist/transition/index",
-      // "van-tree-select": "/wxcomponents/vant/dist/tree-select/index",
-      // "van-datetime-picker": "/wxcomponents/vant/dist/datetime-picker/index",
-      // "van-rate": "/wxcomponents/vant/dist/rate/index",
-      // "van-collapse": "/wxcomponents/vant/dist/collapse/index",
-      // "van-collapse-item": "/wxcomponents/vant/dist/collapse-item/index",
-      // "van-picker": "/wxcomponents/vant/dist/picker/index"
-    }
-  }
-}
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
+			"^qiun-(.*)": "@/components/uCharts/qiun-$1/qiun-$1.vue",
+			"^vb-(.*)": "@/components/vber/$1/vb-$1.vue"
+		}
+	},
+	"pages": [
+		//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/welcome",
+			"style": {
+				"navigationBarTitleText": "盐城中学校友会"
+			}
+		},
+		{
+			"path": "pages/account/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/account/register",
+			"style": {
+				"navigationBarTitleText": "注册新用户"
+			}
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页"
+			}
+		},
+		{
+			"path": "pages/mine/index",
+			"style": {
+				"navigationBarTitleText": "个人中心"
+			}
+		},
+		{
+			"path": "pages/common/webview/index",
+			"style": {
+				"navigationBarTitleText": "浏览网页"
+			}
+		},
+		{
+			"path": "pages/common/textview/index",
+			"style": {
+				"navigationBarTitleText": "浏览文本"
+			}
+		},
+		{
+			"path": "pages/account/forgetPwd",
+			"style": {
+				"navigationBarTitleText": "忘记密码"
+			}
+		},
+		{
+			"path": "pages/account/systemLogin",
+			"style": {
+				"navigationBarTitleText": "后台管理系统"
+			}
+		},
+		{
+			"path": "pages/alumnus/index",
+			"style": {
+				"navigationBarTitleText": "校友通讯录"
+			}
+		},
+		{
+			"path": "pages/activity/index",
+			"style": {
+				"navigationBarTitleText": "校友活动"
+			}
+		},
+		{
+			"path": "pages/help/index",
+			"style": {
+				"navigationBarTitleText": "校友互助"
+			}
+		},
+		{
+			"path": "pages/news/index",
+			"style": {
+				"navigationBarTitleText": "新闻资讯"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "pages-sub/mine",
+			"pages": [
+				{
+					"path": "profile/edit",
+					"style": {
+						"navigationBarTitleText": "完善个人信息"
+					}
+				},
+				{
+					"path": "profile/avatar",
+					"style": {
+						"navigationBarTitleText": "上传头像"
+					}
+				},
+				{
+					"path": "setting",
+					"style": {
+						"navigationBarTitleText": "应用设置"
+					}
+				},
+				{
+					"path": "privacy",
+					"style": {
+						"navigationBarTitleText": "隐私设置"
+					}
+				},
+				{
+					"path": "pwd",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+					}
+				},
+				{
+					"path": "about",
+					"style": {
+						"navigationBarTitleText": "关于我们"
+					}
+				},
+				{
+					"path": "help",
+					"style": {
+						"navigationBarTitleText": "常见问题"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages-sub/alumnus",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "校友主页"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages-sub/activity",
+			"pages": [
+				{
+					"path": "edit",
+					"style": {
+						"navigationBarTitleText": "创建活动"
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "活动详情"
+					}
+				},
+				{
+					"path": "apply",
+					"style": {
+						"navigationBarTitleText": "活动报名"
+					}
+				},
+				{
+					"path": "applyList",
+					"style": {
+						"navigationBarTitleText": "报名列表"
+					}
+				},
+				{
+					"path": "applyAudit",
+					"style": {
+						"navigationBarTitleText": "报名审核"
+					}
+				},
+				{
+					"path": "myActivity",
+					"style": {
+						"navigationBarTitleText": "我的活动"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages-sub/help",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "互助详情"
+					}
+				},
+				{
+					"path": "edit",
+					"style": {
+						"navigationBarTitleText": "编辑互助"
+					}
+				},
+				{
+					"path": "myHelp",
+					"style": {
+						"navigationBarTitleText": "我的互助"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages-sub/news",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "资讯详情"
+					}
+				}
+			]
+		}
+	],
+	"tabBar": {
+		"color": "#8a8a8a",
+		"selectedColor": "#0e9489",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [
+			{
+				"pagePath": "pages/news/index",
+				"iconPath": "static/images/tabbar/home.png",
+				"selectedIconPath": "static/images/tabbar/home2.png",
+				"text": "资讯"
+			},
+			{
+				"pagePath": "pages/activity/index",
+				"iconPath": "static/images/tabbar/activity.png",
+				"selectedIconPath": "static/images/tabbar/activity2.png",
+				"text": "活动"
+			},
+			{
+				"pagePath": "pages/help/index",
+				"iconPath": "static/images/tabbar/help.png",
+				"selectedIconPath": "static/images/tabbar/help2.png",
+				"text": "互助"
+			},
+			{
+				"pagePath": "pages/alumnus/index",
+				"iconPath": "static/images/tabbar/alumnus.png",
+				"selectedIconPath": "static/images/tabbar/alumnus2.png",
+				"text": "通讯录"
+			},
+			{
+				"pagePath": "pages/mine/index",
+				"iconPath": "static/images/tabbar/mine.png",
+				"selectedIconPath": "static/images/tabbar/mine2.png",
+				"text": "个人中心"
+			}
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "盐城中学校友会",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"usingComponents": {
+			//这里为方便,全局引入了所有组件,也可以在某个page下单独引用某个组件
+			// "van-action-sheet": "/wxcomponents/vant/dist/action-sheet/index",
+			// "van-area": "/wxcomponents/vant/dist/area/index",
+			// // "van-badge": "/wxcomponents/vant/dist/badge/index",
+			// // "van-badge-group": "/wxcomponents/vant/dist/badge-group/index",
+			// "van-button": "/wxcomponents/vant/dist/button/index",
+			// "van-card": "/wxcomponents/vant/dist/card/index",
+			// "van-cell": "/wxcomponents/vant/dist/cell/index",
+			// "van-cell-group": "/wxcomponents/vant/dist/cell-group/index",
+			// "van-checkbox": "/wxcomponents/vant/dist/checkbox/index",
+			// "van-checkbox-group": "/wxcomponents/vant/dist/checkbox-group/index",
+			// "van-col": "/wxcomponents/vant/dist/col/index",
+			// "van-dialog": "/wxcomponents/vant/dist/dialog/index",
+			// "van-field": "/wxcomponents/vant/dist/field/index",
+			// // "van-goods-action": "/wxcomponents/vant/dist/goods-action/index",
+			// // "van-goods-action-icon": "/wxcomponents/vant/dist/goods-action-icon/index",
+			// // "van-goods-action-button": "/wxcomponents/vant/dist/goods-action-button/index",
+			// "van-icon": "/wxcomponents/vant/dist/icon/index",
+			// "van-loading": "/wxcomponents/vant/dist/loading/index",
+			// "van-nav-bar": "/wxcomponents/vant/dist/nav-bar/index",
+			// "van-notice-bar": "/wxcomponents/vant/dist/notice-bar/index",
+			// "van-notify": "/wxcomponents/vant/dist/notify/index",
+			// "van-panel": "/wxcomponents/vant/dist/panel/index",
+			// "van-popup": "/wxcomponents/vant/dist/popup/index",
+			// "van-progress": "/wxcomponents/vant/dist/progress/index",
+			// "van-radio": "/wxcomponents/vant/dist/radio/index",
+			// "van-radio-group": "/wxcomponents/vant/dist/radio-group/index",
+			// "van-row": "/wxcomponents/vant/dist/row/index",
+			// "van-search": "/wxcomponents/vant/dist/search/index",
+			// "van-slider": "/wxcomponents/vant/dist/slider/index",
+			// "van-stepper": "/wxcomponents/vant/dist/stepper/index",
+			// "van-steps": "/wxcomponents/vant/dist/steps/index",
+			// "van-submit-bar": "/wxcomponents/vant/dist/submit-bar/index",
+			// "van-swipe-cell": "/wxcomponents/vant/dist/swipe-cell/index",
+			// "van-switch": "/wxcomponents/vant/dist/switch/index",
+			// // "van-switch-cell": "/wxcomponents/vant/dist/switch-cell/index",
+			// "van-tab": "/wxcomponents/vant/dist/tab/index",
+			// "van-tabs": "/wxcomponents/vant/dist/tabs/index",
+			// "van-tabbar": "/wxcomponents/vant/dist/tabbar/index",
+			// "van-tabbar-item": "/wxcomponents/vant/dist/tabbar-item/index",
+			// "van-tag": "/wxcomponents/vant/dist/tag/index",
+			// "van-toast": "/wxcomponents/vant/dist/toast/index",
+			// "van-transition": "/wxcomponents/vant/dist/transition/index",
+			// "van-tree-select": "/wxcomponents/vant/dist/tree-select/index",
+			// "van-datetime-picker": "/wxcomponents/vant/dist/datetime-picker/index",
+			// "van-rate": "/wxcomponents/vant/dist/rate/index",
+			// "van-collapse": "/wxcomponents/vant/dist/collapse/index",
+			// "van-collapse-item": "/wxcomponents/vant/dist/collapse-item/index",
+			// "van-picker": "/wxcomponents/vant/dist/picker/index"
+		}
+	}
+}

+ 1 - 1
UI/XYH.APP/src/pages/help/index.vue

@@ -65,7 +65,7 @@
             <view class="py-5 ps-5">
               <view class="text-gray-5">
                 <vb-icon name="home" :size="22" custom-class="text-gray-5"></vb-icon>
-                {{ item.isSys == "1" ? "平台发布" : item.createdBy }}
+                平台发布
               </view>
             </view>
             <view class="d-flex py-5">

+ 9 - 10
UI/XYH.APP/src/pages/news/index.vue

@@ -5,7 +5,7 @@
         <input
           class="w-100 px-20 h-40px br-30 me-10"
           type="text"
-          placeholder="搜索校友咨询标题"
+          placeholder="搜索校友资讯标题"
           v-model="searchTitle"
           style="background: #f2f2f2"
           confirm-type="search"
@@ -13,7 +13,6 @@
           auto-blur="true"
           @confirm="onSearch"
         />
-        <vb-button class="w-25" round icon="flow-mark">发布</vb-button>
       </view>
       <view class="d-flex h-30px mt-10 pb-5 align-center">
         <vb-dropdown
@@ -65,7 +64,7 @@
             <view class="py-5 ps-5">
               <view class="text-gray-5">
                 <vb-icon name="home" :size="22" custom-class="text-gray-5"></vb-icon>
-                {{ item.isSys ? "平台发布" : item.createdBy }}
+                平台发布
               </view>
             </view>
             <view class="d-flex py-5">
@@ -88,7 +87,7 @@
               </view>
               <view class="px-10 d-fcv text-gray-5">
                 <vb-icon name="calendar" :size="20" custom-class="text-gray-5"></vb-icon>
-                {{ formatDate(item.expiryDate, "YYYY-MM-DD ddd") }}
+                {{ formatDate(item.pubishDate, "YYYY-MM-DD ddd") }}
               </view>
             </view>
           </view>
@@ -124,11 +123,11 @@ const activeCategoryIndex = ref(0)
 const categoryColumns = ref<any[]>([])
 const categoryTabList = computed(() => {
   const arr = []
-  arr.push({ text: "创业", value: "50" })
-  arr.push({ text: "资源", value: "51" })
-  arr.push({ text: "求职", value: "52" })
-  arr.push({ text: "供需", value: "54" })
-  arr.push({ text: "商务", value: "55" })
+  arr.push({ text: "要闻", value: "1" })
+  arr.push({ text: "通知", value: "2" })
+  arr.push({ text: "校友", value: "3" })
+  arr.push({ text: "校企", value: "4" })
+  arr.push({ text: "盐中", value: "5" })
   arr.push({ text: "全部", value: "" })
   return arr
 })
@@ -181,7 +180,7 @@ function getStatus(item: any) {
 }
 
 function onClick(item: any) {
-  route.navigate("helpDetail", { id: item.helpId })
+  route.navigate("newsDetail", { id: item.newsId })
 }
 
 function onCategoryClick(index: number, categoryId: string) {

+ 3 - 1
UI/XYH.APP/src/route/_pages.ts

@@ -4,7 +4,8 @@ const mainPackage = {
   register: "/pages/account/register",
   forgetPwd: "/pages/account/forgetPwd",
   systemLogin: "/pages/account/systemLogin",
-  index: "/pages/index/index",
+  //index: "/pages/index/index",
+  index: "/pages/news/index",
   help: "/pages/help/index",
   welcome: "/pages/index/welcome",
   mine: "/pages/mine/index",
@@ -26,6 +27,7 @@ const alumnusSub = {
   myHelp: "/pages-sub/help/myHelp",
   helpEdit: "/pages-sub/help/edit",
   helpDetail: "/pages-sub/help/detail",
+  newsDetail: "/pages-sub/news/detail",
 }
 const activitySub = {
   myActivity: "/pages-sub/activity/myActivity",