baiyou - logo replaced

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mingxue",
   "version": "3.4.0",
-  "description": "铭学百优生涯志愿系统",
+  "description": "铭学百优",
   "author": "铭学百优",
   "license": "MIT",
   "scripts": {

src/api/webApi/baiyou.js

@@ -0,0 +1,17 @@
+import request from "@/utils/request";
+
+export function getHighSchoolList(params) {
+    return request({
+        url: '/mingxue/HighSchools/GetSchoolsList',
+        method: 'GET',
+        params
+    })
+}
+
+export function getEnrollOrgList(params) {
+    return request({
+        url: '/front/wwwSxgjZzb/list',
+        method: 'GET',
+        params
+    })
+}

src/components/BottomP/index.vue

@@ -5,7 +5,7 @@
       <div class="layui-row layui-col-space20 w1200p">
         <el-row style="margin:20px -10px;text-align:center;">
           <el-col :span="6">
-            <img :src="logo_white" style="height: 92px;margin-bottom: 20px; ">
+            <el-image :src="logo_white" fit="contain" style="width: 240px;margin-bottom: 20px; " />
             <p>
               <el-link type="text" href="/protocol/baiyou_privacy.html" class="f-fff">隐私协议</el-link>
               <el-link type="text" href="/protocol/baiyou_user.html" class="ml20 f-fff">用户协议</el-link>
@@ -36,7 +36,7 @@
               </el-col>
               <el-col :span="18" style="padding-top:20px;padding-left:20px;text-align:left">
                 <p style="font-size:12px;">垂询热线：</p>
-                <p style="font-size:18px;">400-1797-985</p>
+                <p style="font-size:18px;">4000-313-211</p>
               </el-col>
             </el-row>
           </el-col>
@@ -51,7 +51,7 @@
 export default {
   data() {
     return {
-      logo_white: require('@/assets/images/foot_img_logo.png'),
+      logo_white: require('@/assets/logo/logo_white.png'),
       icon_tel: require('@/assets/images/icon_tel.png'),
       star4: require('@/assets/images/star4.png')
     }

src/components/MxCondition/condition-object/condition-baiyou-area.js

@@ -0,0 +1,23 @@
+import {getLocationsList} from "@/api/webApi/resources";
+import ConditionObjectBase from "@/components/MxCondition/condition-object-base";
+
+export default {
+    ...ConditionObjectBase,
+    key: 'baiyouArea',
+    alias: 'area',
+    title: '区域',
+    dependentKeys: ['baiyouCity'],
+    isDependencyReady: function (params) {
+        return params.baiyouCity
+    },
+    getList: async function(params) {
+      const {data} = await getLocationsList({parentId : params.baiyouCity})
+      return data
+    },
+    getCode: function (item) {
+        return item.id
+    },
+    getLabel: function (item) {
+        return item.name
+    }
+}

src/components/MxCondition/condition-object/condition-baiyou-city.js

@@ -0,0 +1,23 @@
+import {getLocationsList} from "@/api/webApi/resources";
+import ConditionObjectBase from "@/components/MxCondition/condition-object-base";
+
+export default {
+    ...ConditionObjectBase,
+    key: 'baiyouCity',
+    alias: 'city',
+    title: '城市',
+    dependentKeys: ['baiyouProvince'],
+    isDependencyReady: function (params) {
+      return params.baiyouProvince
+    },
+    getList: async function(params) {
+      const {data} = await getLocationsList({parentId : params.baiyouProvince})
+      return data
+    },
+    getCode: function (item) {
+        return item.id
+    },
+    getLabel: function (item) {
+        return item.name
+    }
+}

src/components/MxCondition/condition-object/condition-baiyou-province.js

@@ -0,0 +1,19 @@
+import {getLocationsList} from "@/api/webApi/resources";
+import ConditionObjectBase from "@/components/MxCondition/condition-object-base";
+
+export default {
+    ...ConditionObjectBase,
+    key: 'baiyouProvince',
+    alias: 'pro',
+    title: '省份',
+    getList: async function(params) {
+      const {data} = await getLocationsList({level : 1})
+      return data
+    },
+    getCode: function (item) {
+        return item.id
+    },
+    getLabel: function (item) {
+        return item.sname
+    }
+}

src/components/Top/index.vue

@@ -2,7 +2,7 @@
   <div class="fx-row fx-bet-cen pl12 pr12 relative" style="line-height: 40px;">
     <div v-if="$route.path=='/login'" class="fx-row fx-sta-cen">
       <img class="icon16" src="../../assets/images/icon_tel2.png"/>
-      <span class="pl8">服务热线：400-1797-985</span>
+      <span class="pl8">服务热线：4000-313-211</span>
       <img class="icon16 ml20" src="../../assets/images/icon_phone.png"/>
       <div class="relative" id="app_download" @mouseover="app=true" @mouseleave="app=false">
         <a href="javascript:void(0);">APP下载</a>

src/layout/components/Navbar.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="navbar">
-    <div style="line-height: 50px;float:left;margin-left: 20px;">
-      <img src="../../assets/images/login_logo.png" alt="logo" style="width: 122px;cursor:pointer" @click="backFirstMenu()" />
+    <div class="menu-logo" style="line-height: 50px;float:left;margin-left: 20px;">
+      <el-image :src="require('@/assets/logo/logo.png')" fit="cover" alt="logo" style="width: 122px;cursor:pointer" @click="backFirstMenu()" />
     </div>
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" style="display:none;" />
 
@@ -133,6 +133,10 @@ export default {
     }
   }
 
+  ::v-deep .menu-logo .el-image__inner {
+    vertical-align: middle;
+  }
+
   .breadcrumb-container {
     float: left;
   }

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '铭学百优生涯志愿系统',
+      title: '铭学百优',
       logo: logoImg
     }
   }

