解决冲突

TEAMModelOS.SmartClass/ClientApp/components/smart-class/headers.vue

@@ -5,9 +5,9 @@
       <ul>
         <li :class="this.$route.path ==  '/main/index' || activeIndex == 0 ? 'li-active':''" @click="handleMenuClick(0,'index')">首页</li>
         <li :class="this.$route.path ==  '/main/notice' || activeIndex == 1? 'li-active':''" @click="handleMenuClick(1,'notice')">通知公告</li>
+        <li :class="this.$route.path ==  '/main/LiveBroadcast' || activeIndex == 4? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
         <li :class="this.$route.path ==  '/main/reviewActivity' || activeIndex == 2? 'li-active':''" @click="handleMenuClick(2,'reviewActivity')">评审活动</li>
         <li :class="this.$route.path ==  '/main/PastReview' || activeIndex == 3? 'li-active':''" @click="handleMenuClick(3,'PastReview')">往届回顾</li>
-        <li :class="this.$route.path ==  '/main/LiveBroadcast' || activeIndex == 4? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
         <li :class="this.$route.path ==  '/main/Lessons' || activeIndex == 5? 'li-active':''" @click="handleMenuClick(5,'Lessons')">优课汇聚</li>
       </ul>
       <span class="btn-login" v-if="isLogin == 1" >欢迎&nbsp;{{userName}} !</span>

TEAMModelOS.SmartTeach/ClientApp/components/resource/activitycommon.vue

@@ -64,17 +64,17 @@
   }
   .banner_img {
     width: 100%;
-    height:330px;
+    height:325px;
   }
     .banner_img img {
       width:100%;
     }
