This commit is contained in:
dong_bo0602 2020-06-13 21:30:53 +08:00
parent f063bc54f0
commit 5630ae6250
21 changed files with 1421 additions and 56 deletions

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>xz_culture</title>
<script src="./static/ckplayer/ckplayer/ckplayer.js"></script>
<script src="./static/laydate/laydate.js"></script>
</head>
<body>
<div id="app"></div>

21
package-lock.json generated
View File

@ -6593,6 +6593,11 @@
"is-object": "^1.0.1"
}
},
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.5.1.tgz",
"integrity": "sha1-17TQjhv9uGrS8aPQOeoXMEcXq7U="
},
"js-base64": {
"version": "2.5.2",
"resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.5.2.tgz",
@ -6694,10 +6699,18 @@
"webpack-sources": "^1.0.1"
}
},
"laydate": {
"version": "1.0.7",
"resolved": "https://registry.npm.taobao.org/laydate/download/laydate-1.0.7.tgz",
"integrity": "sha1-JDEAT8lyGoX9BEGPoZUMJjLiuso="
"layui-laydate": {
"version": "5.0.9",
"resolved": "https://registry.npm.taobao.org/layui-laydate/download/layui-laydate-5.0.9.tgz",
"integrity": "sha1-GvOZBKBCxkiPcT1crGId8KCf/bs="
},
"layui-layer": {
"version": "1.0.9",
"resolved": "https://registry.npm.taobao.org/layui-layer/download/layui-layer-1.0.9.tgz",
"integrity": "sha1-t42dc6qOnDFGUUHExtoyUOaiCOg=",
"requires": {
"jquery": "^3.1.1"
}
},
"lazy-cache": {
"version": "1.0.4",

View File

@ -16,7 +16,8 @@
"crypto-js": "^4.0.0",
"flv.js": "^1.5.0",
"js-base64": "^2.5.2",
"laydate": "^1.0.7",
"layui-laydate": "^5.0.9",
"layui-layer": "^1.0.9",
"stylus": "^0.54.7",
"stylus-loader": "^3.0.2",
"viewerjs": "^1.5.0",

Binary file not shown.

View File

@ -6,3 +6,20 @@ button{font-family: 'zangwen'}
font-weight: normal;
font-style: normal;
}
@font-face {font-family: "iconfont";
src: url('iconfont.ttf?t=1591875994350') format('truetype') /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-xuanzhong:before {
content: "\e61a";
}

View File

@ -4,9 +4,9 @@
<div class="top-line-content">
<span>您好欢迎访问内蒙古文化云</span>
<div class="login-register-btn" v-if="isLogin">
<router-link to="/">
<img :src="userInfo.avatar" alt="" v-if="hasAvatar" class="user-avatar">
<img src="@/assets/images/avatar.png" alt="" class="user-avatar">
<router-link to="/personCenter">
<img :src="'http://192.168.0.113:7001/usercenter/route/file/downloadfile/false/' + userInfo.avatar" alt="" v-if="hasAvatar" class="user-avatar">
<img src="@/assets/images/avatar.png" alt="" class="user-avatar" v-else>
{{userInfo.name}}
</router-link>
<button @click="doLogout">退出登录</button>
@ -178,6 +178,7 @@ export default {
height 30px
margin-top 5px
margin-right 5px
border-radius 50%
&.login
margin-right 20px
button

View File

@ -13,7 +13,6 @@ import 'swiper/dist/css/swiper.css'
import 'vue-layer/lib/vue-layer.css'
import axios from 'axios'
import flvjs from 'flv.js'
var laydate = require('laydate')
Vue.use(flvjs)
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'
Vue.prototype.$axios = axios

View File

@ -96,6 +96,9 @@ export default {
}
self.$set(item, 'innerList', res.data.rows)
})
},
goDetail: function (url) {
window.location.href = 'http://192.168.0.104/' + url
}
},
mounted () {

View File

@ -28,8 +28,8 @@
<h3>{{list.livePlanName}}</h3>
<p>开始时间{{list.livePlanStart}}</p>
<button v-if="list.liveStatus == 0">已结束</button>
<button v-else-if="list.liveStatus == 1">尚未开始</button>
<button v-else>进行中</button>
<button v-else-if="list.liveStatus == 1" class="not-start">尚未开始</button>
<button v-else class="playing">进行中</button>
</div>
</router-link>
</ul>
@ -216,6 +216,10 @@ export default {
border-radius 4px
display block
margin 0 auto
&.playing
background $main-color
&.not-start
background greenyellow
.no-data
padding 80px 0
text-align center

View File

@ -8,13 +8,14 @@
</div>
<div class="video-title">
<h3>{{broadcastData.livePlanName}}</h3>
<p v-if="!isBroadcast">直播时间{{selectedVideo.recordFileStart }}-{{selectedVideo.recordFileLast }}</p>
<p v-if="!isBroadcast">直播时间{{selectedVideo.recordFileStart }}{{selectedVideo.recordFileLast }}</p>
</div>
<div class="video" v-if="!isBroadcast">
<div class="video-content">
<div class="video-left">
<input name="urlinput" class="urlInput" type="hidden" value=""/>
<video autoplay controls id="myVideo"></video>
<p>{{selectedVideo.recordFileRecord}}</p>
</div>
<div class="video-right">
<h2>目录</h2>
@ -176,9 +177,14 @@ export default {
height 500px
video
width 100%
height 100%
height 470px
background #000
outline none
p
line-height 30px
font-size 16px
color #fff
background #000
.broadcast
width 1080px
float none

View File

@ -152,11 +152,9 @@ export default {
//
changeTab: function (tab) {
var self = this
console.log(tab)
if (tab > 1) {
console.log('0000')
var token = localStorage.getItem('token')
if (!token) {
if (token) {
this.tab = tab
} else {
this.$layer.msg('请先登录')
@ -210,7 +208,7 @@ export default {
},
//
initDate: function () {
for (var i = 0; i < 3; i++) {
for (var i = 1; i <= 3; i++) {
var today = new Date()
var targetday = today.getTime() + 1000 * 60 * 60 * 24 * i
today.setTime(targetday)
@ -225,8 +223,9 @@ export default {
bottom: tDate
}
this.dateInfo.push(item)
this.selectedDate = this.dateInfo[0].date
}
this.selectedDate = this.dateInfo[0].date
console.log(this.dateInfo)
},
// 10
doHandleMonth: function (month) {
@ -266,26 +265,35 @@ export default {
//
submitSelect: function () {
// debugger
var item = {
projectName: this.selectedProject.projectName,
venuesProjectId: this.selectedProject.venuesProjectId,
groundName: this.selectedGround.groundName,
groundInfoId: this.selectedGround.groundInfoId,
selectedDate: this.selectedDate,
selectedSlot: this.selectedSlot.slot,
price: this.selectedSlot.price,
itemId: this.selectedSlot.itemId
}
var exist = false
if (this.selectedList.length > 0) {
for (var i = 0; i < this.selectedList.length; i++) {
if (item.projectName === this.selectedList[i].projectName && item.groundName === this.selectedList[i].groundName && item.selectedDate === this.selectedList[i].selectedDate && item.selectedSlot === this.selectedList[i].selectedSlot) {
exist = true
break
}
if (this.selectedList.length < 4) {
var item = {
projectName: this.selectedProject.projectName,
venuesProjectId: this.selectedProject.venuesProjectId,
groundName: this.selectedGround.groundName,
groundInfoId: this.selectedGround.groundInfoId,
selectedDate: this.selectedDate,
selectedSlot: this.selectedSlot.slot,
price: this.selectedSlot.price,
itemId: this.selectedSlot.itemId
}
if (exist) {
this.$layer.msg('该场次已选择!')
var exist = false
if (this.selectedList.length > 0) {
for (var i = 0; i < this.selectedList.length; i++) {
if (item.projectName === this.selectedList[i].projectName && item.groundName === this.selectedList[i].groundName && item.selectedDate === this.selectedList[i].selectedDate && item.selectedSlot === this.selectedList[i].selectedSlot) {
exist = true
break
}
}
if (exist) {
this.$layer.msg('该场次已选择!')
} else {
if (this.selectedSlot.slot) {
this.$layer.msg('选择成功')
this.selectedList.push(item)
} else {
this.$layer.msg('请选择要预定的时间段')
}
}
} else {
if (this.selectedSlot.slot) {
this.$layer.msg('选择成功')
@ -294,23 +302,18 @@ export default {
this.$layer.msg('请选择要预定的时间段')
}
}
} else {
if (this.selectedSlot.slot) {
this.$layer.msg('选择成功')
this.selectedList.push(item)
} else {
this.$layer.msg('请选择要预定的时间段')
this.selectedProject.projectName = this.project[0].projectName
this.selectedProject.venuesProjectId = this.project[0].venuesProjectId
this.selectedGround.groundName = this.ground[0].groundName
this.selectedGround.groundInfoId = this.ground[0].groundInfoId
this.resetDate()
this.selectedSlot.slot = ''
this.selectedSlot.price = ''
for (var j = 0; j < this.timeList.length; j++) {
this.timeList[j].selected = false
}
}
this.selectedProject.projectName = this.project[0].projectName
this.selectedProject.venuesProjectId = this.project[0].venuesProjectId
this.selectedGround.groundName = this.ground[0].groundName
this.selectedGround.groundInfoId = this.ground[0].groundInfoId
this.resetDate()
this.selectedSlot.slot = ''
this.selectedSlot.price = ''
for (var j = 0; j < this.timeList.length; j++) {
this.timeList[j].selected = false
} else {
this.$layer.msg('最多可以选择四个场次!')
}
},
//
@ -318,9 +321,10 @@ export default {
var date = new Date()
var month = date.getMonth() + 1
month = this.doHandleMonth(month)
var day = date.getDate()
var day = date.getDate() + 1
day = this.doHandleMonth(day)
this.selectedDate = date.getFullYear() + '-' + month + '-' + day
console.log(this.selectedDate)
},
//
getVerificationCode: function () {
@ -355,6 +359,7 @@ export default {
arr.push(item)
}
var orderInfo = {
venuesProjectId: self.selectedProject.venuesProjectId,
bookingItemList: arr,
phoneNumber: this.verificationCodeInfo.phone,
smsCode: this.verificationCodeInfo.verificationCode
@ -367,6 +372,9 @@ export default {
}).then(function (res) {
if (res.status === 200) {
self.$layer.msg('预定成功')
setTimeout(function () {
location.reload()
}, 1000)
}
}).catch(function (error) {
self.$layer.msg(error.response.data.msg)

File diff suppressed because it is too large Load Diff

View File

@ -3,7 +3,7 @@
<Header></Header>
<div class="location">
<div class="location-content">
您的位置<router-link to="/">首页</router-link> > <router-link to="/resource"></router-link> >
您的位置<router-link to="/">首页</router-link> > <router-link to="/resource"></router-link> >
</div>
</div>
<div class="video-title">
@ -142,6 +142,7 @@ export default {
margin 0 auto
padding 10px 0
overflow hidden
text-align center
border-bottom 1px solid #ddd
h3
font-size 20px

View File

@ -28,6 +28,7 @@ import IntangibleHeritageDetail from '@/pages/IntangibleHeritageDetail/Intangibl
import SearchResult from '@/pages/SearchResult/SearchResult'
import ArtTrainList from '@/pages/ArtTrainList/ArtTrainList'
import SearchList from '@/pages/SearchList/SearchList'
import PersonCenter from '@/pages/PersonCenter/PersonCenter'
Vue.use(Router)
export default new Router({
@ -283,6 +284,15 @@ export default new Router({
title: '艺术培训',
keepAlive: false
}
},
{
path: '/personCenter',
name: 'PersonCenter',
component: PersonCenter,
meta: {
title: '个人中心',
keepAlive: false
}
}
]
})

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,45 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<!--
2013-9-30: Created.
-->
<svg>
<metadata>
Created by iconfont
</metadata>
<defs>
<font id="laydate-icon" horiz-adv-x="1024" >
<font-face
font-family="laydate-icon"
font-weight="500"
font-stretch="normal"
units-per-em="1024"
ascent="896"
descent="-128"
/>
<missing-glyph />
<glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
<glyph glyph-name="youyou" unicode="&#58882;" d="M283.648 721.918976 340.873216 780.926976 740.352 383.997952 340.876288-12.925952 283.648 46.077952 619.52 383.997952Z" horiz-adv-x="1024" />
<glyph glyph-name="zuozuo" unicode="&#58883;" d="M740.352 721.918976 683.126784 780.926976 283.648 383.997952 683.123712-12.925952 740.352 46.077952 404.48 383.997952Z" horiz-adv-x="1024" />
<glyph glyph-name="xiayiye" unicode="&#58970;" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z" horiz-adv-x="1024" />
<glyph glyph-name="xiayiye1" unicode="&#58971;" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.285422c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z" horiz-adv-x="1024" />
</font>
</defs></svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,13 @@
$(function () {
lay('#version').html('-v'+ laydate.v);
//执行一个laydate实例
//常规用法
laydate.render({
elem: '#calendar1' //指定元素
});
laydate.render({
elem: '#calendar2' //指定元素
});
})