src/router/index.js

@@ -829,6 +829,25 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/zhiyuan/NewSimulatedVolunteer'], resolve)
       }
     ]
+  }, {
+    path: '/baiyou',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/baiyou/library/highSchool',
+      component: (resolve) => require(['@/views/baiyou/LibraryHighSchool/index'], resolve),
+      name: 'LibraryHighSchool',
+      meta: {
+        title: '高中信息库'
+      }
+    }, {
+      path: '/baiyou/library/enrollOrg',
+      component: (resolve) => require(['@/views/baiyou/LibraryEnrollOrg/index'], resolve),
+      name: 'LibraryEnrollOrg',
+      meta: {
+        title: '中招办'
+      }
+    }]
   }
 ]
 

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '铭学百优生涯志愿系统',
+  title: '铭学百优',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

src/views/baiyou/LibraryEnrollOrg/index.vue

@@ -0,0 +1,68 @@
+<template>
+  <div class="app-container fx-column ai-cen">
+    <el-card shadow="never" class="index-block">
+      <mx-condition slot="header" :query-params="queryParams" tiny-margin-bottom use-alias-mapping @query="handleQuery"/>
+      <dynamic-table :rows="list" :columns="columns">
+        <template #link="{display}">
+          <el-link @click="openLink(display)">{{display}}</el-link>
+        </template>
+      </dynamic-table>
+      <pagination :total="total" :page.sync="pageForm.pageNum" :limit.sync="pageForm.pageSize" @pagination="getList"/>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import DynamicTable from "@/components/dynamic-table/index.vue";
+import {getEnrollOrgList} from "@/api/webApi/baiyou";
+import MxCondition from "@/components/MxCondition/mx-condition.vue";
+
+export default {
+  name: "index",
+  components: {MxCondition, DynamicTable},
+  data()  {
+    return {
+      queryParams: {
+        baiyouProvince: ''
+      },
+      firedParams: null,
+      pageForm: {
+        pageNum: 1,
+        pageSize: 20
+      },
+      list: [],
+      total: 0,
+
+      columns: [
+        {prop: 'name', label: '名称'},
+        {prop: 'address', label: '地址'},
+        {prop: 'url', label: '网址', slotBody: 'link'},
+        {prop: 'tel', label: '电话'},
+      ]
+    }
+  },
+  methods: {
+    handleQuery(model) {
+      this.firedParams = model
+      this.pageForm.pageNum = 1
+      this.getList()
+    },
+    async getList() {
+      const res = await getEnrollOrgList({
+        ...this.firedParams,
+        ...this.pageForm
+      })
+      this.list = res.rows
+      this.total = res.total
+    },
+    openLink(url) {
+      if (!url) return
+      window.open(url)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/baiyou/LibraryHighSchool/index.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="app-container fx-column ai-cen">
+    <el-card shadow="never" class="index-block">
+      <mx-condition slot="header" :query-params="queryParams" tiny-margin-bottom use-alias-mapping @query="handleQuery"/>
+      <div class="school-list fx-column">
+        <div v-for="(item,idx) in list" :key="item.id" class="school-list-item pb20 fx-row fx-bet-cen">
+          <el-image :src="item.pict" style="width: 200px" />
+          <div class="fx-column pl20 pr20" style="width: 420px">
+            <div class="fx-row">
+              <span class="f18 bold f-333 mr5">{{item.name}}</span>
+              <el-tag size="small" effect="light">{{item.type}}</el-tag>
+            </div>
+            <div class="mt15 fx-row ai-cen f-999">
+              <i class="el-icon-location-information mr5"></i>
+              <span>{{item.address}}</span>
+            </div>
+            <div class="mt8 fx-row ai-cen f-999">
+              <i class="el-icon-link mr5"></i>
+              <el-link underline @click="openLink(item)">{{item.url}}</el-link>
+            </div>
+            <div class="mt8 fx-row ai-cen f-999">
+              <i class="el-icon-phone-outline mr5"></i>
+              <span>{{item.tel}}</span>
+            </div>
+          </div>
+          <div class="fx-1 fx-column">
+            <div class="f14 bold f-333 rel school-list-remark">学校简介</div>
+            <div class="mt20 f-666 text-ellipsis-3">{{item.remark||'无'}}</div>
+            <div v-if="item.remark&&item.remark.length>100" class="mt12">
+              <el-button size="small" round @click="showRemark(item)">完整介绍</el-button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <pagination :total="total" :page.sync="pageForm.pageNum" :limit.sync="pageForm.pageSize" @pagination="getList"/>
+    </el-card>
+    <el-dialog :visible.sync="open" :title="`${current.name}-学校简介`" width="60vw">
+      <div v-html="current.remark"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import MxCondition from "@/components/MxCondition/mx-condition.vue";
+import IndexCard from "@/views/index/components/index-card.vue";
+import DynamicTable from "@/components/dynamic-table/index.vue";
+import {getHighSchoolList} from "@/api/webApi/baiyou";
+
+export default {
+  name: "index",
+  components: {DynamicTable, IndexCard, MxCondition},
+  data() {
+    return {
+      queryParams: {
+        baiyouProvince: '',
+        baiyouCity: '',
+        baiyouArea: ''
+      },
+      firedParams: null,
+      pageForm: {
+        pageNum: 1,
+        pageSize: 20
+      },
+      list: [],
+      total: 0,
+
+      open: false,
+      current: {}
+    }
+  },
+  methods: {
+    async handleQuery(model) {
+      this.firedParams = model
+      this.pageForm.pageNum = 1
+      await this.getList()
+    },
+    async getList() {
+      const res = await getHighSchoolList({
+        ...this.firedParams,
+        ...this.pageForm
+      })
+      res.rows.forEach(i => i.type = i.type == 1 ? '公办' : '民办')
+      this.total = res.total
+      this.list = res.rows
+    },
+    openLink(item) {
+      if (!item.url) return
+      window.open(item.url)
+    },
+    showRemark(item) {
+      this.current = item
+      this.open = true
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.school-list {
+  &-item + &-item {
+    padding-top: 20px;
+    border-top: 5px solid #EEEEEE;
+  }
+
+  &-remark:before {
+    content: ' ';
+    position: absolute;
+    bottom: -5px;
+    height: 3px;
+    background-color: var(--themeColor);
+    width: 30px;
+  }
+}
+
+::v-deep .el-link.el-link--default {
+  font-size: 14px;
+  color: #999999;
+
+  &:hover {
+    color: var(--themeColor)
+  }
+}
+</style>

src/views/index/components/login-form-banner.vue

@@ -2,7 +2,7 @@
   <div class="fx-row fx-end-cen login-form-container" style="padding: 40px 0;"
        :style="{backgroundImage: `url(${$imgBase}2023/index/login/banner.png)`} ">
     <div class="bg-white rd8 login-form-block">
-      <img style="width: 56%;margin-left:19.5%;" src="@/assets/images/login_logo.png"/>
+      <el-image style="height: 70px" fit="contain" :src="require('@/assets/logo/logo.png')"/>
       <div class="f-primary text-center mt15 mb20 bold f18" style="letter-spacing: 10px;">
         WELCOME
       </div>

src/views/index/components/login-top-menus.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="fx-row fx-bet-cen bg-white pl60 pr60" style="height:80px;">
-    <el-image :src="`${$imgBase}index/login/icon_logo_medium@2x.png`" fit="contain"
+    <el-image :src="require('@/assets/logo/logo.png')" fit="contain"
               style="width: 124px;"></el-image>
     <div class="fx-row fx-end-cen fx-1 menus-container">
       <el-link v-for="(item,idx) in routers" :key="idx" @click="handleMenuClick(item)" class="f16 f-fff"

src/views/pay/index.vue

@@ -6,7 +6,7 @@
                 style="width: 152px;"></el-image>
       <div>
         <img class="icon16" src="../../assets/images/icon_tel2.png"/>
-        <span class="pl8">服务热线：400-1797-985</span>
+        <span class="pl8">服务热线：4000-313-211</span>
       </div>
     </div>
     <el-form ref="form" class="border pd20" :model="form" :rules="rules" label-width="100px" label-position="right">

vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = defaultSettings.title || '铭学百优生涯志愿系统' // 标题
+const name = defaultSettings.title || '铭学百优' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口