diff --git a/src/assets/blue_title.png b/src/assets/blue_title.png
new file mode 100644
index 0000000..17027d9
Binary files /dev/null and b/src/assets/blue_title.png differ
diff --git a/src/main.js b/src/main.js
index f93a004..6dbb277 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { Popup, Toast, Picker, Tag, Tab, Tabs, Area, Search, Swipe, SwipeItem, Cell, List, Collapse, CollapseItem, Button, Field, Icon, Sticky, DropdownMenu, DropdownItem, Rate, Calendar, Checkbox, Empty, Lazyload, Radio, RadioGroup, CellGroup, Dialog, CheckboxGroup, NavBar, PullRefresh, Cascader } from 'vant';
+import { Popup, Toast, Picker, Tag, Tab, Tabs, Area, Search, Swipe, SwipeItem, Cell, List, Collapse, CollapseItem, Button, Field, Icon, Sticky, DropdownMenu, DropdownItem, Rate, Calendar, Checkbox, Empty, Lazyload, Radio, RadioGroup, CellGroup, Dialog, CheckboxGroup, NavBar, PullRefresh, Cascader , ImagePreview } from 'vant';
 import App from './App.vue'
 import router from './router'
 import store from './store'
@@ -8,9 +8,10 @@ import Moment from 'moment'
 Vue.prototype.Moment = Moment;
 
 // Vue.prototype.yanxueUrl = 'https://yanxue.myjxt.com';
+Vue.prototype.dataUrl = 'http://47.110.50.251:9010'
 
-// import yxAxios from '@/https/yxAxios'
-// Vue.prototype.yxAxios = yxAxios;
+import yxAxios from '@/https/yxAxios'
+Vue.prototype.yxAxios = yxAxios;
 
 import { mgop } from '@aligov/jssdk-mgop';
 Vue.prototype.mgop = mgop;
@@ -51,6 +52,7 @@ Vue
     .use(PullRefresh)
     .use(RadioGroup)
     .use(Cascader)
+    .use(ImagePreview)
     .use(Radio);
 Vue.config.productionTip = false;
 Vue.config.ignoredElements = ['wx-open-launch-app'];
diff --git a/src/views/Yanxue/achievementsOne.vue b/src/views/Yanxue/achievementsOne.vue
index 97ecefa..f37998f 100644
--- a/src/views/Yanxue/achievementsOne.vue
+++ b/src/views/Yanxue/achievementsOne.vue
@@ -7,31 +7,29 @@
       <van-tab title="研学旅行"></van-tab>
     </van-tabs> -->
 
-    <div class="contextBox">
-      <!-- <div class="art_card" @click="toDetails">
-        <div class="art_title">庆祝中国共产主义青年团成立100年大会</div>
-        <div class="art_bot">
-          <div class="redSticky">置顶</div>
-          <div class="greyTime">发布于2022.5.10</div>
-          <div class="greyFont">浏览量 2022</div>
-        </div>
-      </div> -->
-
-      <div class="art_card_pic" v-for="(v, i) in newsList" :key="i" @click="toDetails(v.videopic)">
-        <div class="art_context" >
-          <div class="art_title">{{ v.titleName }}</div>
+    <div class="contextBox" v-if="newsList.length != 0">
+      <div
+        class="art_card_pic"
+        v-for="(v, i) in newsList"
+        :key="i"
+        @click="toDetails(v)"
+      >
+        <div class="art_context">
+          <div class="art_title">{{ v.titleDesc }}</div>
           <div class="art_bot">
-            <div class="redSticky" v-if="v.liul > 1000">置顶</div>
-            <div class="greyTime">发布于2022.7.4</div>
-            <div class="greyFont">浏览量 {{v.liul}}</div>
+            <!-- <div class="redSticky" v-if="v.readNumber">置顶</div> -->
+            <div class="greyTime">发布于 {{ v.createTime ? Moment(v.createTime).format('YYYY-MM-DD HH:mm:ss') : ''}}</div>
+            <div class="greyFont">浏览量 {{ v.readNumber }}</div>
           </div>
         </div>
         <div class="art_pic">
-          <img :src="v.imgpic" />
+          <img :src="v.imgUrl" />
         </div>
       </div>
     </div>
 
+    <van-empty description="暂无数据" v-else/>
+
     <div class="imgPic" @click="toChoose">
       <img src="@/assets/changeSchool.png" />
     </div>
