bug fixes

src/pages/hall/components/schoolHelp.vue

@@ -94,9 +94,12 @@ export default {
   },
   methods: {
     pointScroll(){
-      $('html, body').animate({ 
-        scrollTop: $(`#point${this.$route.query.point}`).offset().top
-      }, 300)
+      console.log($(`#point${this.$route.query.point}`), '123')
+      if (this.$route.query.point !== undefined) {
+        $('html, body').animate({
+          scrollTop: $(`#point${this.$route.query.point}`).offset().top
+        }, 300)
+      }
     },
     goPage(path, n) {
       if (n) {
@@ -124,8 +127,9 @@ export default {
     }
   },
   watch: {
-    $route: {
+    '$route': {
       handler: function(val, oldVal){
+        // 'pointScroll'
         this.pointScroll()
       },
       deep: true

src/pages/hall/components/studentHelp.vue

@@ -3,12 +3,21 @@
     <div class="module1 content-max-width">
       <div class="title" id="point5">考生报名</div>
       <div class="dosc">
-        <img src="https://zws-imgs-pub.ezijing.com/static/public/0718c8ea2386caafca53c4a74abc5c69.png" alt="">
+        <img src="https://zws-imgs-pub.ezijing.com/static/public/0718c8ea2386caafca53c4a74abc5c69.png" alt="" />
         <div class="cursor" @click="goPage('https://vslc.ncb.edu.cn/child-orgInfo?orgCode=330220946', 1)"></div>
         <div class="cursor2" @click="goPage('https://vslc.ncb.edu.cn/child-orgInfo?orgCode=330220946', 1)"></div>
-        <div class="btn1" @click="goPage('https://zws-imgs-pub.ezijing.com/static/public/c1c74b9c5bf6b2f51d7b5545a9a963ef.docx', 1)"></div>
-        <div class="btn2" @click="goPage('https://zws-imgs-pub.ezijing.com/static/public/3a959d34c5af16299d64841bf5ca542c.docx', 1)"></div>
-        <div class="btn3" @click="goPage('https://zws-imgs-pub.ezijing.com/static/public/7585d6fd4f13ce6551820ae272c12ca1.docx', 1)"></div>
+        <div
+          class="btn1"
+          @click="goPage('https://zws-imgs-pub.ezijing.com/static/public/c1c74b9c5bf6b2f51d7b5545a9a963ef.docx', 1)"
+        ></div>
+        <div
+          class="btn2"
+          @click="goPage('https://zws-imgs-pub.ezijing.com/static/public/3a959d34c5af16299d64841bf5ca542c.docx', 1)"
+        ></div>
+        <div
+          class="btn3"
+          @click="goPage('https://zws-imgs-pub.ezijing.com/static/public/7585d6fd4f13ce6551820ae272c12ca1.docx', 1)"
+        ></div>
       </div>
       <!-- <div class="p">
         <span>考试报名对象：</span>
@@ -47,8 +56,10 @@
           <div class="cursor2" @click="goPage('https://vslc.ncb.edu.cn/childIndex?orgCode=330220946', 1)"></div>
           <div class="cursor3" @click="goPage('https://x.ezijing.com/news?type=0', 1)"></div>
           <div class="cursor4" @click="goPage('https://vslc.ncb.edu.cn/ncb_admin/#/login?systemType=3', 1)"></div>
-          <img src="https://zws-imgs-pub.ezijing.com/static/public/94b18249a87c56e05b620eafbcdb41c7.png" alt="">
-          <div class="all-btn mar-at16-ab36" @click="goPage('https://x-exam.ezijing.com/login/6753212536302075904', 1)">参加考试</div>
+          <img src="https://zws-imgs-pub.ezijing.com/static/public/94b18249a87c56e05b620eafbcdb41c7.png" alt="" />
+          <div class="all-btn mar-at16-ab36" @click="goPage('https://x-exam.ezijing.com/login/6753212536302075904', 1)">
+            参加考试
+          </div>
         </div>
         <!-- <div class="title" id="point1">学习课程</div>
         <div class="item flex">
@@ -94,9 +105,11 @@
     </div>
     <div class="module3 content-max-width" id="point3">
       <div class="docs">
-        <img src="https://zws-imgs-pub.ezijing.com/static/public/dfaae45f0a5ed31c281f42e6de54f706.png" alt="">
+        <img src="https://zws-imgs-pub.ezijing.com/static/public/dfaae45f0a5ed31c281f42e6de54f706.png" alt="" />
         <div class="cursor" @click="goPage('https://vslc.ncb.edu.cn/csr-scoreCertificate', 1)"></div>
-        <div id="point4" class="all-btn mar-at16" @click="goPage('https://vslc.ncb.edu.cn/csr-verification', 1)">证书查询</div>
+        <div id="point4" class="all-btn mar-at16" @click="goPage('https://vslc.ncb.edu.cn/csr-verification', 1)">
+          证书查询
+        </div>
       </div>
       <!-- <div class="title mar-t36">成绩查询</div>
       <div class="p">成绩查询请前往职业技能等级证书信息管理服务平台（网址： https://vslc.ncb.edu.cn/csr-scoreCertificate）进行查询。</div>
@@ -114,6 +127,7 @@ import action from '@action'
 export default {
   mounted() {
     // this.newsList()
+    console.log(this.$route.query.point, 'this.$route.query.point')
     if (this.$route.query.point) {
       this.pointScroll()
     }
@@ -125,10 +139,15 @@ export default {
     }
   },
   methods: {
-    pointScroll(){
-      $('html, body').animate({ 
-        scrollTop: $(`#point${this.$route.query.point}`).offset().top
-      }, 500);
+    pointScroll() {
+      if (this.$route.query.point !== undefined) {
+        $('html, body').animate(
+          {
+            scrollTop: $(`#point${this.$route.query.point}`).offset().top
+          },
+          500
+        )
+      }
     },
     goPage(path, n) {
       if (n) {
@@ -157,7 +176,9 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(val, oldVal){
+      handler: function(val, oldVal) {
+        // 'pointScroll'
+
         this.pointScroll()
       },
       deep: true
@@ -166,21 +187,21 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.content-max-width{
+.content-max-width {
   width: 1200px;
   margin: 0 auto;
 }
-.candida-box{
-  .module1{
+.candida-box {
+  .module1 {
     padding-top: 37px;
     position: relative;
-    .title{
+    .title {
       font-size: 24px;
       font-weight: bold;
       color: #333333;
       line-height: 33px;
     }
-    .dosc{
+    .dosc {
       padding-bottom: 32px;
       padding-top: 25px;
       position: relative;
@@ -188,7 +209,7 @@ export default {
       color: #666666;
       line-height: 36px;
       margin-top: 16px;
-      .cursor{
+      .cursor {
         position: absolute;
         bottom: 200px;
         right: 300px;
@@ -197,7 +218,7 @@ export default {
         // background: rgba(0,0,0,0.3);
         cursor: pointer;
       }
-      .cursor2{
+      .cursor2 {
         position: absolute;
         bottom: 140px;
         right: 300px;
@@ -206,7 +227,7 @@ export default {
         // background: rgba(0,0,0,0.3);
         cursor: pointer;
       }
-      .btn1{
+      .btn1 {
         position: absolute;
         top: 250px;
         left: 170px;
@@ -215,7 +236,7 @@ export default {
         // background: rgba(0,0,0,0.3);
         cursor: pointer;
       }
-      .btn2{
+      .btn2 {
         position: absolute;
         top: 285px;
         left: 170px;
@@ -224,7 +245,7 @@ export default {
         // background: rgba(0,0,0,0.3);
         cursor: pointer;
       }
-      .btn3{
+      .btn3 {
         position: absolute;
         top: 325px;
         left: 170px;
@@ -234,26 +255,26 @@ export default {
         cursor: pointer;
       }
     }
-    .p{
+    .p {
       font-size: 18px;
       font-weight: bold;
       color: #666666;
       line-height: 30px;
       margin-top: 16px;
-      span{
+      span {
         font-size: 18px;
         font-weight: bold;
         color: #222222;
         line-height: 30px;
       }
     }
-    .p2{
+    .p2 {
       font-size: 18px;
       font-weight: bold;
       color: #666666;
       line-height: 30px;
       margin-top: 16px;
-      span{
+      span {
         font-size: 18px;
         font-weight: bold;
         color: #222222;
@@ -262,48 +283,48 @@ export default {
       display: flex;
       margin-top: 16px;
     }
-    .bm-btn{
+    .bm-btn {
       cursor: pointer;
       width: 104px;
       height: 40px;
-      background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #C01540 100%);
+      background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #c01540 100%);
       border-radius: 4px;
       font-size: 14px;
       font-weight: bold;
-      color: #FFFFFF;
+      color: #ffffff;
       line-height: 40px;
       text-align: center;
       margin-left: 90px;
       margin-top: 16px;
     }
-    .process{
+    .process {
       display: flex;
       align-items: center;
-      
-      .order{
-        color: #CCCCCC;
+
+      .order {
+        color: #cccccc;
         margin-right: 10px;
       }
-      .text{
+      .text {
         font-size: 18px;
         color: #222222;
         margin-right: 10px;
       }
-      .border{
+      .border {
         width: 100px;
         height: 1px;
         background: #ccc;
         margin-right: 10px;
       }
     }
-    .padd-b-36{
+    .padd-b-36 {
       padding-bottom: 36px;
     }
   }
-  .module2{
+  .module2 {
     background: #fff;
     padding: 24px 0 29px;
-    .dosc{
+    .dosc {
       // padding-bottom: 32px;
       // padding-top: 25px;
       position: relative;
@@ -311,7 +332,7 @@ export default {
       // color: #666666;
       // line-height: 36px;
       // margin-top: 16px;
-      .cursor{
+      .cursor {
         position: absolute;
         top: 660px;
         left: 555px;
@@ -320,7 +341,7 @@ export default {
         // background: rgba(0,0,0,0.1);
         cursor: pointer;
       }
-      .cursor2{
+      .cursor2 {
         position: absolute;
         top: 1050px;
         left: 25px;
@@ -329,7 +350,7 @@ export default {
         // background: rgba(0,0,0,0.1);
         cursor: pointer;
       }
-      .cursor3{
+      .cursor3 {
         position: absolute;
         top: 1125px;
         left: 25px;
@@ -338,7 +359,7 @@ export default {
         // background: rgba(0,0,0,0.1);
         cursor: pointer;
       }
-      .cursor4{
+      .cursor4 {
         position: absolute;
         top: 1000px;
         left: 330px;
@@ -348,36 +369,36 @@ export default {
         cursor: pointer;
       }
     }
-    .title{
+    .title {
       font-size: 24px;
       font-weight: bold;
       color: #333333;
       line-height: 33px;
       margin-bottom: 25px;
     }
-    .process{
+    .process {
       display: flex;
     }
-    .item{
-      &.flex{
+    .item {
+      &.flex {
         display: flex;
       }
-      .img{
+      .img {
         width: 326px;
         height: 180px;
       }
-      .content-text{
+      .content-text {
         margin-left: auto;
         width: 793px;
-        .text{
+        .text {
           color: #666666;
           font-size: 18px;
           line-height: 36px;
         }
-        .run-btn{
+        .run-btn {
           width: 104px;
           height: 40px;
-          background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #C01540 100%);
+          background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #c01540 100%);
           border-radius: 4px;
           line-height: 40px;
           text-align: center;
@@ -390,48 +411,48 @@ export default {
         }
       }
     }
-    .process{
+    .process {
       display: flex;
       justify-content: center;
-      .item{
-        .icon-box{
+      .item {
+        .icon-box {
           display: flex;
           align-items: center;
           justify-content: center;
           width: 74px;
           height: 74px;
-          background: #FFFFFF;
+          background: #ffffff;
           box-shadow: 0px 1px 4px 0px rgba(153, 153, 153, 0.3);
           border-radius: 50%;
           margin: 0 auto;
-          img{
+          img {
             width: 40px;
             display: block;
           }
-        }  
-        .name{
+        }
+        .name {
           font-size: 18px;
           font-weight: bold;
           color: #222222;
           line-height: 25px;
           margin-top: 20px;
-          &.mar-10{
+          &.mar-10 {
             margin-top: 10px;
           }
         }
       }
-      .border{
+      .border {
         width: 120px;
         height: 2px;
-        background: #CCCCCC;
+        background: #cccccc;
         border-radius: 1px;
         margin: 36px 30px 0;
       }
     }
   }
-  .module3{
+  .module3 {
     padding-bottom: 36px;
-    .docs{
+    .docs {
       // padding-bottom: 32px;
       padding-top: 36px;
       position: relative;
@@ -439,7 +460,7 @@ export default {
       // color: #666666;
       // line-height: 36px;
       // margin-top: 16px;
-      .cursor{
+      .cursor {
         position: absolute;
         top: 405px;
         left: 550px;
@@ -449,51 +470,51 @@ export default {
         cursor: pointer;
       }
     }
-    .title{
+    .title {
       font-size: 24px;
       font-weight: bold;
       color: #333333;
       line-height: 33px;
       margin-bottom: 16px;
     }
-    .p{
+    .p {
       font-size: 18px;
       color: #666666;
       line-height: 36px;
     }
-    .img1{
+    .img1 {
       width: 600px;
       display: block;
       margin: 16px auto;
     }
-    .img2{
+    .img2 {
       width: 609px;
       display: block;
       margin: 16px auto;
     }
-    .btn{
+    .btn {
       cursor: pointer;
       margin: 0 auto;
       width: 104px;
       height: 40px;
-      background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #C01540 100%);
+      background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #c01540 100%);
       border-radius: 4px;
       font-size: 14px;
       text-align: center;
       font-weight: bold;
-      color: #FFFFFF;
+      color: #ffffff;
       line-height: 40px;
     }
   }
 }
-.mar-t36{
+.mar-t36 {
   margin-top: 36px;
 }
-.all-btn{
+.all-btn {
   width: 104px;
   // padding: 0 24px;
   height: 40px;
-  background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #C01540 100%);
+  background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #c01540 100%);
   border-radius: 4px;
   line-height: 40px;
   text-align: center;
@@ -504,10 +525,10 @@ export default {
   cursor: pointer;
   margin-bottom: 36px;
   margin: 0 auto;
-  &.mar-at16-ab36{
+  &.mar-at16-ab36 {
     margin: 16px 0 36px 528px;
   }
-  &.mar-at16{
+  &.mar-at16 {
     margin: 16px 0 36px 528px;
   }
 }

src/pages/hall/components/teacherHelp.vue

 <template>
   <div class="teacher-box">
     <div class="module1 content-max-width" id="pointt0">
-      <img src="https://zws-imgs-pub.ezijing.com/static/public/895216245db6e0fa6551d61a3a5de958.png" alt="">
-      <img class="mar-t16" src="https://zws-imgs-pub.ezijing.com/static/public/1b9f08b595bc674a2f26f58a14b7c974.png" alt="">
+      <img src="https://zws-imgs-pub.ezijing.com/static/public/895216245db6e0fa6551d61a3a5de958.png" alt="" />
+      <img
+        class="mar-t16"
+        src="https://zws-imgs-pub.ezijing.com/static/public/1b9f08b595bc674a2f26f58a14b7c974.png"
+        alt=""
+      />
       <!-- <div class="title">师资培训报名</div>
       <div class="p">紫荆教育计划2021年共开展9期针对“金融产品数字化营销职业技能等级证书”的师资培训，具体安排如下：</div>
       <img style="width:30%;display:block;margin:0 auto;" src="https://zws-imgs-pub.ezijing.com/static/public/50ce208136ab7e9c023450940d94fb14.png" alt="">
@@ -40,13 +44,13 @@
         <div class="p1">
           <span>培训地点：</span>
           <div class="color-c">
-            深圳 
+            深圳
           </div>
         </div>
         <div class="p1">
           <span>培训起始时间：</span>
           <div class="color-c">
-            2021年3月22日-26日（3月21日报到） 
+            2021年3月22日-26日（3月21日报到）
           </div>
         </div>
         <div class="p1">
@@ -58,7 +62,7 @@
       </div> -->
       <div class="title mar-t36-b26" id="pointt1">师资学习平台</div>
       <div class="item">
-        <img src="https://zws-imgs-pub.ezijing.com/static/public/0e01f2de1b44db0e612e1638cc087517.png" alt="">
+        <img src="https://zws-imgs-pub.ezijing.com/static/public/0e01f2de1b44db0e612e1638cc087517.png" alt="" />
         <div class="content">
           <div class="text">
             紫荆教育为师生精心打造综合一体化学习平台，可实现考核体系的标准化，数据资源的统一化，师资学习的多元化，以及学习管理的系统化，最终形成学、练、训、考、评、管一体的数字化营销学习平台。
@@ -77,7 +81,11 @@
         </div> -->
         <div class="title mar-t36-b16" id="pointt2">授权师资名单</div>
         <div class="cert-box">
-          <img style="margin: 0 16px" src="https://zws-imgs-pub.ezijing.com/static/public/0b0412a8f5673b0bde98a2c57949f641.png" alt="">
+          <img
+            style="margin: 0 16px"
+            src="https://zws-imgs-pub.ezijing.com/static/public/0b0412a8f5673b0bde98a2c57949f641.png"
+            alt=""
+          />
           <div class="content">
             <div class="text">
               紫荆教育1+X金融产品数字化营销职业技能等级证书师资培训为期3天，培训结束后一周内，公布授权师资名单。随后将结业证书邮寄到老师所在院校。
@@ -92,7 +100,7 @@
           <div class="title">开班授课</div>
           <div class="item">
             <div class="item">
-              <img src="https://zws-imgs-pub.ezijing.com/static/public/4da0818309b5b8f6ff494ae428dd24e0.png" alt="">
+              <img src="https://zws-imgs-pub.ezijing.com/static/public/4da0818309b5b8f6ff494ae428dd24e0.png" alt="" />
               <div class="content">
                 <div class="text">
                   获得培训资质后，老师可使用紫荆教育学习系统的辅助教学功能，完成对学生的授课教学。学习系统支持视频课程教学播放、PPT课程讲义播放、管理班级学员和开班课、了解进度等功能。
@@ -123,10 +131,15 @@ export default {
     }
   },
   methods: {
-    pointScroll(){
-      $('html, body').animate({ 
-        scrollTop: $(`#point${this.$route.query.point}`).offset().top
-      }, 500)
+    pointScroll() {
+      if (this.$route.query.point !== undefined) {
+        $('html, body').animate(
+          {
+            scrollTop: $(`#point${this.$route.query.point}`).offset().top
+          },
+          500
+        )
+      }
     },
     goPage(path, n) {
       if (n) {
@@ -156,7 +169,8 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(val, oldVal){
+      handler: function(val, oldVal) {
+        // 'pointScroll'
         this.pointScroll()
       },
       deep: true
@@ -165,14 +179,14 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.content-max-width{
+.content-max-width {
   width: 1200px;
   margin: 0 auto;
 }
-.all-btn{
+.all-btn {
   width: 104px;
   height: 40px;
-  background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #C01540 100%);
+  background: linear-gradient(315deg, rgba(225, 47, 116, 0.83) 0%, #c01540 100%);
   border-radius: 4px;
   text-align: center;
   line-height: 40px;
@@ -180,150 +194,150 @@ export default {
   font-size: 14px;
   cursor: pointer;
 }
-.mar-t16{
+.mar-t16 {
   margin-top: 16px;
 }
-.teacher-box{
-  .module1{
+.teacher-box {
+  .module1 {
     padding: 36px 0;
-    .new-liu{
+    .new-liu {
       padding-top: 16px;
-      .title{
+      .title {
         font-size: 18px;
         color: rgba(63, 63, 63, 1);
       }
-      .new-p{
+      .new-p {
         line-height: 36px;
         color: rgba(157, 157, 157, 1);
         font-size: 18px;
-        span{
+        span {
           color: rgba(0, 133, 232, 1);
           cursor: pointer;
         }
       }
     }
-    .title{
+    .title {
       font-weight: bold;
       color: #333333;
       line-height: 33px;
       font-size: 24px;
-      &.mar-t36-b26{
+      &.mar-t36-b26 {
         margin: 36px 0 26px;
       }
     }
-    .p{
+    .p {
       font-size: 18px;
       color: #666666;
       line-height: 36px;
       margin: 16px 0;
     }
-    .p1{
+    .p1 {
       margin: 16px 0;
       display: flex;
       align-items: center;
-      .color-c{
+      .color-c {
         line-height: 30px;
         color: #666666;
         font-size: 18px;
       }
-      span{
+      span {
         font-size: 18px;
         font-weight: bold;
         color: #222222;
         line-height: 30px;
       }
     }
-    .item{
+    .item {
       display: flex;
-      img{
+      img {
         width: 326px;
         height: 180px;
       }
-      .content{
+      .content {
         margin-left: auto;
         width: 790px;
-        .text{
+        .text {
           font-size: 18px;
           color: #666666;
           line-height: 36px;
         }
-        .all-btn{
+        .all-btn {
           margin-top: 16px;
         }
       }
     }
   }
-  .module2{
+  .module2 {
     background: #fff;
     padding: 36px 0;
-    .title{
+    .title {
       font-size: 24px;
       font-weight: bold;
       color: #333333;
       line-height: 33px;
-      &.mar-t36-b16{
+      &.mar-t36-b16 {
         margin: 0px 0 16px;
       }
     }
-    .p{
+    .p {
       font-size: 18px;
       color: #666666;
       line-height: 36px;
       margin: 16px 0;
     }
-    .p1{
+    .p1 {
       margin: 16px 0;
       display: flex;
       align-items: center;
-      .color-c{
+      .color-c {
         line-height: 30px;
         color: #666666;
         font-size: 18px;
       }
-      span{
+      span {
         font-size: 18px;
         font-weight: bold;
         color: #222222;
         line-height: 30px;
       }
     }
-    .cert-box{
+    .cert-box {
       display: flex;
       align-items: center;
-      img{
+      img {
         // width: 230px;
         // height: 145px;
       }
-      .text{
+      .text {
         font-size: 18px;
         color: #666666;
         margin-left: 80px;
       }
     }
   }
-  .module3{
+  .module3 {
     padding: 72px 0;
-    .title{
+    .title {
       font-size: 24px;
       font-weight: bold;
       color: #333333;
       line-height: 33px;
     }
-    .item{
+    .item {
       margin-top: 20px;
       display: flex;
-      img{
+      img {
         width: 326px;
         height: 180px;
       }
-      .content{
+      .content {
         margin-left: 76px;
-        .text{
+        .text {
           font-size: 18px;
           color: #666666;
           line-height: 36px;
         }
-        .all-btn{
+        .all-btn {
           margin-top: 16px;
         }
       }

src/pages/hall/index.vue

@@ -101,9 +101,9 @@
         </ul>
       </div>
     </div>
-    <student-help v-show="offsetTabIndex == 0"></student-help>
-    <teacher-help v-show="offsetTabIndex == 1"></teacher-help>
-    <school-help v-show="offsetTabIndex == 2"></school-help>
+    <student-help ref="help" v-show="offsetTabIndex == 0"></student-help>
+    <teacher-help ref="help" v-show="offsetTabIndex == 1"></teacher-help>
+    <school-help ref="help" v-show="offsetTabIndex == 2"></school-help>
     <vue-passport ref="passport" @ready="onReady" :options="options"></vue-passport>
   </div>
 </template>
@@ -346,6 +346,7 @@ export default {
         this.$router.push({
           path: path
         })
+        this.$refs.help.pointScroll()
       }
     }
   },

src/router/index.js

@@ -8,7 +8,11 @@ export default new Router({
   routes,
   mode: 'history', // 还有一个 hash 默认
   fallback: true, // 浏览器不支持 history时，自动改成 hash方式
-  scrollBehavior (to, from, savedPosition) {
+  scrollBehavior(to, from, savedPosition) {
     return { x: 0, y: 0 }
   }
 })
+const originalPush = Router.prototype.push
+Router.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => err)
+}