-    .nav_list_box {
-      width: 100%;
-      height: 54px;
-      padding: 0px 2px 2px 2px;
-      background: #309aeb;
-    }
+  .nav_list_box {
+    width: 100%;
+    height: 54px;
+    padding: 0px 2px 2px 2px;
+    background: #00C2CB;
+  }
   .nav_list {
     width:1200px;
     height:54px;

TEAMModelOS.SmartTeach/ClientApp/components/resource/activityindex.vue

@@ -4,16 +4,12 @@
       <div class="index_top_left">
         <Carousel autoplay v-model="value2" loop>
           <CarouselItem>
-            <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_01.jpg" /></div>
+            <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_01.png" /></div>
           </CarouselItem>
           <CarouselItem>
             <div class="demo-carousel"><img src="../../assets/image/resource/activity_banner_02.png" /></div>
           </CarouselItem>
         </Carousel>
-        <span class="tit">
-          <em class="bg"></em>
-          <p>2018年创新杯首届全国信息化教学创新大赛正式启动</p>
-        </span>
       </div>
       <div class="index_top_right">
         <div class="index_top_title"><div class="right_title">活动报道</div></div>
@@ -26,19 +22,19 @@
         <div class="production_box_title"><div class="production_box_name">作品样例</div></div>
         <ul class="production_list">
           <li>
-            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="https://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/tianyu_cup/class07.jpg"></a>
+            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="../../assets/image/resource/zuopin_one.png"></a>
             <p class="f18 videoName">绿色植物的光合作用<i class="c01">生</i></p>
             <p class="f14"><a href="javascript:;" class="fr">高新区实验小学</a><a class="f14" href="javascript:;">孙云芳</a></p>
             <p><a href="javascript:;" class="videoTag style01">导学案</a><a href="javascript:;" class="videoTag style02">微课</a><a href="javascript:;" class="videoTag style03">教学设计</a><a href="javascript:;" class="videoTag style04">多媒体课件</a><a href="javascript:;" class="videoTag style05">课堂板书</a></p>
           </li>
           <li>
-            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="https://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/tianyu_cup/class08.jpg"></a>
+            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="../../assets/image/resource/zuopin_two.png"></a>
             <p class="f18 videoName">分液漏斗<i class="c02">化</i></p>
             <p class="f14"><a href="javascript:;" class="fr">成都市高新区师范银都紫藤小学</a><a class="f14" href="javascript:;">侯敏</a></p>
             <p><a href="javascript:;" class="videoTag style01">导学案</a><a href="javascript:;" class="videoTag style02">微课</a><a href="javascript:;" class="videoTag style03">教学设计</a><a href="javascript:;" class="videoTag style04">多媒体课件</a><a href="javascript:;" class="videoTag style05">课堂板书</a></p>
           </li>
           <li class="last">
-            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="https://css.huijiaoyun.com/tianyu_edu/area/edu4.0/images/tianyu_cup/class09.jpg"></a>
+            <a class="imgShow" href="/activityshow"><em class="icon_tianyu_cup i01"></em><img src="../../assets/image/resource/zuopin_three.png"></a>
             <p class="f18 videoName">记单词的方法<i class="c03">英</i></p>
             <p class="f14"><a href="javascript:;" class="fr">成都市高新区师范银都紫藤小学</a><a class="f14" href="javascript:;">何炜</a></p>
             <p><a href="javascript:;" class="videoTag style01">导学案</a><a href="javascript:;" class="videoTag style02">微课</a><a href="javascript:;" class="videoTag style03">教学设计</a><a href="javascript:;" class="videoTag style04">多媒体课件</a><a href="javascript:;" class="videoTag style05">课堂板书</a></p>

TEAMModelOS.SmartTeach/ClientApp/components/resource/exam.vue

@@ -44,7 +44,7 @@
         school:false,
         listdata: [
           {
-            "id": 1, "title": '中考专区', "num": '980', "img": require("../../assets/image/resource/exam_img_one.jpg"), data: [
+            "id": 1, "title": '中考专区', "num": '980', "img": require("../../assets/image/resource/exam_img_one.png"), data: [
               { "type": '物理', "title": '2018年成都市中考物理试卷.doc', "loocknum": '750',"url":'/details' },
               { "type": '英语', "title": '2018年成都市中考英语试卷.doc', "loocknum": '920', "url": '/details'},
               { "type": '数学', "title": '2018年成都市中考数学试卷.doc', "loocknum": '1006', "url": '/details'},
@@ -52,7 +52,7 @@
             ]
           },
           {
-            "id": 2, "title": '高考专区', "num": '1080', "img": require("../../assets/image/resource/exam_img_two.jpg"), data: [
+            "id": 2, "title": '高考专区', "num": '1080', "img": require("../../assets/image/resource/exam_img_two.png"), data: [
               { "type": '语文', "title": '2018年成都市高考语文试卷.doc', "loocknum": '1750', "url": '/details' },
               { "type": '英语', "title": '2018年成都市高考英语试卷.doc', "loocknum": '1220', "url": '/details' },
               { "type": '数学', "title": '2018年成都市高考数学试卷.doc', "loocknum": '1606', "url": '/details' },
@@ -60,7 +60,7 @@
             ]
           },
           {
-            "id": 3, "title": '优课专区', "num": '900', "img": require("../../assets/image/resource/exam_img_three.jpg"), data: [
+            "id": 3, "title": '优课专区', "num": '900', "img": require("../../assets/image/resource/exam_img_three.png"), data: [
               { "type": '优课', "title": '古诗二首', "loocknum": '350', "url":'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=8aee808f62fbe7ab016300a9e6a22e65&t=2&sessionKey=3xCsBKvbaWPKVmk1Yk9Y' },
               { "type": '优课', "title": '我的影子', "loocknum": '620', "url":'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=8aee80a562bc9be10162be0f7167109d&t=2&sessionKey=ey65FtcgEGMh4uHprmSE' },
               { "type": '优课', "title": '路程、时间与速度', "loocknum": '606', "url":'http://1s1k.eduyun.cn/portal/redesign/index/index.jsp?sdResIdCaseId=ff8080815d07057f015d07443709007a&t=2&sessionKey=wj0ZhZK7YbjgxhIBJiGw' },

TEAMModelOS.SmartTeach/ClientApp/components/resource/video.vue

@@ -30,8 +30,7 @@
       </div>
     </div>
     <div class="resource_img">
-      <img src="../../assets/image/resource/resource_img.jpg" class="banner_big" />
-      <img src="../../assets//image/resource/sk.png" class="sk" @click="skbtn" />
+      <img src="../../assets/image/resource/resource_img.png" class="banner_big" />
     </div>
   </div>
 </template>

TEAMModelOS.SmartTeach/ClientApp/view/resource/login.vue

@@ -60,7 +60,7 @@ import Header from '@/common/headers.vue'
   .login {
     width:100%;
     height:700px;
-    background:url(../../assets/image/resource/login_bg.jpg) no-repeat;
+    background:url(../../assets/image/resource/login_bg.png) no-repeat;
     background-size:cover;
   }
   .login_box {