@@ -47,154 +45,37 @@ export default {
   data() {
     return {
       tabsName: 1,
-      list1: [
-        {
-          titleName: "假日红色研学——酱文化篇",
-          liul: 2022,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/300d6414-1639-4bb8-89b1-3a916dab4359.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/0676ee97-d5bc-4d6a-ae9b-4f942fcdd213.mp4",
-        },
-        {
-          titleName: "假日红色研学——消防篇",
-          liul: 1120,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/93314705-ca4e-43a0-b2cd-4ccf8aa9d850.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/f997a748-4575-4759-9834-e6a34612bc14.mp4",
-        },
-        {
-          titleName: "假日红色研学——兰亭篇",
-          liul: 320,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/dbe041a4-3c60-411f-afa8-557c18210d06.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/7850890c-f8d1-4e1d-bfc7-3cd5c6f69e81.mp4",
-        },
-        {
-          titleName: "假日红色研学——非遗篇",
-          liul: 113,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/f058b51e-48ee-4f11-b571-a0c85c3ab9ce.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/6e8f66b5-d44c-4ca7-aaf9-c82eec23532f.mp4",
-        },
-        {
-          titleName: "假日红色研学——黄酒小镇篇",
-          liul: 365,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/1b0b852e-97bd-4faf-9034-159bae23bf88.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/2d1ef3db-4003-4722-a4a2-853d54a284da.mp4",
-        },
-        {
-          titleName: "假日红色研学——景岳堂篇",
-          liul: 154,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/75b8a162-1b35-4478-b286-d38e59b25c88.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/9de14f1c-c996-475c-b839-8d438ca4ec2b.mp4",
-        },
-        {
-          titleName: "假日红色研学——鲁迅故里篇",
-          liul: 702,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/b3cca4ff-6304-4591-8b35-959034316d11.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/e06b10f0-4596-44d2-a937-5b038ede70da.mp4",
-        },
-        {
-          titleName: "假日红色研学——青藤书屋篇",
-          liul: 483,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/d014be8f-e30c-4122-ab98-5d7853b8b525.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/a68075df-4c33-482a-8be3-b921cf3da7a4.mp4",
-        },
-        {
-          titleName: "假日红色研学——棠棣篇",
-          liul: 78,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/9664fc60-22ec-44ec-80a1-cb8177963436.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/cb82b2ed-1f80-48e5-9c39-ef2b0a388aa4.mp4",
-        },
-        {
-          titleName: "假日红色研学——周恩来祖居篇",
-          liul: 35,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/24c53642-5191-453a-949c-3bef03e6ec4e.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/d623f9a2-4e70-4fe0-ba52-7703af38248a.mp4",
-        },
-        {
-          titleName: "假日红色研学——宝业篇",
-          liul: 68,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/1819f0fd-a4cf-44ce-b832-545fe0c571f3.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/a24a2a12-4771-4b84-b1b5-1612bb200da4.mp4",
-        },
-      ],
-      list2: [
-        {
-          titleName: "红馆听老兵爷爷讲故事",
-          liul: 1684,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/c722b105-9e17-4cc9-8cfd-2c98af72f9ec.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/84a71b3e-3f43-425b-bea3-0a75bbffed1d.mp4",
-        },
-        {
-          titleName: "雏鹰小队红色研学",
-          liul: 450,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/95cf5713-194f-49ba-8487-7625e2a705fe.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/43fb6927-e059-4f59-a3c9-0b1b70d2f10a.mp4",
-        },
-        {
-          titleName: "英才素质拓展训练营",
-          liul: 655,
-          imgpic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/59876663-e69f-4f54-abd4-901687192a94.png",
-          videopic:
-            "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/6ac9d056-8d59-4bbc-ac99-d44f35557c03.mp4",
-        },
-      ],
       newsList: [],
     };
   },
-  computed: {
-    schoolName() {
-      return this.$route.query.schoolName;
-    },
-  },
-  watch: {
-    schoolName: {
-      handler: function (v, k) {
-        if (v == "柯桥区中国轻纺城小学") {
-          this.newsList = JSON.parse(JSON.stringify(this.list2));
-        } else {
-          this.newsList = JSON.parse(JSON.stringify(this.list1));
-        }
-      },
-      immediate: true,
-    },
-  },
   methods: {
     //详情新闻
     toDetails(v) {
-      console.log(this.schoolName);
-      window.open(v);
-      // this.$router.push({ name: "pageDetails" });
+      this.$router.push({ name: "pageDetails" ,query: {schoolId:v.schoolId,dataId: v.id}});
     },
     //选择
     toChoose() {
       this.$router.push({ name: "chooseSchoolOne" });
     },
+    getData() {
+      this.yxAxios
+        .post(`${this.dataUrl}/sys/yx/consultList`, {
+          page: 1,
+          pageSize: 999,
+          schoolId: this.$route.query.schoolId*1
+        })
+        .then((res) => {
+          if (res.data.success) {
+            this.newsList = res.data.data.list;
+          } else {
+            this.$message.warning(res.data.message);
+          }
+        });
+    },
   },
+  mounted() {
+    this.getData()
+  }
 };
 </script>
 
