....

.gitignore

@@ -25,3 +25,5 @@ dist-ssr
 
 src/*.d.ts
 /.idea/
+yarn.lock
+package-locl.json

package.json

@@ -9,10 +9,12 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@element-plus/icons-vue": "^2.0.9",
     "@vueuse/core": "^9.1.0",
     "axios": "^0.27.2",
     "dayjs": "^1.11.5",
     "element-plus": "^2.2.14",
+    "scss": "^0.2.4",
     "vue": "^3.2.37",
     "vue-router": "^4.1.3"
   },
@@ -27,4 +29,4 @@
     "vite-plugin-windicss": "^1.8.7",
     "windicss": "^3.5.6"
   }
-}
+}

pnpm-lock.yaml

@@ -1,6 +1,7 @@
 lockfileVersion: 5.4
 
 specifiers:
+  '@element-plus/icons-vue': ^2.0.9
   '@iconify/json': ^2.1.92
   '@vitejs/plugin-vue': ^3.0.3
   '@vueuse/core': ^9.1.0
@@ -18,6 +19,7 @@ specifiers:
   windicss: ^3.5.6
 
 dependencies:
+  '@element-plus/icons-vue': 2.0.9_vue@3.2.37
   '@vueuse/core': 9.1.0_vue@3.2.37
   axios: 0.27.2
   dayjs: 1.11.5

src/components/ResourceSearch/index.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="search">
+    <h1 class="sear-title">特色作品,搜索一下</h1>
+    <div class="inp">
+      <input v-model="searMsg" type="text" placeholder="搜索关键字" />
+      <span class="inp-sear"></span>
+    </div>
+    <ul class="classify">
+      <li @click="classIndex=i" :class="[classIndex===i?'classes':'']" v-for="(c,i) in classes" :key="c">{{c}}</li>
+    </ul>
+  </div>
+</template>
+<script setup>
+import { ref } from "vue";
+const searMsg = ref("");
+const classes = ref(["微课", "课件", "教案", "微视频", "网络资源"]);
+const classIndex=ref(1);
+</script>
+<style lang="scss" scoped>
+.search {
+  width: 100%;
+  min-width: 1280px;
+  height: 457px;
+  padding: 20px 0;
+  background: url("../../assets/ysgc/back.png");
+  background-repeat: no-repeat;
+  .sear-title {
+    width: 400px;
+    height: 67px;
+    font-size: 48px;
+    margin: 0 auto;
+    font-family: PingFangSC, PingFangSC-Semibold;
+    font-weight: 600;
+    color: #000000;
+    line-height: 67px;
+  }
+  .inp {
+    width: 497px;
+    margin: 40px auto;
+    height: 50px;
+    line-height: 50px;
+    position: relative;
+    input {
+      background: #ffffff;
+      border-radius: 8px;
+      border: 1px solid #00a3ff;
+      width: 100%;
+      height: 100%;
+      padding-left: 17px;
+    }
+    .inp-sear {
+      display: block;
+      width: 26px;
+      height: 26px;
+      background: #00a3ff;
+      border-radius: 6px;
+      position: absolute;
+      top: 10px;
+      right: 10px;
+      background-image: url("../../assets/ysgc/搜索@2x.png");
+      background-size: 60%;
+      background-position: center;
+      background-repeat: no-repeat;
+    }
+  }
+  .classify {
+    width: 300px;
+    height: 22px;
+    margin: 0 auto;
+    opacity: 0.6;
+    font-size: 16px;
+    font-family: PingFangSC, PingFangSC-Regular;
+    font-weight: 400;
+    color: #000000;
+    line-height: 22px;
+    display: flex;
+    justify-content: space-between;
+    li {
+      position: relative;
+    }
+    li:not(:last-child)::after {
+      position: absolute;
+      content: "";
+      width: 1px;
+      height: 13px;
+      background-color: #000000;
+      top: 5px;
+      right: -13px;
+    }
+    .classes{
+    color: #000000;
+    font-weight: 550;
+    opacity: 1 !important;
+    }
+  }
+}
+
+</style>

src/main.js

@@ -3,9 +3,10 @@ import 'virtual:windi.css';
 
 import App from './App.vue'
 import router from './router/index';
-
+import ElementPlus from 'element-plus';
+import 'element-plus/dist/index.css'
 const app = createApp(App)
 app.use(router)
-
+app.use(ElementPlus)
 app.mount('#app')
 

src/pages/szmsg/index.vue

@@ -0,0 +1,180 @@
+<template>
+  <div class="ysgc">
+    <ResourceSearch></ResourceSearch>
+    <div class="ysgc-kind">
+      <ul class="specail">
+        <li class="kind-name">
+          <router-link to="/tskcz">
+            <h3>特色课程展</h3>
+            <p>辅导机构课程 场馆课程</p>
+            <div class="btn-more">
+              <button>查看更多</button>
+            </div>
+          </router-link>
+        </li>
+        <li class="kc" v-for="kc in 4" :key="kc">
+          <img class="kc-back" src="../../assets/ysgc/kc3.png" alt="" />
+          <div class="kc-des">
+            <p class="kc-name">安徒生世界插画</p>
+            <div class="rate">
+              <img
+                v-for="star in 5"
+                :key="star"
+                src="../../assets/ysgc/star.png"
+                alt=""
+              />
+            </div>
+          </div>
+          <div class="zan">
+            <img src="../../assets/ysgc/zan.png" /> 10w+
+            <img src="../../assets/ysgc/xin.png" alt="" />14w+
+          </div>
+        </li>
+      </ul>
+      <ul class="specail">
+        <li class="kind-name">
+          <h3>艺术联盟</h3>
+          <p>辅导机构课程 场馆课程</p>
+          <div class="btn-more">
+            <button>查看更多</button>
+          </div>
+        </li>
+        <li class="kc" v-for="kc in 1" :key="kc">
+          <img class="kc-back" src="../../assets/ysgc/kc3.png" alt="" />
+          <div class="kc-des">
+            <p class="kc-name">传送门</p>
+          </div>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script>
+import ResourceSearch from "../../components/ResourceSearch/index.vue";
+import { ref } from "vue";
+</script>
+<style lang="scss" scoped>
+.ysgc {
+  width: 100%;
+  min-width: 1280px;
+  .ysgc-kind {
+    // width: 1650px;
+    min-width: 1280px;
+    margin: 0 auto;
+    margin-top: -180px;
+    .specail {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      li {
+        margin: 0 27px 27px 0;
+        overflow: hidden;
+      }
+      .kind-name {
+        width: 332px;
+        height: 274px;
+        background: #ffffff;
+        border-radius: 12px;
+        box-shadow: 0px 10px 24px 0px rgba(161, 153, 168, 0.18);
+        padding: 49px 20px;
+        box-sizing: border-box;
+        background-image: url("../../assets/ysgc/tskc.png");
+        background-position: center -15px;
+        h3 {
+          width: 263px;
+          height: 37px;
+          font-size: 26px;
+          font-family: PingFangSC, PingFangSC-Medium;
+          font-weight: 500;
+          text-align: left;
+          color: #050026;
+          line-height: 37px;
+        }
+        p {
+          width: 246px;
+          height: 22px;
+          font-size: 16px;
+          font-family: PingFangSC, PingFangSC-Regular;
+          font-weight: 400;
+          text-align: left;
+          color: #050026;
+          line-height: 22px;
+          margin-top: 25px;
+        }
+        .btn-more {
+          width: 111px;
+          height: 31px;
+          padding: 2px;
+          box-sizing: border-box;
+          border-radius: 38px;
+          margin-top: 45px;
+          background: linear-gradient(127deg, #3f64ff 10%, #8f78f8 91%);
+          button {
+            width: 100%;
+            height: 100%;
+            padding-left: 6px;
+            background: #fff;
+            border-radius: 38px;
+            font-weight: 400;
+            font-size: 14px;
+            color: #6c5dd3;
+            line-height: 20px;
+            letter-spacing: 0.6px;
+            border-image: linear-gradient(127deg, #3f64ff 10%, #8f78f8 91%) 1 1;
+          }
+        }
+      }
+      .kc {
+        width: 337px;
+        height: 278px;
+        background: #ffffff;
+        border-radius: 12px;
+        box-shadow: 0px 10px 24px 0px rgba(161, 153, 168, 0.18);
+        position: relative;
+        .kc-back {
+          width: 100%;
+        }
+        .kc-des {
+          padding: 11px 6px;
+          box-sizing: border-box;
+          .kc-name {
+            height: 22px;
+            font-size: 16px;
+            font-family: PingFangSC, PingFangSC-Regular;
+            font-weight: 400;
+            color: #000000;
+            line-height: 22px;
+          }
+          .rate {
+            display: flex;
+            margin: 11px 0;
+            img {
+              margin-right: 6px;
+            }
+          }
+        }
+        .zan {
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 173px;
+          height: 34px;
+          line-height: 34px;
+          font-size: 14px;
+          color: #fff;
+          display: flex;
+          padding-left: 20px;
+          background: rgba(0, 0, 0, 0.59);
+          border-radius: 0px 12px 0px 12px;
+          img {
+            display: inline-block;
+            width: 17px;
+            height: 16px;
+            margin: 8px 5px 0 10px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/pages/szmsg/tskcz/index.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        特色
+    </div>
+</template>

src/pages/ysgc/index.vue

@@ -0,0 +1,178 @@
+<template>
+  <div class="ysgc">
+    <ResourceSearch></ResourceSearch>
+    <div class="ysgc-kind">
+      <ul class="specail">
+        <li class="kind-name">
+          <h3>特色课程展</h3>
+          <p>辅导机构课程 场馆课程</p>
+          <div class="btn-more">
+            <button>查看更多</button>
+          </div>
+        </li>
+        <li class="kc" v-for="kc in 4" :key="kc">
+          <img class="kc-back" src="../../assets/ysgc/kc3.png" alt="" />
+          <div class="kc-des">
+            <p class="kc-name">安徒生世界插画</p>
+            <div class="rate">
+              <img
+                v-for="star in 5"
+                :key="star"
+                src="../../assets/ysgc/star.png"
+                alt=""
+              />
+            </div>
+          </div>
+          <div class="zan">
+            <img src="../../assets/ysgc/zan.png" /> 10w+
+            <img src="../../assets/ysgc/xin.png" alt="" />14w+
+          </div>
+        </li>
+      </ul>
+       <ul class="specail">
+        <li class="kind-name">
+          <h3>艺术联盟</h3>
+          <p>辅导机构课程 场馆课程</p>
+          <div class="btn-more">
+            <button>查看更多</button>
+          </div>
+        </li>
+        <li class="kc" v-for="kc in 1" :key="kc">
+          <img class="kc-back" src="../../assets/ysgc/kc3.png" alt="" />
+          <div class="kc-des">
+            <p class="kc-name">传送门</p>
+          </div>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script setup>
+import ResourceSearch from "../../components/ResourceSearch/index.vue";
+import { ref } from "vue";
+</script>
+<style lang="scss" scoped>
+.ysgc {
+  width: 100%;
+  min-width: 1280px;
+  .ysgc-kind {
+    // width: 1650px;
+    min-width: 1280px;
+    margin: 0 auto;
+    margin-top: -180px;
+    .specail {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      li {
+        margin: 0 27px 27px 0;
+        overflow: hidden;
+      }
+      .kind-name {
+        width: 332px;
+        height: 274px;
+        background: #ffffff;
+        border-radius: 12px;
+        box-shadow: 0px 10px 24px 0px rgba(161, 153, 168, 0.18);
+        padding: 49px 20px;
+        box-sizing: border-box;
+        background-image: url("../../assets/ysgc/tskc.png");
+        background-position: center -15px;
+        h3 {
+          width: 263px;
+          height: 37px;
+          font-size: 26px;
+          font-family: PingFangSC, PingFangSC-Medium;
+          font-weight: 500;
+          text-align: left;
+          color: #050026;
+          line-height: 37px;
+        }
+        p {
+          width: 246px;
+          height: 22px;
+          font-size: 16px;
+          font-family: PingFangSC, PingFangSC-Regular;
+          font-weight: 400;
+          text-align: left;
+          color: #050026;
+          line-height: 22px;
+          margin-top: 25px;
+        }
+        .btn-more {
+          width: 111px;
+          height: 31px;
+          padding: 2px;
+          box-sizing: border-box;
+          border-radius: 38px;
+          margin-top: 45px;
+          background: linear-gradient(127deg, #3f64ff 10%, #8f78f8 91%);
+          button {
+            width: 100%;
+            height: 100%;
+            padding-left: 6px;
+            background: #fff;
+            border-radius: 38px;
+            font-weight: 400;
+            font-size: 14px;
+            color: #6c5dd3;
+            line-height: 20px;
+            letter-spacing: 0.6px;
+            border-image: linear-gradient(127deg, #3f64ff 10%, #8f78f8 91%) 1 1;
+          }
+        }
+      }
+      .kc {
+        width: 337px;
+        height: 278px;
+        background: #ffffff;
+        border-radius: 12px;
+        box-shadow: 0px 10px 24px 0px rgba(161, 153, 168, 0.18);
+        position: relative;
+        .kc-back {
+          width: 100%;
+        }
+        .kc-des {
+          padding: 11px 6px;
+          box-sizing: border-box;
+          .kc-name {
+            height: 22px;
+            font-size: 16px;
+            font-family: PingFangSC, PingFangSC-Regular;
+            font-weight: 400;
+            color: #000000;
+            line-height: 22px;
+          }
+          .rate {
+            display: flex;
+            margin: 11px 0;
+            img {
+              margin-right: 6px;
+            }
+          }
+        }
+        .zan {
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 173px;
+          height: 34px;
+          line-height: 34px;
+          font-size: 14px;
+          color: #fff;
+          display: flex;
+          padding-left: 20px;
+          background: rgba(0, 0, 0, 0.59);
+          border-radius: 0px 12px 0px 12px;
+          img {
+            display: inline-block;
+            width: 17px;
+            height: 16px;
+            margin: 8px 5px 0 10px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/pages/zbkt/index.vue

@@ -1,9 +1,9 @@
 <script setup>
-import img_lczs from '~/assets/直播课堂/理财知识@2x.png';
-import img_ssys from '~/assets/直播课堂/多人,团队,用户_jurassic@2x.png';
-import img_wlzb from '~/assets/直播课堂/fill_直播@2x.png';
-import img_ztzb from '~/assets/直播课堂/UI_icon2_专题图1@2x.png';
-import img_kcb1 from '~/assets/直播课堂/卡通校园小学生课程表海报展板模板-02@2x.png';
+import img_lczs from '~/assets/zbkt/bar.png';
+import img_ssys from '~/assets/zbkt/ssys.png';
+import img_wlzb from '~/assets/zbkt/wlzb.png';
+import img_ztzb from '~/assets/zbkt/ztzb.png';
+import img_kcb1 from '~/assets/zbkt/kcb.png';
 
 const router = useRouter()
 function routeTo(url) {
@@ -17,7 +17,7 @@ function routeTo(url) {
   <div class="flex flex-col w-full items-center">
     <div class="w-full mb-20"><img :src="img_lczs" alt="" class="w-full" /></div>
 
-    <div class="flex justify-between w-1200px mb-20">
+    <div class="flex justify-between w-1400px mb-20">
 
       <div @click="routeTo('/zbkt/ssys')"
         class=" flex shadow-md w-350px h-140px cursor-pointer transform hover:-translate-y-2 rounded-md px-6 py-12">
@@ -32,7 +32,8 @@ function routeTo(url) {
 
 
 
-      <div class=" flex shadow-md w-350px h-140px cursor-pointer transform hover:-translate-y-2 rounded-md px-6 py-12">
+      <div @click="routeTo('/zbkt/wlzb')"
+        class=" flex shadow-md w-350px h-140px cursor-pointer transform hover:-translate-y-2 rounded-md px-6 py-12">
         <div class="w-8 mr-8">
           <img :src="img_wlzb" alt="">
         </div>
@@ -44,7 +45,8 @@ function routeTo(url) {
 
 
 
-      <div class=" flex shadow-md w-350px h-140px cursor-pointer transform hover:-translate-y-2 rounded-md px-6 py-12">
+      <div @click="routeTo('/zbkt/ztzb')"
+        class=" flex shadow-md w-350px h-140px cursor-pointer transform hover:-translate-y-2 rounded-md px-6 py-12">
         <div class="w-8 mr-8">
           <img :src="img_ztzb" alt="">
         </div>
@@ -55,7 +57,7 @@ function routeTo(url) {
       </div>
     </div>
 
-    <div class="w-1200px flex justify-center mb-20">
+    <div class="w-1400px flex justify-center mb-20">
       <el-carousel class="w-1133px h-637px" height="637px">
         <el-carousel-item v-for="item in 3" :key="item">
           <img :src="img_kcb1" />

src/pages/zbkt/ssys/index.vue

@@ -1,4 +1,11 @@
 <script setup>
+import img_lczs1 from '~/assets/zbktssys/1.png';
+import img_lczs2 from '~/assets/zbktssys/2.png';
+import img_lczs3 from '~/assets/zbktssys/3.png';
+import img_lczs from '~/assets/zbktssys/bar.png';
+import img_tx from '~/assets/zbktssys/tx.png';
+
+import { View as IconView, Histogram as IconHistogram, Search as IconSearch } from '@element-plus/icons-vue';
 const activeTab = $ref('first')
 function handleClick() {
 
@@ -28,12 +35,21 @@ const fc = [
   { n: '下册', v: '' },
 ]
 
+const data = $ref([
+  { img: img_lczs1, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '领略生肖传奇，品味传统文化！', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '1' },
+  { img: img_lczs2, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '领略生肖传奇，品味传统文化！', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '' },
+  { img: img_lczs3, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '领略生肖传奇，品味传统文化！', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '' },
+])
+
 
+function hrefTo(href) {
+  window.open(href, '_blank')
+}
 </script>
 
 <template>
   <div class="w-full flex items-center justify-center shadow-sm h-60px">
-    <div class="w-1200px flex items-center">
+    <div class="w-1400px flex items-center">
       <div class="text-lg text-hex-050026">双师一生</div>
       <el-divider direction="vertical" />
       <div class="text-sm">
@@ -43,10 +59,25 @@ const fc = [
     </div>
   </div>
 
+  <div class="w-full relative h-200px">
+    <img :src="img_lczs" alt="" class="w-full h-full">
+    <div class="w-full h-full absolute top-0 z-2 flex flex-col items-center justify-evenly">
+      <div class="text-hex-fff text-5xl">双师一生</div>
+      <el-input class="input w-500px h-50px rounded-md" placeholder="搜索关键字">
+        <template #suffix>
+          <div class="w-26px h-26px bg-hex-00A3FF rounded-md flex justify-center items-center">
+            <el-icon size="13" color="#fff">
+              <IconSearch />
+            </el-icon>
+          </div>
+        </template>
+      </el-input>
+    </div>
+  </div>
 
-  <div class="w-full flex items-center justify-center ">
-    <div class="w-1200px flex flex-col">
-      <div class="w-full bg-hex-fff">
+  <div class="w-full flex items-center justify-center mt-4">
+    <div class="w-1400px flex flex-col">
+      <div class="w-full">
         <el-tabs v-model="activeTab" @tab-click="handleClick">
           <el-tab-pane label="待开始" name="first"></el-tab-pane>
           <el-tab-pane label="已结束" name="second"></el-tab-pane>
@@ -57,8 +88,8 @@ const fc = [
       <div>
         <div class="flex">
           <div class="font-bold mr-4">年级</div>
-          <div>
-            <label v-for="i in nj" :for="i.v" class="text-hex-949494 mx-2 px-4px py-px rounded cursor-pointer"
+          <div class="flex-auto flex-wrap">
+            <label v-for="i in nj" :for="i.v" class="text-hex-949494 mx-3 px-4px py-px rounded cursor-pointer"
               :class="i.v && 'text-hex-00A3FF bg-hex-00A3FF bg-opacity-10'">
               <span>{{ i.n }}</span>
             </label>
@@ -68,8 +99,8 @@ const fc = [
 
         <div class="flex">
           <div class="font-bold mr-4">分册</div>
-          <div>
-            <label v-for="i in fc" :for="i.v" class="text-hex-949494 mx-2 px-4px py-px rounded cursor-pointer"
+          <div class="flex-auto">
+            <label v-for="i in fc" :for="i.v" class="text-hex-949494 mx-3 px-4px py-px rounded cursor-pointer"
               :class="i.v && 'text-hex-00A3FF bg-hex-00A3FF bg-opacity-10'">
               <span>{{ i.n }}</span>
             </label>
@@ -77,6 +108,53 @@ const fc = [
           </div>
         </div>
       </div>
+
+      <div class="flex flex-wrap justify-between">
+        <div class="w-647px h-155px rounded-xl shadow-lg my-7 flex overflow-hidden" v-for="i in data">
+          <div class="w-264px h-full flex-none">
+            <img :src="i.img" alt="" class="w-full h-full">
+          </div>
+          <div class="p-2 pr-6 flex-auto flex flex-col">
+            <div class="flex justify-between w-full items-center py-1">
+              <div class="font-bold">{{ i.title }}</div>
+              <div class="text-hex-949494 text-sm flex justify-between items-center">
+                <el-icon :size="14" color="#949494">
+                  <icon-view />
+                </el-icon>
+                <span class="ml-1">{{ i.bfl }}</span>
+              </div>
+            </div>
+
+            <div class="text-sm text-hex-949494 py-1">
+              {{ i.desc }}
+            </div>
+
+            <div class="text-sm py-1 flex-auto">
+              <span>{{ i.nj }}</span>
+              <span class="mx-2">|</span>
+              <span>{{ i.xk }}</span>
+            </div>
+
+            <div class="flex text-sm justify-between items-center">
+              <div @click="hrefTo('https://rtc.bozedu.net/index.html?uroom=18&uname=txsxnxxb&stream=18_2')"
+                class="cursor-pointer flex items-center">
+                <el-avatar :size="16" :src="i.tx" /><span class="ml-1">{{ i.ls }}</span>
+              </div>
+              <div @click="hrefTo('https://rtc.bozedu.net/index.html?uroom=18&uname=txsxnxxa&stream=18')"
+                class="h-26px rounded-14px px-2 flex items-center text-hex-0083C5 cursor-pointer"
+                :class="i.zt && 'border border-hex-f00 text-hex-f00'">
+                <el-icon :color="i.zt ? '#FF0000' : '#949494'">
+                  <icon-histogram />
+                </el-icon>
+                <span class="ml-2 "> {{ i.zt ? '已开始' : '未开始' }}</span>
+              </div>
+              <div class="h-26px leading-26px px-4 bg-gradient-to-l from-green-400 to-blue-500 text-white rounded-14px">
+                讲义</div>
+            </div>
+
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -89,4 +167,9 @@ const fc = [
 :deep(.el-tabs__nav-wrap::after) {
   background-color: transparent;
 }
+
+.input {
+  height: 50px;
+  width: 500px;
+}
 </style>

src/pages/zbkt/wlzb/index.vue

@@ -0,0 +1,184 @@
+<script setup>
+import img_lczs1 from '~/assets/zbktssys/1.png';
+import img_lczs2 from '~/assets/zbktssys/2.png';
+import img_lczs3 from '~/assets/zbktssys/3.png';
+import img_lczs from '~/assets/zbktssys/bar.png';
+import img_tx from '~/assets/zbktssys/tx.png';
+import { View as IconView, Histogram as IconHistogram, Search as IconSearch } from '@element-plus/icons-vue';
+const activeTab = $ref('first')
+function handleClick() {
+
+}
+
+const nj = [
+  { n: '全部', v: '1' },
+  { n: '幼儿园', v: '' },
+  { n: '一年级', v: '' },
+  { n: '二年级', v: '' },
+  { n: '三年级', v: '' },
+  { n: '四年级', v: '' },
+  { n: '五年级', v: '' },
+  { n: '六年级', v: '' },
+  { n: '初一', v: '' },
+  { n: '初二', v: '' },
+  { n: '初三', v: '' },
+  { n: '高一', v: '' },
+  { n: '高二', v: '' },
+  { n: '高三', v: '' },
+  { n: '其他', v: '' },
+]
+
+const fc = [
+  { n: '全部', v: '1' },
+  { n: '上册', v: '' },
+  { n: '下册', v: '' },
+]
+
+const data = $ref([
+  { img: img_lczs1, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '领略生肖传奇，品味传统文化！', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '1' },
+  { img: img_lczs2, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '领略生肖传奇，品味传统文化！', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '1' },
+  { img: img_lczs3, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '领略生肖传奇，品味传统文化！', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '1' },
+])
+
+
+function hrefTo(href) {
+  window.open(href, '_blank')
+}
+</script>
+
+<template>
+  <div class="w-full flex items-center justify-center shadow-sm h-60px">
+    <div class="w-1400px flex items-center">
+      <div class="text-lg text-hex-050026">网络直播</div>
+      <el-divider direction="vertical" />
+      <div class="text-sm">
+        <span class="text-hex-949494">直播课堂</span>
+        <span> - 网络直播</span>
+      </div>
+    </div>
+  </div>
+
+  <div class="w-full relative h-200px">
+    <img :src="img_lczs" alt="" class="w-full h-full">
+    <div class="w-full h-full absolute top-0 z-2 flex flex-col items-center justify-evenly">
+      <div class="text-hex-fff text-5xl">网络直播</div>
+      <el-input class="input w-500px h-50px rounded-md overflow-hidden" placeholder="搜索关键字">
+        <template #suffix>
+          <div class="w-26px h-26px bg-hex-00A3FF rounded-md flex justify-center items-center">
+            <el-icon size="13" color="#fff">
+              <IconSearch />
+            </el-icon>
+          </div>
+        </template>
+      </el-input>
+    </div>
+  </div>
+
+  <div class="w-full flex items-center justify-center mt-4">
+    <div class="w-1400px flex flex-col">
+      <div>
+        <div class="flex">
+          <div class="font-bold mr-4">年级</div>
+          <div class="flex-auto flex-wrap">
+            <label v-for="i in nj" :for="i.v" class="text-hex-949494 mx-3 px-4px py-px rounded cursor-pointer"
+              :class="i.v && 'text-hex-00A3FF bg-hex-00A3FF bg-opacity-10'">
+              <span>{{ i.n }}</span>
+            </label>
+            <div class="border_b my-4"></div>
+          </div>
+        </div>
+
+        <div class="flex">
+          <div class="font-bold mr-4">分册</div>
+          <div class="flex-auto">
+            <label v-for="i in fc" :for="i.v" class="text-hex-949494 mx-3 px-4px py-px rounded cursor-pointer"
+              :class="i.v && 'text-hex-00A3FF bg-hex-00A3FF bg-opacity-10'">
+              <span>{{ i.n }}</span>
+            </label>
+            <div class="border_b my-4"></div>
+          </div>
+        </div>
+      </div>
+
+
+      <div class="text-lg font-bold mt-7 mb-3">正在直播</div>
+      <div class="flex flex-wrap justify-between">
+        <div class="w-647px h-155px rounded-xl shadow-lg mb-7 flex" v-for="i in data">
+          <div class="w-264px h-full flex-none">
+            <img :src="i.img" alt="" class="w-full h-full">
+          </div>
+          <div class="p-2 pr-6 flex-auto flex flex-col">
+            <div class="flex justify-between w-full items-center py-1">
+              <div class="font-bold">{{ i.title }}</div>
+              <div class="text-hex-949494 text-sm flex justify-between items-center">
+                <el-icon :size="14" color="#949494">
+                  <icon-view />
+                </el-icon>
+                <span class="ml-1">{{ i.bfl }}</span>
+              </div>
+            </div>
+
+            <div class="text-sm text-hex-949494 py-1">
+              {{ i.desc }}
+            </div>
+
+            <div class="text-sm py-1 flex-auto">
+              <span>{{ i.nj }}</span>
+              <span class="mx-2">|</span>
+              <span>{{ i.xk }}</span>
+            </div>
+
+            <div class="flex text-sm justify-between items-center">
+              <div @click="hrefTo('https://rtc.bozedu.net/index.html?uroom=18&uname=txsxnxxb&stream=18_2')"
+                class="cursor-pointer flex items-center">
+                <el-avatar :size="16" :src="i.tx" /><span class="ml-1">{{ i.ls }}</span>
+              </div>
+              <div @click="hrefTo('https://rtc.bozedu.net/index.html?uroom=18&uname=txsxnxxa&stream=18')"
+                class="h-26px rounded-14px px-2 flex items-center text-hex-0083C5 cursor-pointer"
+                :class="i.zt && 'border border-hex-f00 text-hex-f00'">
+                <el-icon :color="i.zt ? '#FF0000' : '#949494'">
+                  <icon-histogram />
+                </el-icon>
+                <span class="ml-2 "> {{ i.zt ? '直播中' : '未开始' }}</span>
+              </div>
+              <!-- <div class="h-26px leading-26px px-4 bg-gradient-to-l from-green-400 to-blue-500 text-white rounded-14px">
+                讲义</div> -->
+            </div>
+
+          </div>
+        </div>
+      </div>
+
+
+      <div class="flex w-full justify-between">
+        <div class="flex-auto mr-8">
+          <div class="text-lg font-bold mt-7 mb-3">推荐直播</div>
+          <div class="flex flex-wrap justify-between">
+            <div class="w-318px h-263px rounded-xl shadow-lg mb-7 flex flex-col overflow-hidden" v-for="i in data">
+              <div class="w-full flex-none">
+                <img :src="i.img" alt="" class="w-full h-full">
+              </div>
+              <div class="p-2">
+                {{ i.title }}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="w-320px shadow flex-none"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.border_b {
+  border-bottom: 1px solid #E4E6E8;
+}
+
+
+.input {
+  height: 50px;
+  width: 500px;
+}
+</style>

src/pages/zbkt/ztzb/index.vue

@@ -0,0 +1,121 @@
+<script setup>
+import { View as IconView, Histogram as IconHistogram, Search as IconSearch } from '@element-plus/icons-vue';
+
+import img_lczs1 from '~/assets/zbktssys/1.png';
+import img_lczs2 from '~/assets/zbktssys/2.png';
+import img_lczs3 from '~/assets/zbktssys/3.png';
+import img_lczs from '~/assets/zbktssys/bar.png';
+import img_tx from '~/assets/zbktssys/tx.png';
+
+function hrefTo(href) {
+  window.open(href, '_blank')
+}
+
+const data = $ref([
+  { img: img_lczs1, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '主讲人（单位）：桐乡市艺术网校', desc1: '直播时间：2022-06-14', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '1' },
+  { img: img_lczs2, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '主讲人（单位）：桐乡市艺术网校', desc1: '直播时间：2022-06-14', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '' },
+  { img: img_lczs3, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '主讲人（单位）：桐乡市艺术网校', desc1: '直播时间：2022-06-14', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '' },
+  { img: img_lczs3, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '主讲人（单位）：桐乡市艺术网校', desc1: '直播时间：2022-06-14', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '' },
+  { img: img_lczs3, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '主讲人（单位）：桐乡市艺术网校', desc1: '直播时间：2022-06-14', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '' },
+  { img: img_lczs3, title: '走进生肖文化——寅虎卯兔', bfl: 100, desc: '主讲人（单位）：桐乡市艺术网校', desc1: '直播时间：2022-06-14', nj: '四年级', xk: '美术', ls: '尚老师', tx: img_tx, zt: '' },
+])
+</script>
+
+<template>
+  <div class="w-full flex items-center justify-center shadow-sm h-60px">
+    <div class="w-1400px flex items-center">
+      <div class="text-lg text-hex-050026">专题直播</div>
+      <el-divider direction="vertical" />
+      <div class="text-sm">
+        <span class="text-hex-949494">直播课堂</span>
+        <span> - 专题直播</span>
+      </div>
+    </div>
+  </div>
+  <div class="w-full relative h-200px">
+    <div class="w-full h-full bg_linear" />
+    <div class="w-full h-full absolute top-0 z-2 flex flex-col items-center justify-evenly">
+      <div class="text-5xl">专题直播, 搜索一下</div>
+      <el-input class="input w-500px h-50px rounded-md" placeholder="搜索关键字">
+        <template #suffix>
+          <div class="w-26px h-26px bg-hex-00A3FF rounded-md flex justify-center items-center">
+            <el-icon size="13" color="#fff">
+              <IconSearch />
+            </el-icon>
+          </div>
+        </template>
+      </el-input>
+      <div class="flex text-dark-200 divide-dark-200 divide-x">
+        <div class="px-2">微课</div>
+        <div class="px-2">课件</div>
+        <div class="px-2">教案</div>
+        <div class="px-2">微视频</div>
+        <div class="px-2">网络资源</div>
+      </div>
+    </div>
+  </div>
+
+  <div class="flex justify-center">
+    <div class="flex flex-wrap justify-between w-1400px">
+      <div class="w-647px h-155px rounded-xl shadow-lg my-7 flex overflow-hidden" v-for="i in data">
+        <div class="w-264px h-full flex-none">
+          <img :src="i.img" alt="" class="w-full h-full">
+        </div>
+        <div class="p-2 pr-6 flex-auto flex flex-col">
+          <div class="flex justify-between w-full items-center py-1">
+            <div class="font-bold">{{ i.title }}</div>
+            <div class="text-hex-949494 text-sm flex justify-between items-center">
+              <el-icon :size="14" color="#949494">
+                <icon-view />
+              </el-icon>
+              <span class="ml-1">{{ i.bfl }}</span>
+            </div>
+          </div>
+
+          <div class="text-sm text-hex-949494 py-1">
+            <div> {{ i.desc }}</div>
+            <div> {{ i.desc1 }}</div>
+          </div>
+
+
+          <div class="text-sm py-1 flex-auto">
+            课程介绍： 蓝印花布 蓝印花布 蓝印花布 蓝印花布……
+          </div>
+
+
+          <div class="flex text-sm justify-between items-center">
+            <!-- <div @click="hrefTo('https://rtc.bozedu.net/index.html?uroom=18&uname=txsxnxxb&stream=18_2')"
+              class="cursor-pointer flex items-center">
+              <el-avatar :size="16" :src="i.tx" /><span class="ml-1">{{ i.ls }}</span>
+            </div>
+            <div @click="hrefTo('https://rtc.bozedu.net/index.html?uroom=18&uname=txsxnxxa&stream=18')"
+              class="h-26px rounded-14px px-2 flex items-center text-hex-0083C5 cursor-pointer"
+              :class="i.zt && 'border border-hex-f00 text-hex-f00'">
+              <el-icon :color="i.zt ? '#FF0000' : '#949494'">
+                <icon-histogram />
+              </el-icon>
+              <span class="ml-2 "> {{ i.zt ? '已开始' : '未开始' }}</span>
+            </div> -->
+            <div class="h-26px leading-26px px-4 bg-gradient-to-l from-green-400 to-blue-500 text-white rounded-14px">
+              观看回放</div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<style scoped>
+.input {
+  height: 50px;
+  width: 500px;
+}
+
+.bg_linear {
+  opacity: 0.59;
+  background: linear-gradient(72deg, rgba(0, 163, 255, 0.00) 18%, rgba(221, 254, 238, 0.57) 64%, rgba(255, 247, 228, 0.89) 100%);
+  filter: blur(50px);
+}
+</style>

src/router/index.js

@@ -1,16 +1,39 @@
 import { createRouter, createWebHashHistory } from "vue-router";
 
 export default createRouter({
+
 	history: createWebHashHistory(),
 	routes: [
+		{
+			path: '/',
+			redirect: '/home'
+		},
+		{
+			path: '/home',
+			title: '首页',
+			component: () => import("~/pages/home/index.vue"),
+		},
+		{
+			path: '/ysgc',
+			component: () => import("~/pages/ysgc/index.vue"),
+		},
+		{
+			path: '/szmsg',
+			component: () => import("~/pages/szmsg/index.vue"),
+		},
+		{
+			path: '/tskcz',
+			component: () => import('~/pages/szmsg/tskcz/index.vue'),
+		},
     {
-        path: '/',
-        redirect: '/home'
+      path: '/resource',
+      title:'首页',
+      component: () => import("~/pages/courseResources.vue"),
     },
     {
-        path: '/home',
-        title:'首页',
-        component: () => import("~/pages/home/index.vue"),
+      path: '/resourceAll',
+      title:'首页',
+      component: () => import("~/pages/courseResourcesAll.vue"),
     },
 		{
 			path: '/zbkt',
@@ -28,21 +51,27 @@ export default createRouter({
 							component: () => import("~/pages/zbkt/ssys/index.vue"),
 						},
 					]
+				},
+				{
+					path: 'wlzb',
+					children: [
+						{
+							path: '',
+							component: () => import("~/pages/zbkt/wlzb/index.vue"),
+						},
+					]
+				},
+				{
+					path: 'ztzb',
+					children: [
+						{
+							path: '',
+							component: () => import("~/pages/zbkt/ztzb/index.vue"),
+						},
+					]
 				}
 			]
 		},
-    {
-      path: '/resource',
-      title:'首页',
-      component: () => import("~/pages/courseResources.vue"),
-    },
-    {
-      path: '/resourceAll',
-      title:'首页',
-      component: () => import("~/pages/courseResourcesAll.vue"),
-    },
-    
-
 	]
 })
 

vite.config.js

@@ -42,7 +42,9 @@ export default defineConfig({
         'src/store',
         'src/utils',
       ],
-      resolvers: [ElementPlusResolver()],
+      resolvers: [
+        ElementPlusResolver(),
+      ],
       vueTemplate: true,
     }),
     Components({
@@ -52,7 +54,7 @@ export default defineConfig({
       extensions: ['vue', 'md'],
       // allow auto import and register components used in markdown
       include: [/\.vue$/, /\.vue\?vue/, /\.md$/],
-      resolvers: [IconsResolver(),ElementPlusResolver()],
+      resolvers: [IconsResolver(), ElementPlusResolver()],
     }),
     Icons({
       compiler: 'vue3',
@@ -63,6 +65,7 @@ export default defineConfig({
     host: true
   },
   build: {
+    assetsInlineLimit: 1024 * 1000,
     rollupOptions: {
       output: {
         manualChunks: {

yarn.lock

@@ -15,10 +15,15 @@
   "resolved" "https://registry.npmjs.org/@antfu/utils/-/utils-0.5.2.tgz"
   "version" "0.5.2"
 
-"@babel/parser@^7.15.8", "@babel/parser@^7.16.4":
-  "integrity" "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="
-  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz"
-  "version" "7.18.13"
+"@babel/parser@^7.16.4":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
+  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
+
+"@esbuild/linux-loong64@0.14.54":
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028"
+  integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==
 
 "@ctrl/tinycolor@^3.4.1":
   "integrity" "sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw=="
@@ -86,7 +91,7 @@
   "version" "1.2.8"
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
-    "fastq" "^1.6.0"
+    fastq "^1.6.0"
 
 "@popperjs/core@npm:@sxzz/popperjs-es@^2.11.7":
   "integrity" "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
@@ -94,12 +99,12 @@
   "version" "2.11.7"
 
 "@rollup/pluginutils@^4.2.1":
-  "integrity" "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="
-  "resolved" "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz"
-  "version" "4.2.1"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
+  integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
   dependencies:
-    "estree-walker" "^2.0.1"
-    "picomatch" "^2.2.2"
+    estree-walker "^2.0.1"
+    picomatch "^2.2.2"
 
 "@types/lodash-es@*", "@types/lodash-es@^4.17.6":
   "integrity" "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg=="
@@ -275,6 +280,7 @@
     "normalize-path" "^3.0.0"
     "picomatch" "^2.0.4"
 
+<<<<<<< HEAD
 "async-validator@^4.2.5":
   "integrity" "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
   "resolved" "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz"
@@ -284,11 +290,17 @@
   "integrity" "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
   "resolved" "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
   "version" "0.4.0"
-
-"axios@^0.27.2":
-  "integrity" "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="
-  "resolved" "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"
-  "version" "0.27.2"
+=======
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+>>>>>>> master
+
+axios@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
   dependencies:
     "follow-redirects" "^1.14.9"
     "form-data" "^4.0.0"
@@ -353,10 +365,17 @@
   "resolved" "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz"
   "version" "2.6.20"
 
+<<<<<<< HEAD
 "dayjs@^1.11.3", "dayjs@^1.11.5":
   "integrity" "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
   "resolved" "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz"
   "version" "1.11.5"
+=======
+dayjs@^1.11.5:
+  version "1.11.5"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.5.tgz#00e8cc627f231f9499c19b38af49f56dc0ac5e93"
+  integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==
+>>>>>>> master
 
 "debug@^4.3.4":
   "integrity" "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="
@@ -370,6 +389,7 @@
   "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
   "version" "1.0.0"
 
+<<<<<<< HEAD
 "element-plus@^2.2.14":
   "integrity" "sha512-V5Pis0OHhePg1RgVogZrcefaVl8vjVn4Pn9Qsh/t2CbFgjg9kKOYFqf/tuP3ObSXGm3X89hpe0W+nLVAsaFnpw=="
   "resolved" "https://registry.npmjs.org/element-plus/-/element-plus-2.2.14.tgz"
@@ -400,6 +420,112 @@
   "integrity" "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA=="
   "resolved" "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz"
   "version" "0.14.54"
+=======
+esbuild-android-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be"
+  integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==
+
+esbuild-android-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771"
+  integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==
+
+esbuild-darwin-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25"
+  integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==
+
+esbuild-darwin-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73"
+  integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==
+
+esbuild-freebsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d"
+  integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==
+
+esbuild-freebsd-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48"
+  integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==
+
+esbuild-linux-32@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5"
+  integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==
+
+esbuild-linux-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652"
+  integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==
+
+esbuild-linux-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b"
+  integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==
+
+esbuild-linux-arm@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59"
+  integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==
+
+esbuild-linux-mips64le@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34"
+  integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==
+
+esbuild-linux-ppc64le@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e"
+  integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==
+
+esbuild-linux-riscv64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8"
+  integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==
+
+esbuild-linux-s390x@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6"
+  integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==
+
+esbuild-netbsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81"
+  integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==
+
+esbuild-openbsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b"
+  integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==
+
+esbuild-sunos-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da"
+  integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==
+
+esbuild-windows-32@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31"
+  integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==
+
+esbuild-windows-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4"
+  integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==
+
+esbuild-windows-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982"
+  integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==
+
+esbuild@^0.14.47:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2"
+  integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==
+>>>>>>> master
   optionalDependencies:
     "@esbuild/linux-loong64" "0.14.54"
     "esbuild-android-64" "0.14.54"
@@ -423,6 +549,7 @@
     "esbuild-windows-64" "0.14.54"
     "esbuild-windows-arm64" "0.14.54"
 
+<<<<<<< HEAD
 "escape-html@^1.0.3":
   "integrity" "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
   "resolved" "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
@@ -432,6 +559,17 @@
   "integrity" "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="
   "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz"
   "version" "5.0.0"
+=======
+escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
+
+estree-walker@^2.0.1, estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+>>>>>>> master
 
 "estree-walker@^2.0.1", "estree-walker@^2.0.2":
   "integrity" "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
@@ -500,15 +638,15 @@
     "combined-stream" "^1.0.8"
     "mime-types" "^2.1.12"
 
-"fsevents@~2.3.2":
-  "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
-  "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
-  "version" "2.3.2"
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
-"function-bind@^1.1.1":
-  "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-  "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
-  "version" "1.1.1"
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 "get-stream@^6.0.0":
   "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
@@ -605,8 +743,9 @@
   "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"
   "version" "6.0.0"
   dependencies:
-    "p-locate" "^5.0.0"
+    p-locate "^5.0.0"
 
+<<<<<<< HEAD
 "lodash-es@*", "lodash-es@^4.17.21":
   "integrity" "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
   "resolved" "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
@@ -626,6 +765,12 @@
   "integrity" "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="
   "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
   "version" "0.25.9"
+=======
+magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+>>>>>>> master
   dependencies:
     "sourcemap-codec" "^1.4.8"
 
@@ -634,8 +779,9 @@
   "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz"
   "version" "0.26.2"
   dependencies:
-    "sourcemap-codec" "^1.4.8"
+    sourcemap-codec "^1.4.8"
 
+<<<<<<< HEAD
 "memoize-one@^6.0.0":
   "integrity" "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
   "resolved" "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
@@ -645,6 +791,12 @@
   "integrity" "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
   "resolved" "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
   "version" "2.0.0"
+=======
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+>>>>>>> master
 
 "merge2@^1.3.0":
   "integrity" "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
@@ -708,6 +860,7 @@
   "resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
   "version" "3.0.0"
 
+<<<<<<< HEAD
 "normalize-wheel-es@^1.2.0":
   "integrity" "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
   "resolved" "https://registry.npmjs.org/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz"
@@ -717,13 +870,24 @@
   "integrity" "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="
   "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
   "version" "4.0.1"
+=======
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+>>>>>>> master
   dependencies:
-    "path-key" "^3.0.0"
+    path-key "^3.0.0"
 
-"onetime@^5.1.2":
-  "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
-  "resolved" "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
-  "version" "5.1.2"
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     "mimic-fn" "^2.1.0"
 
@@ -838,10 +1002,17 @@
     "immutable" "^4.0.0"
     "source-map-js" ">=0.6.2 <2.0.0"
 
-"scule@^0.3.2":
-  "integrity" "sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g=="
-  "resolved" "https://registry.npmjs.org/scule/-/scule-0.3.2.tgz"
-  "version" "0.3.2"
+sass@^1.54.4:
+  version "1.54.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.5.tgz#93708f5560784f6ff2eab8542ade021a4a947b3a"
+  integrity sha512-p7DTOzxkUPa/63FU0R3KApkRHwcVZYC0PLnLm5iyZACyp15qSi32x7zVUhRdABAATmkALqgGrjCJAcWvobmhHw==
+  dependencies:
+    "ometa" "0.2.2"
+
+scule@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/scule/-/scule-0.3.2.tgz#472445cecd8357165a94a067f78cee40e700b596"
+  integrity sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==
 
 "shebang-command@^2.0.0":
   "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="