新闻分页

src/api/website/home/news.js

@@ -5,3 +5,8 @@ export const listNews = (params) => request({
     method: "GET",
     params
 });
+
+export const getNewsInfo = (id) => request({
+    url: `/app/news/${id}`,
+    method: "GET",
+})

src/components/WebsiteHeader/index.vue

@@ -10,16 +10,25 @@
           <li class="menu-item1">
             <div
                 class="menu-item-tit"
-                :class="pagePath == '/' ? 'active' : ''"
+                :class="pagePath === '/' ? 'active' : ''"
                 @click="handlePath('/')"
             >
               {{ t("headerMenu.home") }}
             </div>
           </li>
+          <li class="menu-item1">
+            <div
+                class="menu-item-tit"
+                :class="pagePath === '/news' ? 'active' : ''"
+                @click="handlePath('/news')"
+            >
+              {{ t("headerMenu.news") }}
+            </div>
+          </li>
           <li class="menu-item1 solution">
             <div
                 class="menu-item-tit"
-                :class="pagePath.indexOf('/solution/') != -1 ? 'active' : ''"
+                :class="pagePath.indexOf('/solution/') !== -1 ? 'active' : ''"
             >
               {{ t("headerMenu.resolution") }}
             </div>
@@ -28,7 +37,7 @@
                   v-for="item in categoryList"
                   class="pointer"
                   :class="