diff --git a/src/views/Yanxue/chooseSchoolOne.vue b/src/views/Yanxue/chooseSchoolOne.vue
index 52da85c..b98ac0a 100644
--- a/src/views/Yanxue/chooseSchoolOne.vue
+++ b/src/views/Yanxue/chooseSchoolOne.vue
@@ -24,37 +24,43 @@ export default {
   data() {
     return {
       tabsName: 0,
-      schoolList: [
-        { schoolName: "柯桥区实验小学" },
-        { schoolName: "柯桥区中国轻纺城小学" },
-      ],
+      schoolList: [],
     };
   },
   watch: {
     tabsName(val) {
-      console.log(val);
       this.schoolList = [];
-      if (val == 0) {
-        this.getList();
-      } else if (val == 1) {
-        
-      } else if (val == 2) {
-      }
+      this.getList();
     },
   },
   methods: {
     toActive(v) {
-      this.$router.push({ name: "achievementsOne" ,query: {schoolName: v.schoolName}});
+      this.$router.push({
+        name: "achievementsOne",
+        query: { schoolId: v.id },
+      });
     },
     //切换
     tabsChange() {},
     getList() {
-      this.schoolList = [
-        { schoolName: "柯桥区实验小学" },
-        { schoolName: "柯桥区中国轻纺城小学" },
-      ];
+      this.yxAxios
+        .post(`${this.dataUrl}/sys/yx/schoolList`, {
+          page: 1,
+          pageSize: 999,
+          schoolType: this.tabsName +1
+        })
+        .then((res) => {
+          if (res.data.success) {
+            this.schoolList = res.data.data.list;
+          } else {
+            this.$message.warning(res.data.message);
+          }
+        });
     },
   },
+  mounted() {
+    this.getList();
+  },
 };
 </script>
 
diff --git a/src/views/Yanxue/pageDetails.vue b/src/views/Yanxue/pageDetails.vue
index 40ac11b..fe4cc70 100644
--- a/src/views/Yanxue/pageDetails.vue
+++ b/src/views/Yanxue/pageDetails.vue
@@ -1,77 +1,188 @@
 <template>
-  <div>
-    <!-- <div class="box_pic">
-      <img src="@/assets/login_bg.png" />
+  <div class="box">
+    <div class="box_pic" v-if="background">
+      <img :src="background" />
     </div>
