0617

src/common/components/Header.vue

@@ -145,8 +145,15 @@ export default {
       }
     },
     doLogout: function () {
-      localStorage.clear()
+      var self = this
-      this.checkLogin()
+      this.$layer.open({
+        content: '确认退出登录吗？',
+        yes: function () {
+          sessionStorage.clear()
+          self.checkLogin()
+          self.$layer.closeAll()
+        }
+      })
     }
   },
   mounted: function () {

src/pages/ArtTrain/ArtTrain.vue

@@ -19,7 +19,7 @@
             </div>
           </div>
           <div class="character-right">
-            <ul>
+            <ul v-if="list.innerList.length > 0">
               <li v-for="(inner,idx) in list.innerList" :key="idx" @click="goDetail(inner.templateRecordUrl)">
                 <div class="recommend-img">
                   <img :src="'http://192.168.0.104:8082/news/route/file/downloadfile/false/' + inner.newsContentCoverList" alt="">
@@ -34,12 +34,12 @@
                 </div>
               </li>
             </ul>
+            <div class="no-data" v-else>
+              <img src="@/assets/images/no-data.png" alt="">
+            </div>
           </div>
         </div>
       </div>
-      <div class="no-data" v-else>
-        <img src="@/assets/images/no-data.png" alt="">
-      </div>
       <Footer></Footer>
     </div>
 </template>

src/pages/Broadcast/Broadcast.vue

@@ -177,7 +177,9 @@ export default {
       margin-right 20px
       margin-bottom 20px
       cursor pointer
-      border solid 1px #dedede
+      box-shadow:0px 0px 10px 0px rgba(176,176,176,0.3);
+      &:hover
+        box-shadow:0px 0px 20px 0px rgba(176,176,176,0.9);
       .broadcast-img
         width 100%
         height 185px

src/pages/CultureActivity/CultureActivity.vue

@@ -9,7 +9,7 @@
       <div class="select">
         <div class="select-container">
           <div class="select-line">
-            <span>活动类别></span>
+            <span>活动类别> </span>
             <button :class="{active: page.activityType == ''}" @click="loadAll">全部</button>
             <button v-for="(btn,idx) in typeList" :key="idx" :class="{active: page.activityType == btn.dictionaryId}" @click="changeTab(btn.dictionaryId)">{{btn.dictionaryName}}</button>
           </div>
@@ -175,6 +175,8 @@ export default {
       font-size 14px
       span
         color #565656
+        display inline-block
+        margin-right 5px
       button
         width 80px
         height 30px
@@ -197,19 +199,22 @@ export default {
   margin 25px auto
   min-height 400px
   .service-container
-    overflow hidden
+    &:after
+      content: ''
+      display block
+      clear both
     .service-list
       float left
       width 280px
       box-sizing border-box
-      border 1px solid #a8a8a8
+      box-shadow:0px 0px 10px 0px rgba(176,176,176,0.3);
       margin-right 26px
       cursor pointer
       margin-bottom 26px
       &:nth-child(4n)
         margin-right 0
       &:hover
-        background #eee
+        box-shadow:0px 0px 20px 0px rgba(176,176,176,0.9);
       .service-img-box
         width 100%
         height 185px

src/pages/CultureActivityDetail/CultureActivityDetail.vue

@@ -24,8 +24,24 @@
             <p>报名时间：{{activityDetail.activityApplyStartTime}}至{{activityDetail.activityApplyEndTime}}</p>
             <p>活动规模: 总数: {{activityDetail.activityUserNum}} 已报名: {{activityDetail.enrollCount}}</p>
             <p>活动地址：{{activityDetail.activityAddress}}</p>
-            <button v-if="activityDetail.isEnroll == ''">报名</button>
+            <div v-if="activityDetail.activityState == 3">
-            <button v-else>已报名</button>
+              <div v-if="activityDetail.isEnroll == ''">
+                <div class="sign-info">
+                  姓　名：<input type="text" placeholder="请输入姓名" v-model="signInfo.userName">
+                </div>
+                <div class="sign-info">
+                  身份证：<input type="text" placeholder="请输入身份证码" v-model="signInfo.userIdCard">
+                </div>
+                <div class="sign-info">
+                  手机号：<input type="text" placeholder="请输入手机号" v-model="signInfo.userPhone ">
+                  验证码：<input type="text" placeholder="请输入验证码" class="yzm" v-model="signInfo.code">
+                  <button class="get-yzm" v-if="restTime == 0" @click="getCode">获取验证码</button>
+                  <button class="got-yzm" v-else>{{restTime}}秒后重新获取</button>
+                </div>
+                <button @click="signActivity">报名</button>
+              </div>
+              <button v-else class="signed">已报名</button>
+            </div>
           </div>
           <!--<div class="activity-btn">-->
             <!--<button v-if="!activityData.isCollect">收藏</button>-->
@@ -79,17 +95,28 @@ export default {
   },
   data () {
     return {
+      token: sessionStorage.getItem('token'),
       swiperOptions: {
         // pagination: '.swiper-pagination',
         loop: true,
         autoplay: 3000
       },
-      activityDetail: {}
+      activityDetail: {},
+      restTime: 0,
+      signInfo: {
+        userPhone: '',
+        userName: '',
+        userIdCard: '',
+        activityId: '',
+        code: ''
+      }
     }
   },
   computed: {
     signState: function () {
-      if (this.activityDetail.activityState === '3') {
+      if (this.activityDetail.activityState === '2') {
+        return '已发布 '
+      } else if (this.activityDetail.activityState === '3') {
         return '报名中'
       } else if (this.activityDetail.activityState === '4') {
         return '报名人数已满'
@@ -106,22 +133,81 @@ export default {
     getActivityDetail: function () {
       var self = this
       axios.get('http://192.168.0.111:8080/culturalactivity/app/activitylibrary/getactivitylibrarybyidrelease/' + self.$route.params.id).then(function (res) {
-        if (res.data.activityImage.indexOf(',') !== -1) {
+        res.data.activityImage = res.data.activityImage.split(',')
-          res.data.activityImage = res.data.activityImage.split(',')
-        } else {
-          res.data.activityImage = [res.data.activityImage]
-        }
         self.activityDetail = res.data
+        console.log(self.activityDetail)
       })
+    },
+    getActivityDetailToken: function () {
+      var self = this
+      axios.get('http://192.168.0.111:8080/culturalactivity/app/activitylibrary/getactivitylibrarybyid/' + self.$route.params.id, {
+        headers: {
+          token: self.token
+        }
+      }).then(function (res) {
+        console.log(res)
+        res.data.activityImage = res.data.activityImage.split(',')
+        self.activityDetail = res.data
+        console.log(self.activityDetail)
+      })
+    },
+    signActivity: function () {
+      var self = this
+      if (self.token) {
+        self.signInfo.activityId = self.activityDetail.activityLibraryId
+        console.log(self.signInfo)
+        axios.post('http://192.168.0.111:8080/culturalactivity/app/activityuserapply/saveactivityuserapplyrelease', self.signInfo, {
+          headers: {
+            token: self.token
+          }
+        }).then(function (res) {
+          console.log(res)
+          if (res.status === 200) {
+            self.$layer.msg('报名成功！')
+            setTimeout(function () {
+              location.reload()
+            }, 1500)
+          }
+        })
+      } else {
+        self.$layer.msg('请先登录！')
+        setTimeout(function () {
+          self.$router.push('/login')
+        }, 1500)
+      }
+    },
+    getCode: function () {
+      var self = this
+      if (self.signInfo.userPhone) {
+        axios.get('http://192.168.0.111:8080/culturalactivity/app/activityuserapply/saveSmsCoderelease/' + self.signInfo.userPhone).then(function (res) {
+          console.log(res)
+          if (res.status === 200) {
+            self.restTime = 120
+            var timer = setInterval(function () {
+              self.restTime--
+              if (self.restTime === 0) {
+                clearInterval(timer)
+              }
+            }, 1000)
+          }
+        })
+      } else {
+        self.$layer.msg('请先输入手机号')
+      }
     }
   },
   mounted () {
-    this.getActivityDetail()
+    if (this.token) {
+      this.getActivityDetailToken()
+    } else {
+      this.getActivityDetail()
+    }
   }
 }
 </script>
 
 <style lang="stylus" rel="stylesheet/stylus" scoped>
+@import "~styles/public.styl"
 .location
   background #e5e5e5
   line-height 30px
@@ -145,7 +231,6 @@ export default {
         width 390px
         height 260px
     .activity-detail
-      width 480px
       float left
       margin 0 10px
       h3
@@ -166,12 +251,16 @@ export default {
         text-overflow: ellipsis
       button
         border none
-        background #01a9f8
+        background $main-color
         width 140px
         height 35px
         border-radius 4px
         color #fff
         margin-top 12px
+        outline none
+        cursor pointer
+        &.signed
+          background #DEDEDE
     .activity-btn
       float right
       button
@@ -194,7 +283,7 @@ export default {
         text-indent 40px
     .activity-part
       padding-left 15px
-      border-left 2px solid #01a9f8
+      border-left 2px solid $main-color
       font-size 22px
       font-weight normal
       margin-bottom 10px
@@ -225,7 +314,7 @@ export default {
           height: 80px
           cursor pointer
           float left
-          background #01a9f8
+          background $main-color
           color #fff
           border-radius 4px
           font-size 20px
@@ -261,4 +350,26 @@ export default {
             span
               font-size 12px
               color #a8a8a8
+.sign-info
+  font-size 14px
+  color #565656
+  margin-top 5px
+  input
+    width 228px
+    height 25px
+    border 1px solid #dedede
+    border-radius 3px
+    padding 0 5px
+    box-sizing border-box
+    font-family zangwen
+    margin-right 30px
+    &.yzm
+      width 120px
+      margin-right 0
+  .get-yzm, .got-yzm
+    width 105px !important
+    height 25px !important
+    margin 0 !important
+  .got-yzm
+    background #DEDEDE !important
 </style>

src/pages/CultureDynamics/CultureDynamics.vue

@@ -17,9 +17,9 @@
     </div>
     <div class="dynamics">
       <div class="dynamics-left">
-        <div class="dynamics-title">
+        <!--<div class="dynamics-title">-->
-          <span>文化动态</span>
+          <!--<span>文化动态</span>-->
-        </div>
+        <!--</div>-->
         <div class="dynamics-list">
           <ul v-if="hasData">
             <li v-for="(list,idx) in requestList" :key="idx" @click="goDetail(list.templateRecordUrl)">
@@ -29,7 +29,7 @@
               <div class="dynamics-list-right">
                 <h3>{{list.newsContentTitle}}</h3>
                 <span>{{list.newsContentPublishTime}}</span>
-                <button>MORE></button>
+                <!--<button>MORE></button>-->
               </div>
             </li>
           </ul>
@@ -204,71 +204,68 @@ export default {
   width 1200px
   margin 20px auto
   overflow hidden
-  .dynamics-title
+  .dynamics-list
-    line-height 50px
+    min-height 500px
-    border-bottom 1px solid #dcdcdc
+    ul
-    span
+      li
-      display inline-block
+        width: 280px;
-      border-bottom 2px solid $main-color
+        box-shadow: 0px 0px 10px 0px rgba(176,176,176,0.3);
-      font-size 18px
+        box-sizing: border-box;
-      color $main-color
+        float: left;
-  .dynamics-left
+        margin-right: 25px;
-    float left
+        margin-bottom: 25px;
-    width 730px
+        cursor: pointer;
-    .dynamics-list
+        &:nth-child(4n)
-      min-height 500px
+          margin-right 0
-      ul
+        &:hover
-        li
+          box-shadow 0px 0px 20px 0px rgba(176,176,176,0.9)
-          padding 20px 0
+        .dynamics-list-left
-          overflow hidden
+          width 100%
-          cursor pointer
+          height 185px
-          border-bottom solid 1px rgba(63, 63, 63, 0.17)
+          img
-          .dynamics-list-left
+            width 100%
-            float left
+            height 100%
-            width 240px
+        .dynamics-list-right
-            margin-right 10px
+          padding 10px 20px
-            img
+          text-align center
-              width 240px
+          h3
-              height 160px
+            font-size 18px
-          .dynamics-list-right
+            color #565656
-            float right
+            white-space nowrap
-            width 480px
+            overflow hidden
-            h3
+            text-overflow: ellipsis
-              font-size 18px
+          p
-              color #565656
+            font-size 14px
-              white-space nowrap
+            color #565656
+            line-height 25px
+            &.desc
+              height 50px
               overflow hidden
-              text-overflow: ellipsis
+          span
-              margin-bottom 10px
+            display block
-            p
+            font-size 14px
-              font-size 14px
+            color #a8a8a8
-              color #565656
+            line-height 25px
-              line-height 25px
+          button
-              &.desc
+            width 70px
-                height 50px
+            height: 25px
-                overflow hidden
+            text-align center
-            span
+            line-height 25px
-              display block
+            border none
-              font-size 14px
+            outline none
-              color #a8a8a8
+            background $main-color
-              line-height 25px
+            color #fff
-              margin 10px 0
+            font-size 12px
-            button
+            border-radius 4px
-              width 70px
+    &:after
-              height: 25px
+      content ''
-              text-align center
+      display block
-              line-height 25px
+      clear both
-              border none
+    .no-data
-              outline none
+      padding 80px 0
-              background $main-color
+      text-align center
-              color #fff
+      img
-              font-size 12px
+        width 200px
-              border-radius 4px
-      .no-data
-        padding 80px 0
-        text-align center
-        img
-          width 200px
 .pager
   width 1200px
   margin 20px auto

src/pages/Exhibition/Exhibition.vue

@@ -167,7 +167,7 @@ export default {
     overflow hidden
     li
       width 280px
-      border 1px solid #a8a8a8
+      box-shadow 0px 0px 10px 0px rgba(176,176,176,0.3)
       box-sizing border-box
       float left
       margin-right 25px
@@ -175,6 +175,8 @@ export default {
       cursor pointer
       &:nth-child(4n)
         margin-right 0
+      &:hover
+        box-shadow 0px 0px 20px 0px rgba(176,176,176,0.9)
       .exhibition-img
         width 100%
         height 185px

src/pages/Index/components/DigitalResource.vue

@@ -3,7 +3,7 @@
       <div class="digital-title">
         <span class="part-title">民间文学</span>
         <i class="english-title">Folk Literature</i>
-        <router-link to="/" class="more">MORE>></router-link>
+        <router-link to="/resource" class="more">MORE>></router-link>
       </div>
       <div class="digital-swiper">
         <swiper :options="swiperOption">

src/pages/Index/components/IndexService.vue

@@ -3,7 +3,7 @@
       <div class="service-title">
         <span class="part-title">文化活动</span>
         <i class="english-title">Cultural Activity</i>
-        <router-link to="/" class="more">MORE>></router-link>
+        <router-link to="/cultureActivity" class="more">MORE>></router-link>
       </div>
       <div class="service-content">
         <ul class="service-container">
@@ -70,19 +70,22 @@ export default {
   .service-content
     margin-top 15px
     .service-container
-      overflow hidden
+      &:after
+        display block
+        content: ''
+        clear both
       .service-list
         float left
         width 280px
         box-sizing border-box
-        border 1px solid #a8a8a8
+        box-shadow:0px 0px 10px 0px rgba(176,176,176,0.3);
         margin-right 26px
         cursor pointer
         margin-bottom 26px
         &:nth-child(4n)
           margin-right 0
         &:hover
-          background #eee
+          box-shadow:0px 0px 20px 0px rgba(176,176,176,0.9);
         .service-img-box
           width 100%
           height 0

src/pages/Index/components/IndexVideo.vue

@@ -64,15 +64,20 @@ export default {
     width 1200px
     margin 20px auto
     ul
-      overflow hidden
+      &:after
+        content: ''
+        display block
+        clear both
       li
         width 280px
-        border 1px solid #a8a8a8
+        box-shadow:0px 0px 10px 0px rgba(176,176,176,0.3);
         box-sizing border-box
         float left
         margin-right 25px
         margin-bottom 25px
         cursor pointer
+        &:hover
+          box-shadow:0px 0px 20px 0px rgba(176,176,176,0.9);
         &:nth-child(4n)
           margin-right 0
         .exhibition-img

src/pages/IntangibleHeritage/IntangibleHeritage.vue

@@ -22,10 +22,11 @@
                 <th width="8%">序号</th>
                 <th width="8%">编号</th>
                 <th width="20%">名称</th>
-                <th width="17%">公布时间</th>
+                <th width="10%">公布时间</th>
                 <th width="10%">类型</th>
-                <th width="17%">申报地区或单位</th>
+                <th width="15%">申报地区或单位</th>
                 <th width="20%">保护单位</th>
+                <th width="9%">操作</th>
               </tr>
             </thead>
             <tbody>
@@ -37,13 +38,14 @@
                 <td>{{list.libraryTypeValue}}</td>
                 <td>{{list.libraryArea}}</td>
                 <td>{{list.libraryAuthor}}</td>
+                <td><router-link :to="{path: '/intangibleHeritageDetail/' + list.intangibleLibraryId}" class="go-detail">查看详情</router-link></td>
               </tr>
             </tbody>
           </table>
         </div>
         <div class="pager">
-          <span>首页</span>
+          <span @click="paging(1)">首页</span>
-          <span>上一页</span>
+          <span @click="paging(page.page - 1)" v-if="page.page > 1">上一页</span>
           <ul v-if="page.totalPage > 0 && page.totalPage <= 5">
             <li v-for="cpage in page.totalPage" :class="{'active': page.currentPage == cpage}" :key="cpage">
               {{cpage}}
@@ -60,11 +62,11 @@
               {{page.currentPage - (3 - cpage)}}
             </li>
           </ul>
-          <span>下一页</span>
+          <span @click="paging(page.page + 1)" v-if="page.page < page.totalPage">下一页</span>
-          <span>尾页</span>
+          <span @click="paging(page.totalPage)">尾页</span>
-          <input type="text" v-model="page.currentPage">
+          <!--<input type="text" v-model="page.currentPage">-->
-          <i>/{{page.totalPage}}页</i>
+          <!--<i>/{{page.totalPage}}页</i>-->
-          <button v-if="showJumpBtn">跳转</button>
+          <!--<button v-if="showJumpBtn">跳转</button>-->
         </div>
       </div>
       <Footer></Footer>
@@ -165,6 +167,12 @@ export default {
         overflow hidden
         text-overflow ellipsis
         padding 0 5px
+        .go-detail
+          display inline-block
+          padding 5px
+          background $main-color
+          color #fff
+          border-radius 3px
   .pager
     width 1200px
     margin 20px auto
@@ -216,7 +224,7 @@ export default {
     button
       border none
       outline none
-      background #4792C2
+      background $main-color
       width 50px
       height 25px
       vertical-align middle

src/pages/PersonCenter/PersonCenter.vue

@@ -11,6 +11,7 @@
               <li :class="{active: tab == 4}" @click="changeTab(4)">团队注册</li>
               <li :class="{active: tab == 5}" @click="changeTab(5)">我的团队</li>
               <li :class="{active: tab == 6}" @click="changeTab(6)">其他团队</li>
+              <li :class="{active: tab == 7}" @click="changeTab(7)">我的活动</li>
             </ul>
           </div>
           <div class="info-right">
@@ -453,6 +454,54 @@
                 </div>
               </div>
             </div>
+            <div class="my-activity" v-show="tab == 7">
+              <div class="box-title">
+                <span>我的活动</span>
+              </div>
+              <div class="my-activity-box">
+                <table>
+                  <tr>
+                    <td width="10%">序号</td>
+                    <td width="30%">活动名称</td>
+                    <td width="20%">活动开始时间</td>
+                    <td width="20%">活动结束时间</td>
+                    <td width="20%">操作</td>
+                  </tr>
+                  <tr v-for="(list,idx) in signedActivity" :key="idx">
+                    <td>{{idx+1}}</td>
+                    <td>{{list.activityTitle}}</td>
+                    <td>{{list.startTime}}</td>
+                    <td>{{list.endTime}}</td>
+                    <td>
+                      <router-link :to="{path: '/cultureActivityDetail/' + list.activityLibraryId}" tag="button">查看详情</router-link>
+                      <button @click="cancelActivity(list.activityLibraryId)" v-if="list.state == 3 || list.state == 4">取消报名</button>
+                    </td>
+                  </tr>
+                </table>
+                <div class="pager">
+                  <span @click="paging(1)">首页</span>
+                  <span @click="paging(page.page - 1)" v-if="page.page > 1">上一页</span>
+                  <ul v-if="page.totalPage > 0 && page.totalPage <= 5">
+                    <li v-for="cpage in page.totalPage" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
+                      {{cpage}}
+                    </li>
+                  </ul>
+                  <ul v-if="page.totalPage > 5">
+                    <li v-if="page.page < 3" v-for="cpage in 5" :class="{'active': page.page == cpage}" :key="cpage" @click="paging(cpage)">
+                      {{cpage}}
+                    </li>
+                    <li v-if="page.page > page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.totalPage - 5 + cpage)}" :key="cpage" @click="paging(cpage)">
+                      {{page.totalPage - 5 + cpage}}
+                    </li>
+                    <li v-if="page.page >= 3 && page.page <= page.totalPage - 2" v-for="cpage in 5" :class="{'active': page.page == (page.page - (3 - cpage))}" :key="cpage" @click="paging(cpage)">
+                      {{page.page - (3 - cpage)}}
+                    </li>
+                  </ul>
+                  <span @click="paging(page.page + 1)" v-if="page.page < page.totalPage">下一页</span>
+                  <span @click="paging(page.totalPage)">尾页</span>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -518,7 +567,8 @@ export default {
       memberList: [],
       otherTeam: [],
       checkOtherTeam: false,
-      otherTeamDetail: []
+      otherTeamDetail: [],
+      signedActivity: []
     }
   },
   computed: {
@@ -537,6 +587,8 @@ export default {
         this.getTeamMember()
       } else if (this.tab === 6) {
         this.getOtherTeamList()
+      } else if (this.tab === 7) {
+        this.initSignedActivity()
       }
     },
     // 切换选项卡
@@ -556,7 +608,11 @@ export default {
       } else if (tab === 4) {
         this.getVolunteerArea()
       } else if (tab === 6) {
+        this.page.rows = 10
         this.getOtherTeamList()
+      } else if (tab === 7) {
+        this.page.rows = 10
+        this.initSignedActivity()
       }
     },
     // 获取场馆，按门票
@@ -582,14 +638,20 @@ export default {
     // 取消预约
     cancelBook: function (id) {
       var self = this
-      axios.delete('http://192.168.0.109:8082/venuebooking/app/booking/removemyticket/' + id, {
+      self.$layer.open({
-        headers: {
+        content: '确认要取消该订单吗？',
-          token: self.token
+        yes: function () {
-        }
+          axios.delete('http://192.168.0.109:8082/venuebooking/app/booking/removemyticket/' + id, {
-      }).then(function (res) {
+            headers: {
-        if (res.status === 200) {
+              token: self.token
-          self.$layer.msg('取消成功')
+            }
-          self.getVenueTicket()
+          }).then(function (res) {
+            if (res.status === 200) {
+              self.$layer.closeAll()
+              self.$layer.msg('取消成功')
+              self.getVenueTicket()
+            }
+          })
         }
       })
     },
@@ -822,14 +884,20 @@ export default {
     // 修改志愿者信息
     updateVolunteer: function () {
       var self = this
-      axios.put('http://192.168.0.111:8888/volunteer/app/volunteer/updatevolunteer/' + self.volunteerId, self.volunteerRegisterInfo, {
+      self.$layer.open({
-        headers: {
+        content: '确认修改？',
-          token: self.token
+        yes: function () {
-        }
+          axios.put('http://192.168.0.111:8888/volunteer/app/volunteer/updatevolunteer/' + self.volunteerId, self.volunteerRegisterInfo, {
-      }).then(function (res) {
+            headers: {
-        if (res.status === 200) {
+              token: self.token
-          self.$layer.msg('修改成功！')
+            }
-          self.getVolunteerInfo()
+          }).then(function (res) {
+            if (res.status === 200) {
+              self.getVolunteerInfo()
+              self.$layer.closeAll()
+              self.$layer.msg('修改成功！')
+            }
+          })
         }
       })
     },
@@ -879,15 +947,21 @@ export default {
     // 解散团队
     dissolveTeam: function (id) {
       var self = this
-      axios.put('http://192.168.0.111:8888/volunteer/app/team/updateteam/' + id, {
+      self.$layer.open({
-        status: 0
+        content: '确认要解散该团队？',
-      }, {
+        yes: function () {
-        headers: {
+          axios.put('http://192.168.0.111:8888/volunteer/app/team/updateteam/' + id, {
-          token: self.token
+            status: 0
+          }, {
+            headers: {
+              token: self.token
+            }
+          }).then(function (res) {
+            self.$layer.closeAll()
+            self.$layer.msg('解散成功！')
+            self.getMyTeam()
+          })
         }
-      }).then(function (res) {
-        self.$layer.msg('解散成功！')
-        self.getMyTeam()
       })
     },
     // 查看团队详情
@@ -957,17 +1031,23 @@ export default {
     // 申请加入团队
     applyJoin: function (id) {
       var self = this
-      axios.post('http://192.168.0.111:8888/volunteer/app/teammember/saveteammember', {
+      self.$layer.open({
-        teamId: id
+        content: '确认加入该团队？',
-      }, {
+        yes: function () {
-        headers: {
+          axios.post('http://192.168.0.111:8888/volunteer/app/teammember/saveteammember', {
-          token: self.token
+            teamId: id
-        }
+          }, {
-      }).then(function (res) {
+            headers: {
-        console.log(res)
+              token: self.token
-        if (res.status === 200) {
+            }
-          self.$layer.msg('申请成功！')
+          }).then(function (res) {
-          self.getOtherTeamList()
+            console.log(res)
+            if (res.status === 200) {
+              self.$layer.closeAll()
+              self.$layer.msg('申请成功！')
+              self.getOtherTeamList()
+            }
+          })
         }
       })
     },
@@ -981,18 +1061,62 @@ export default {
     // 审批加入/驳回
     isAgreeJoin: function (id, type) {
       var self = this
-      axios.put('http://192.168.0.111:8888/volunteer/app/teammember/updateteammember/' + id, {
+      var msg = ''
-        status: type
+      if (type === 1) {
-      }, {
+        msg = '确认同意此人加入团队？'
+      } else {
+        msg = '确认驳回此申请？'
+      }
+      self.$layer.open({
+        content: msg,
+        yes: function () {
+          axios.put('http://192.168.0.111:8888/volunteer/app/teammember/updateteammember/' + id, {
+            status: type
+          }, {
+            headers: {
+              token: self.token
+            }
+          }).then(function (res) {
+            self.$layer.closeAll()
+            if (type === 1) {
+              self.$layer.msg('审核通过！')
+            } else {
+              self.$layer.msg('已驳回！')
+            }
+          })
+        }
+      })
+    },
+    // 获取已报名的活动列表
+    initSignedActivity: function () {
+      var self = this
+      axios.get('http://192.168.0.111:8080/culturalactivity/app/activityuserapply/myjoinactivity', {
         headers: {
           token: self.token
         }
       }).then(function (res) {
         console.log(res)
-        if (type === 1) {
+        self.signedActivity = res.data.rows
-          self.$layer.msg('审核通过！')
+        self.totalPage = Math.ceil(res.data.total / self.page.rows)
-        } else {
+      })
-          self.$layer.msg('已驳回！')
+    },
+    // 取消报名活动
+    cancelActivity: function (id) {
+      var self = this
+      self.$layer.open({
+        content: '确认要取消此活动的报名吗？',
+        yes: function () {
+          axios.get('http://192.168.0.111:8080/culturalactivity/app/activityuserapply/cancelapply/' + id, {
+            headers: {
+              token: self.token
+            }
+          }).then(function (res) {
+            console.log(res)
+            self.$layer.closeAll()
+            self.$layer.msg('取消报名成功')
+            self.page.page = 1
+            self.initSignedActivity()
+          })
         }
       })
     }
@@ -1118,8 +1242,10 @@ export default {
                 border-radius 3px
               label
                 cursor pointer
-                .iconfont.active
+                .iconfont
-                  color $main-color
+                  color #e0e0e0
+                  &.active
+                    color $main-color
               .radio-box
                 display inline-block
                 margin-right 30px
@@ -1311,6 +1437,9 @@ export default {
             padding 0 5px
             text-align center
             border-bottom 1px solid #DEDEDE
+            white-space nowrap
+            overflow hidden
+            text-overflow ellipsis
             button
               background none
               border none
@@ -1387,7 +1516,13 @@ export default {
   .back-list
     font-size 20px
     margin-top 10px
-    padding-left 20px
+    width 120px
+    height 40px
+    border-radius 3px
+    background $main-color
+    color #fff
+    text-align center
+    line-height 40px
     cursor pointer
   .team-avatar-name
     margin 20px 0 10px
@@ -1457,6 +1592,29 @@ export default {
         width 48%
         &.bad
           background #DEDEDE
+.my-activity-box
+  table
+    table-layout fixed
+    width 100%
+    td
+      font-size 16px
+      color #0a0a0a
+      height 35px
+      text-align center
+      border 1px solid #DEDEDE
+      white-space nowrap
+      overflow hidden
+      text-overflow ellipsis
+      padding 0 5px
+      button
+        background $main-color
+        border none
+        outline none
+        font-size 16px
+        color #fff
+        border-radius 3px
+        cursor pointer
+        height 25px
 input[type="number"]{ -moz-appearance: textfield; }
 input::-webkit-outer-spin-button, input::-webkit-inner-spin-button { -webkit-appearance: none; }
 </style>

src/pages/Resource/Resource.vue

@@ -136,6 +136,7 @@ export default {
 </script>
 
 <style lang="stylus" rel="stylesheet/stylus" scoped>
+@import "~styles/public.styl"
 .location
   background #e5e5e5
   line-height 30px
@@ -172,7 +173,7 @@ export default {
         text-overflow: ellipsis
         &.active
           color #fff
-          background #01a9f8
+          background $main-color
 .resource
   width 1200px
   margin 20px auto
@@ -184,10 +185,12 @@ export default {
       float left
       margin-right 15px
       margin-bottom 15px
-      border 1px solid #e3e3e3
+      box-shadow:0px 0px 10px 0px rgba(176,176,176,0.3);
       padding 15px
       box-sizing border-box
       cursor pointer
+      &:hover
+        box-shadow:0px 0px 20px 0px rgba(176,176,176,0.9);
       .resource-img
         width 100%
         height 185px
@@ -238,9 +241,9 @@ export default {
       font-size 14px
       color #676767
       &.active
-        background #01a9f8
+        background $main-color
         color #fff
-        border 1px solid #01a9f8
+        border 1px solid $main-color
       &:last-child
         margin 0
   input

src/pages/Volunteer/Volunteer.vue

@@ -163,15 +163,20 @@ export default {
   min-height 500px
   margin 20px auto
   ul
-    overflow hidden
+    &:after
+      content: ''
+      display block
+      clear both
     li
       width 280px
       float left
       margin-right 20px
-      border 1px solid #a8a8a8
+      box-shadow:0px 0px 10px 0px rgba(176,176,176,0.3);
       box-sizing border-box
       margin-bottom 20px
       cursor pointer
+      &:hover
+        box-shadow:0px 0px 20px 0px rgba(176,176,176,0.9);
       .volunteer-img
         width 100%
         height 185px