-                  pagePath == `/solution/${item.id}` ? 'x_blue _active' : ''
+                  pagePath === `/solution/${item.id}` ? 'x_blue _active' : ''
                 "
                   @click="
                   handlePath(
@@ -79,7 +88,7 @@
           <li class="menu-item1">
             <div
                 class="menu-item-tit"
-                :class="pagePath == '/innovate' ? 'active' : ''"
+                :class="pagePath === '/innovate' ? 'active' : ''"
                 @click="handlePath('/innovate')"
             >
               {{ t("headerMenu.innovation") }}
@@ -88,7 +97,7 @@
           <li class="menu-item1">
             <div
                 class="menu-item-tit"
-                :class="pagePath == '/activity' ? 'active' : ''"
+                :class="pagePath === '/activity' ? 'active' : ''"
                 @click="handlePath('/activity')"
             >
               {{ t("headerMenu.activity") }}
@@ -97,7 +106,7 @@
           <li class="menu-item1">
             <div
                 class="menu-item-tit"
-                :class="pagePath == '/about' ? 'active' : ''"
+                :class="pagePath === '/about' ? 'active' : ''"
                 @click="handlePath('/about')"
             >
               {{ t("headerMenu.aboutUs") }}
@@ -107,7 +116,7 @@
             <div
                 v-if="!userStore.token"
                 class="menu-item-tit"
-                :class="pagePath == '/login' ? 'active' : ''"
+                :class="pagePath === '/login' ? 'active' : ''"
                 @click="handlePath('/login')"
             >
               {{ t("headerMenu.loginRegister") }}
@@ -137,7 +146,7 @@
             <div
                 v-if="userStore.token"
                 class="menu-item-tit"
-                :class="pagePath == '/login' ? 'active' : ''"
+                :class="pagePath === '/login' ? 'active' : ''"
                 @click="handlePage"
             >
               {{ t("headerMenu.personalCenter") }}
@@ -145,7 +154,7 @@
             <div
                 v-if="userStore.token"
                 class="menu-item-tit"
-                :class="pagePath == '/login' ? 'active' : ''"
+                :class="pagePath === '/login' ? 'active' : ''"
                 @click="logout"
             >
               {{ t("headerMenu.logout") }}
@@ -352,7 +361,7 @@ dt {
         display: inline-block;
         padding: 25px 0;
         font-size: 16px;
-        font-family: Source Han Sans CN;
+        font-family: Source Han Sans CN, sans-serif;
         font-weight: 400;
         color: #000;
         cursor: pointer;
@@ -398,6 +407,7 @@ dt {
 
 .webHead {
   .site-title {
+    padding-top: 8px;
     height: 80px;
     display: flex;
     justify-content: start;
@@ -407,10 +417,10 @@ dt {
     font-weight: bold;
 
     .site-logo {
-      width: 30px;
+      width: 90px;
-      height: 30px;
+      height: 82px;
-      object-fit: cover;
+      object-fit: contain;
-      margin-right: 4px;
+      margin-right: 8px;
     }
   }
 

src/i18n/message.js

@@ -39,6 +39,7 @@ const messages = {
             switchSystem: "切换系统",
             layoutSettings: "布局设置",
             changeAvatar: "更换头像",
+            news: "新闻政策"
         },
         footer: {
             copyRight: "中科云 版权所有",
@@ -163,6 +164,7 @@ const messages = {
             switchSystem: "Переключить систему",
             layoutSettings: "Настройки макета",
             changeAvatar: "Сменить аватар",
+            news: "Пресс-политика"
         },
         footer: {
             copyRight: "Чжункейун Авторское право",

src/i18n/message/admin/table/ru.js

@@ -23,7 +23,7 @@ const table = {
   cooperationMemo: "Совместный протокол",
   customerConfirmSolution: "Подтверждение технического решения клиентом",
   signServiceContract: "Подписание сервисного контракта (сумма контракта)",
-  endTopic: "Закрыть тему",
+  endTopic: "Закрыть тему (Полученная сумма)",
   notEndTopic: "Тема не закрыта",
   uploadFile: "Загрузить файл",
   uploadTime: "Время загрузки",

src/i18n/message/admin/table/zh.js

@@ -23,7 +23,7 @@ const table = {
   cooperationMemo: "合作备忘录",
   customerConfirmSolution: "客户确认技术解决方案",
   signServiceContract: "签署服务合同（合同额）",
-  endTopic: "结题",
+  endTopic: "结题（到款金额）",
   notEndTopic: "未结题",
   uploadFile: "上传文件",
   uploadTime: "上传时间",

src/layout/components/Sidebar/Logo.vue

@@ -53,7 +53,7 @@
 <script setup>
 import variables from "@/assets/styles/variables.module.scss";
 import logo from "@/assets/logo/logo.png";
-import logoSmall from "@/assets/logo/logo_small.png";
+import logoSmall from "@/assets/logo/咸海logo.png";
 import useSettingsStore from "@/store/modules/settings";
 import { useI18n } from "vue-i18n";
 

src/permission.js

@@ -16,6 +16,7 @@ const whiteList = [
     "/auth-redirect",
     "/bind",
     "/register",
+    "/news",
     "/",
     "/solution/small",
     "/solution/large",
@@ -27,6 +28,7 @@ const whiteList = [
 ];
 const whiteListReg = [
     /\/solution\/detail\/[0-9]+/,
+    /\/news\/detail\/[0-9]+/,
     /\/solution\/[0-9]+/,
     /\/innovate\/detail\/[0-9]+/,
     /\/searchList\/[\S]+/,

src/router/index.js

@@ -198,6 +198,16 @@ export const constantRoutes = [
                 name: "about",
                 component: () => import("../views/website/about/about.vue"),
             },
+            {
+                path: "news",
+                name: 'news-list',
+                component: () => import("../views/website/home/index.vue"),
+            },
+            {
+                path: "news/detail/:id",
+                name: 'news',
+                component: () => import("@/views/website/news/detail.vue")
+            }
         ],
     },
 

src/store/modules/app.js

@@ -3,9 +3,10 @@ import Cookies from "js-cookie";
 const useAppStore = defineStore("app", {
     state: () => ({
         sidebar: {
-      opened: Cookies.get("sidebarStatus")
+            // opened: Cookies.get("sidebarStatus")
-        ? !!+Cookies.get("sidebarStatus")
+            //   ? !!+Cookies.get("sidebarStatus")
-        : true,
+            //   : true,
+            opened: true,
             withoutAnimation: false,
             hide: false,
         },

src/views/admin/agent/service/enterprise/update-status.vue

@@ -161,7 +161,7 @@ if (route.query.id) {
                   <el-col :span="12">
                     <el-form-item
                       v-if="index === 2 || index === 3"
-                      :label="t('admin.form.amount')"
+                      :label="`${t('admin.form.amount')}（${t('admin.table.tenThousandYuan')}）`"
                     >
                       <el-input-number
                         v-model="updateStatusList[index].remark"

src/views/components/AgentForm/index.vue

@@ -87,7 +87,7 @@
 
     <el-row v-if="isAdd">
       <el-col :span="24">
-        <el-form-item :label="t('admin.form.idCard')">
+        <el-form-item :label="t('admin.form.idCard')" prop="idImage">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item prop="idImage.0">
@@ -206,7 +206,7 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
-  mobile: [
+  phone: [
     {
       required: true,
       message: computed(() =>
@@ -220,12 +220,20 @@ const rules = reactive({
     //   trigger: "blur",
     // },
   ],
+  email: [
+    {
+      required: true,
+      message: computed(() =>
+          t("admin.form.placeholder", {type: t("admin.form.email")})
+      ),
+      trigger: "blur",
+    },],
   idCard: [
-    // {
+    {
-    //   required: true,
+      required: true,
-    //   message: computed(() => t("admin.form.placeholder")),
+      message: computed(() => t("admin.form.placeholder")),
-    //   trigger: "blur",
+      trigger: "blur",
-    // },
+    },
   ],
   wordAddress: [
     {
@@ -241,34 +249,41 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
+  idImage: [
+    {
+      required: true,
+      trigger: "change",
+      message: computed(() => t("admin.validation.pleaseUpload")),
+    }
+  ],
   "idImage.0": [
-    // {
-    //   required: true,
-    //   message: computed(() => t("admin.validation.pleaseUpload")),
-    //   trigger: ["blur", "change"],
-    // },
-  ],
-  "idImage.1": [
-    // {
-    //   required: true,
-    //   message: computed(() => t("admin.validation.pleaseUpload")),
-    //   trigger: ["blur", "change"],
-    // },
-  ],
-  "idImage.2": [
-    // {
-    //   required: true,
-    //   message: computed(() => t("admin.validation.pleaseUpload")),
-    //   trigger: ["blur", "change"],
-    // },
-  ],
-  certificatePics: [
     {
       required: true,
       message: computed(() => t("admin.validation.pleaseUpload")),
       trigger: ["blur", "change"],
     },
   ],
+  "idImage.1": [
+    {
+      required: true,
+      message: computed(() => t("admin.validation.pleaseUpload")),
+      trigger: ["blur", "change"],
+    },
+  ],
+  "idImage.2": [
+    {
+      required: true,
+      message: computed(() => t("admin.validation.pleaseUpload")),
+      trigger: ["blur", "change"],
+    },
+  ],
+  certificatePics: [
+    // {
+    //   required: true,
+    //   message: computed(() => t("admin.validation.pleaseUpload")),
+    //   trigger: ["blur", "change"],
+    // },
+  ],
 });
 
 const validateForm = async () => {

src/views/components/ExpertForm/index.vue

@@ -9,13 +9,13 @@
       {{ t("admin.form.basicInfo") }}
     </div>
 
-    <el-row>
+    <!--FIXME:    <el-row>-->
-      <el-col :span="24">
+    <!--      <el-col :span="24">-->
-        <el-form-item :label="t('admin.form.expertAvatar')">
+    <!--        <el-form-item :label="t('admin.form.expertAvatar')">-->
-          <ImageUpload v-model="modelValue.image" :limit="1" />
+    <!--          <ImageUpload v-model="modelValue.image" :limit="1" />-->
-        </el-form-item>
+    <!--        </el-form-item>-->
-      </el-col>
+    <!--      </el-col>-->
-    </el-row>
+    <!--    </el-row>-->
 
     <el-row>
       <el-col :span="12">
@@ -242,7 +242,7 @@ import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 import {countryOptions, educationOptions} from "@/utils/parameter";
 import {useI18n} from "vue-i18n";
-import { computed, toRefs } from "vue";
+import {computed, onActivated, reactive, ref, toRefs} from "vue";
 
 const {t, locale} = useI18n();
 
@@ -403,7 +403,8 @@ const cityFormRef = ref();
 const fieldFormRef = ref();
 const keywordsFormRef = ref();
 const researchsFormRef = ref();
-const setLaboratory = () => {};
+const setLaboratory = () => {
+};
 const validateForm = async () => {
   let formValid;
   try {

src/views/components/InputBoxAdd/index.vue

@@ -10,15 +10,16 @@
         <el-form-item
           :label="`${title}:`"
           :prop="fieldKey"
-          :rules="[
+
+        >
+<!--             :rules="[
             {
               required: true,
               type: 'array',
               message: t('admin.validation.pleaseInputAndAdd'),
               trigger: 'change',
             },
-          ]"
+          ]"-->
-        >
           <el-row type="flex" class="input-add-bar" justify="space-between">
             <el-col :span="20">
               <el-input v-model="dataVal" :placeholder="placeholder"></el-input>

src/views/website/home/comp/index9.vue

@@ -3,6 +3,8 @@ import { reactive, ref, toRefs } from "vue";
 import {listNews} from "@/api/website/home/news";
 import Pagination from "@/components/Pagination/index.vue";
 import {useI18n} from "vue-i18n";
+import dayjs from "dayjs";
+
 const {t, locale} = useI18n();
 const file_base_url = `${import.meta.env.VITE_APP_BASE_API}/file`;
 const total = ref(0);
@@ -12,7 +14,7 @@ const data = reactive({
   latestNews: {},
   queryParams: {
     pageNum: 1,
-    pageSize: 8,
+    pageSize: 10,
     classification: "0",
   },
 });
@@ -58,14 +60,21 @@ getList();
       </el-tabs>
       <ul class="news-list">
         <li class="news-item" v-for="news in newsList" :key="news.id">
+          <a :href="`/news/detail/${news.id}`" target="_blank">
             <span class="title">{{
                 locale === "zh" ? news.title : locale === "ru" ? news.titleRu : null
               }}</span>
             <span class="time">
-            {{ news.create_time }}
+            {{ dayjs(news.createTime).format("YYYY-MM-DD") }}
           </span>
+          </a>
         </li>
       </ul>
+      <pagination v-show="total > 0"
+                  :total="total"
+                  v-model:page="queryParams.pageNum"
+                  v-model:limit="queryParams.pageSize"
+                  @pagination="getList"/>
     </div>
 
     <!-- <div class="news-list">
@@ -90,20 +99,26 @@ getList();
 .news-container {
   padding: 20px;
   display: flex;
+
   .left {
-    flex: 4;
+    width: calc(50vw - 20px);
-    height: 100%;
+    height: calc(100vh - 200px);
-    // display: flex;
+    display: flex;
-    // flex-direction: column;
+    flex-direction: column;
-    // justify-content: center;
+
     .cover-image {
+      height: calc(100vh - 200px - 24px - 12px);
+      //flex: 1;
       width: 100%;
-      aspect-ratio: 4/3;
+      //aspect-ratio: 4/3;
       object-fit: cover;
     }
+
     .title {
+      height: 24px;
       text-align: center;
       font-size: 20px;
+      width: 100%;
       font-weight: bold;
       margin-top: 12px;
       margin-bottom: 0;
@@ -112,23 +127,34 @@ getList();
       white-space: nowrap;
     }
   }
+
   .right {
-    flex: 4;
+    width: calc(50vw - 20px);
     margin-left: 12px;
     height: 100%;
     padding: 12px;
+
     .news-list {
       .news-item {
-        list-style: disc;
+        & > a {
           height: 40px;
           display: flex;
           align-items: center;
-        cursor: pointer;
+          justify-content: space-between;
+
           .title {
+            flex: 1;
+            width: 100px;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
           }
+
+          .time {
+            color: gray;
+            font-size: 14px;
+          }
+        }
       }
     }
   }

src/views/website/home/index.vue

@@ -52,12 +52,14 @@
 </template>
 
 <script setup>
-import { computed, onMounted, reactive, ref, shallowRef } from "vue";
+import {computed, onActivated, onMounted, reactive, ref, shallowRef} from "vue";
 import index0 from "./comp/index0.vue";
 import index1 from "./comp/index1.vue";
 import index8 from "./comp/index8.vue";
 import index9 from "@/views/website/home/comp/index9.vue";
+import {useRoute} from "vue-router";
 
+const route = useRoute()
 const loading = ref(true);
 setTimeout(() => {
   loading.value = false;
@@ -193,14 +195,14 @@ const handleIndicatorClick = (idx) => {
   console.log(idx);
   let boxIndex;
   let _mapIndex;
-  if (idx === 1) {
+  if (idx <= 2) {
-    boxIndex = 1;
+    boxIndex = idx;
     _mapIndex = null;
-  } else if (idx <= 5) {
+  } else if (idx <= 6) {
-    boxIndex = 2;
-    _mapIndex = idx - 2;
-  } else {
     boxIndex = 3;
+    _mapIndex = idx - 3;
+  } else {
+    boxIndex = 4;
     _mapIndex = null;
   }
 
@@ -219,6 +221,13 @@ const handleIndicatorClick = (idx) => {
     mapIndex.value = _mapIndex;
   }
 };
+
+onMounted(() => {
+  // console.log(route.name)
+  if (route.name === "news-list") {
+    handleIndicatorClick(2)
+  }
+})
 </script>
 
 <style lang="scss" scoped>

src/views/website/login/index.vue

@@ -276,7 +276,7 @@ getCookie();
   .content {
     // padding: 0 250px;
     // padding: 0 30px;
-    width: 1400px;
+    width: 100%;
     margin: 0 auto;
     flex: 1;
     background: #b1ccff;
@@ -285,8 +285,10 @@ getCookie();
     justify-content: space-between;
 
     .loginImg {
-      width: 705px;
+      width: calc(100vw - 516px);
-      height: 458px;
+      //width: 705px;
+      //height: 458px;
+      aspect-ratio: 705/458;
     }
   }
 

src/views/website/news/detail.vue

@@ -0,0 +1,65 @@
+<script setup>
+import {getNewsInfo} from "@/api/website/home/news";
+import {useRoute} from "vue-router";
+import {reactive, toRefs} from "vue";
+import {useI18n} from "vue-i18n";
+import WebFooter from "@/components/webFooter/index.vue";
+
+const {t, locale} = useI18n();
+const file_base_url = `${import.meta.env.VITE_APP_BASE_API}/file`;
+const data = reactive({
+  news: {}
+})
+const {news} = toRefs(data)
+const route = useRoute()
+const getNews = () => {
+  const id = route.params.id
+  getNewsInfo(id).then((resp) => {
+    news.value = resp.data
+  })
+}
+
+getNews()
+</script>
+
+<template>
+  <div class="container">
+    <div class="news-body">
+      <img class="cover-image" :src="`${file_base_url}${news.cover}`"/>
+      <h1 class="title">{{locale === "zh" ? news.title : locale === "ru" ? news.titleRu : null }}</h1>
+      <p class="content">{{ locale === "zh" ? news.content : locale === "ru" ? news.contentRu : null}}</p>
+    </div>
+    <web-footer></web-footer>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.container {
+  background-color: #f2f6ff;
+
+  .news-body {
+    background-color: #ffffff;
+    width: 1000px;
+    margin: 0 auto;
+
+    .cover-image {
+      width: 100%;
+      aspect-ratio: 6/2;
+      object-fit: cover;
+    }
+
+    h1.title {
+      text-align: center;
+      font-weight: bold;
+      font-size: 28px;
+    }
+
+    p.content {
+      font-size: 16px;
+      line-height: 24px;
+      margin: 0;
+      padding: 24px;
+    }
+  }
+}
+</style>

vite.config.js

@@ -32,8 +32,8 @@ export default defineConfig(({mode, command}) => {
                 // https://cn.vitejs.dev/config/#server-proxy
                 "/dev-api": {
                     // target: "http://101.34.131.16:1618",
-                    target: "http://129.211.170.150/api",
+                    // target: "http://129.211.170.150/api",
-                    // target: "http://192.168.0.200:1619",
+                    target: "http://192.168.0.200:1619",
                     // target: 'http://172.18.3.127:1618',
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, ""),