-    <div class="article">
-      <div class="article_title">庆祝中国共产主义青年团成立100年大会</div>
-      <div class="article_time">发布于 2022.5.10 浏览量 2022</div>
-      <div class="article_con">共青团员们，青年朋友们，同志们：</div>
-    </div> -->
-    <div class="videoCss">
-      <video :src="videopic"></video>
+
+    <div class="contextCss">
+      <div class="modelBox" v-for="(v, i) in modelList" :key="i">
+        <div class="titleCss">{{ v.name }}</div>
+        <!--相册-->
+        <div v-if="v.type == 1" class="typeOne">
+          <div
+            class="pic"
+            v-for="(x, y) in v.imgList"
+            :key="y"
+            @click="openImg(x, y, v)"
+          >
+            <img :src="x.response" />
+          </div>
+        </div>
+        <!--视频-->
+        <div v-if="v.type == 2" class="typeTwo">
+          <div class="videoTwo" v-for="(x, y) in v.videoList" :key="y">
+            <video controls>
+              <source :src="x" type="video/mp4" />
+            </video>
+          </div>
+        </div>
+        <!--图文-->
+        <div v-if="v.type == 3" class="typeThree">
+          <div class="contextThree" v-html="v.context"></div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import { ImagePreview } from "vant";
 export default {
   data() {
-    return { arr: 0 };
-  },
-  computed: {
-    videopic() {
-      return sessionStorage.getItem("videopic");
-    },
+    return { arr: 0, modelList: [] ,background: ''};
   },
   methods: {
     //获取数据
-    getTable() {},
+    getTable() {
+      this.yxAxios
+        .post(`${this.dataUrl}/sys/yx/getConsultDetail`, {
+          id: this.$route.query.dataId,
+        })
+        .then((res) => {
+          if (res.data.success) {
+            if (!res.data.data.background) {
+              this.background = res.data.data.imgUrl;
+            }else {
+              this.background = res.data.data.background;
+            }
+            let arr = JSON.parse(res.data.data.modelList);
+            this.modelList = arr;
+          } else {
+            this.$message.warning(res.data.message);
+          }
+        });
+    },
+    //打开图片
+    openImg(x, y, v) {
+      let imgList = v.imgList.map((v) => v.response);
+
+      ImagePreview({
+        images: imgList,
+        startPosition: y,
+      });
+    },
+    //添加浏览量
+    addReadNum() {
+      this.yxAxios
+        .post(`${this.dataUrl}/sys/yx/updateRead`, {
+          id: this.$route.query.dataId,
+        })
+        .then((res) => {
+          if(res.data.success) {
+            console.log('阅读量成功')
+          }else {
+            console.log('阅读量失败')
+          }
+        })
+    }
   },
   mounted() {
     this.getTable();
+    this.addReadNum();
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.box_pic {
-  width: 100%;
-  height: 364px;
-  background-color: #999;
+.box {
+  background-color: #f5f6fa;
+  min-height: 100vh;
 
-  img {
+  .box_pic {
     width: 100%;
-    height: 100%;
-  }
-}
-.article {
-  padding: 48px 30px;
-
-  .article_title {
-    color: #333;
-    font-size: 44px;
-    font-weight: bold;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2; //限制行数
-    overflow: hidden; //超出部分隐藏
-    text-overflow: ellipsis; //用一个省略号代替超出的内容
-  }
-  .article_time {
-    margin: 22px 0 44px;
-    color: #999;
-    font-size: 24px;
-  }
-  .article_con {
-    font-size: 32px;
+    height: 364px;
+    background-color: #999;
+
+    img {
+      width: 100%;
+      height: 100%;
+    }
   }
-}
-.videoCss {
-  width: 100vw;
 
-  video {
-    width: 100%;
+  .contextCss {
+    width: 90vw;
+    position: absolute;
+    top: 300px;
+    left: 5vw;
+    border-radius: 5vw;
+    background-color: #fff;
+    padding: 3vw;
+    box-sizing: border-box;
+    box-shadow: 1px 1px 1px 1px rgb(221, 220, 220);
+
+    .modelBox {
+      margin: 3vw;
+      display: flex;
+      justify-content: center;
+      flex-wrap: wrap;
+
+      .titleCss {
+        width: 60vw;
+        padding: 3.5vw;
+        box-sizing: border-box;
+        font-size: 4.6vw;
+        font-weight: bold;
+        background-image: url("../../assets/blue_title.png");
+        -moz-background-size: 100% 100%;
+        background-size: 100% 100%;
+        text-align: center;
+        margin-bottom: 5vw;
+      }
+
+      .typeOne {
+        margin: 5vw;
+
+        .pic {
+          width: 70vw;
+          height: 45vw;
+          margin-bottom: 5vw;
+
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+      .typeTwo {
+        margin: 5vw;
+
+        .videoTwo {
+          width: 70vw;
+          height: 45vw;
+          margin-bottom: 5vw;
+
+          video {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+      .typeThree {
+        margin: 5vw;
+
+        .contextThree {
+          width: 70vw;
+          margin-bottom: 5vw;
+          font-size: 4.5vw;
+          overflow: auto;
+
+          ::v-deep img {
+            max-width: 60vw !important;
+            height: 50vw;
+          }
+        }
+      }
+    }
   }
 }
 </style>
\ No newline at end of file
--
libgit2 0.21.0