diff --git a/.env.development b/.env.development index 6320849..e643641 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VUE_APP_ERUDA=true +VUE_APP_ERUDA=false NODE_ENV="development"; BASE_URL='/' VUE_APP_BASE_API="/dev-api" diff --git a/README.md b/README.md index 184613c..a580498 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dou-yin +# 视频类WebApp ## Project setup ``` diff --git a/package.json b/package.json index 318ef0a..80865f3 100755 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "axios": "^0.21.1", "babel-plugin-import": "^1.13.0", "core-js": "^3.6.5", "lib-flexible": "^0.3.2", diff --git a/src/assets/img/1.jpeg b/public/assets/img/1.png similarity index 100% rename from src/assets/img/1.jpeg rename to public/assets/img/1.png diff --git a/src/assets/img/2.jpg b/public/assets/img/2.png similarity index 100% rename from src/assets/img/2.jpg rename to public/assets/img/2.png diff --git a/src/assets/img/3.jpg b/public/assets/img/3.png similarity index 100% rename from src/assets/img/3.jpg rename to public/assets/img/3.png diff --git a/public/static/data.json b/public/static/data.json new file mode 100644 index 0000000..3571440 --- /dev/null +++ b/public/static/data.json @@ -0,0 +1,44 @@ +{ + "list": [ + { + "id": "1", + "url": "http://video.jishiyoo.com/3720932b9b474f51a4cf79f245325118/913d4790b8f046bfa1c9a966cd75099f-8ef4af9b34003bd0bc0261cda372521f-ld.mp4", + "perLikes": "7008", + "perComments": "81", + "perForward": "391", + "perName": "@小孟儿", + "perDesc": "女柚子的比赛之路，报告大家，目前一路顺畅", + "perMusicName": "@小孟儿创作的原生" + }, + { + "id": "2", + "url": "http://video.jishiyoo.com/1eedc49bba7b4eaebe000e3721149807/d5ab221b92c74af8976bd3c1473bfbe2-4518fe288016ee98c8783733da0e2da4-ld.mp4", + "perLikes": "238", + "perComments": "6", + "perForward": "", + "perName": "@克拉拉ClaraLee", + "perDesc": "你进今天健身了吗", + "perMusicName": "@克拉拉创作的原生" + }, + { + "id": "3", + "url": "http://video.jishiyoo.com/549ed372c9d14b029bfb0512ba879055/8e2dc540573d496cb0942273c4a4c78c-15844fe70971f715c01d57c0c6595f45-ld.mp4", + "perLikes": "5.4w", + "perComments": "1401", + "perForward": "784", + "perName": "@普通闲话", + "perDesc": "普通百姓买房子是资产保值增值的最好方面是吗", + "perMusicName": "@普通闲话创作的原生" + }, + { + "id": "4", + "url": "http://video.jishiyoo.com/161b9562c780479c95bbdec1a9fbebcc/8d63913b46634b069e13188b03073c09-d25c062412ee3c4a0758b1c48fc8c642-ld.mp4", + "perLikes": "2640", + "perComments": "734", + "perForward": "43", + "perName": "@萌宠动漫社", + "perDesc": "这哪还是龙啊，就是一只二哈", + "perMusicName": "@萌宠动漫社创作的原生" + } + ] +} \ No newline at end of file diff --git a/public/static/me.json b/public/static/me.json new file mode 100644 index 0000000..6c34127 --- /dev/null +++ b/public/static/me.json @@ -0,0 +1,89 @@ +{ + "userInfo": { + "name": "前端逗逗飞", + "sn": "201509094607", + "sub": "带你走进前端开发", + "age": "23", + "desc": "公众号前端逗逗飞", + "tag": "标签", + "like": "2", + "fans": "20000" + + }, + "vlist": { + "works": [{ + "id": "001", + "url": "http://video.jishiyoo.com/3720932b9b474f51a4cf79f245325118/913d4790b8f046bfa1c9a966cd75099f-8ef4af9b34003bd0bc0261cda372521f-ld.mp4", + "icon": "/assets/img/1.png" + }, + { + "id": "002", + "url": "http://video.jishiyoo.com/3720932b9b474f51a4cf79f245325118/913d4790b8f046bfa1c9a966cd75099f-8ef4af9b34003bd0bc0261cda372521f-ld.mp4", + "icon": "/assets/img/1.png" + }, + { + "id": "002", + "url": "http://video.jishiyoo.com/3720932b9b474f51a4cf79f245325118/913d4790b8f046bfa1c9a966cd75099f-8ef4af9b34003bd0bc0261cda372521f-ld.mp4", + "icon": "/assets/img/1.png" + }, + { + "id": "003", + "url": "http://video.jishiyoo.com/3720932b9b474f51a4cf79f245325118/913d4790b8f046bfa1c9a966cd75099f-8ef4af9b34003bd0bc0261cda372521f-ld.mp4", + "icon": "/assets/img/1.png" + } + ], + "movs": [ + { + "id": "001", + "url": "http://video.jishiyoo.com/1eedc49bba7b4eaebe000e3721149807/d5ab221b92c74af8976bd3c1473bfbe2-4518fe288016ee98c8783733da0e2da4-ld.mp4", + "icon": "/assets/img/2.png" + }, + { + "id": "002", + "url": "http://video.jishiyoo.com/1eedc49bba7b4eaebe000e3721149807/d5ab221b92c74af8976bd3c1473bfbe2-4518fe288016ee98c8783733da0e2da4-ld.mp4", + "icon": "/assets/img/2.png" + }, + { + "id": "003", + "url": "http://video.jishiyoo.com/1eedc49bba7b4eaebe000e3721149807/d5ab221b92c74af8976bd3c1473bfbe2-4518fe288016ee98c8783733da0e2da4-ld.mp4", + "icon": "/assets/img/2.png" + }, { + "id": "004", + "url": "http://video.jishiyoo.com/1eedc49bba7b4eaebe000e3721149807/d5ab221b92c74af8976bd3c1473bfbe2-4518fe288016ee98c8783733da0e2da4-ld.mp4", + "icon": "/assets/img/2.png" + } + ], + "likes": [ + { + "id": "001", + "url": "http://video.jishiyoo.com/549ed372c9d14b029bfb0512ba879055/8e2dc540573d496cb0942273c4a4c78c-15844fe70971f715c01d57c0c6595f45-ld.mp4", + "icon": "/assets/img/3.png" + }, + { + "id": "002", + "url": "http://video.jishiyoo.com/549ed372c9d14b029bfb0512ba879055/8e2dc540573d496cb0942273c4a4c78c-15844fe70971f715c01d57c0c6595f45-ld.mp4", + "icon": "/assets/img/3.png" + }, + { + "id": "003", + "url": "http://video.jishiyoo.com/549ed372c9d14b029bfb0512ba879055/8e2dc540573d496cb0942273c4a4c78c-15844fe70971f715c01d57c0c6595f45-ld.mp4", + "icon": "/assets/img/3.png" + }, + { + "id": "004", + "url": "http://video.jishiyoo.com/549ed372c9d14b029bfb0512ba879055/8e2dc540573d496cb0942273c4a4c78c-15844fe70971f715c01d57c0c6595f45-ld.mp4", + "icon": "/assets/img/3.png" + }, + { + "id": "005", + "url": "http://video.jishiyoo.com/549ed372c9d14b029bfb0512ba879055/8e2dc540573d496cb0942273c4a4c78c-15844fe70971f715c01d57c0c6595f45-ld.mp4", + "icon": "/assets/img/3.png" + }, + { + "id": "006", + "url": "http://video.jishiyoo.com/549ed372c9d14b029bfb0512ba879055/8e2dc540573d496cb0942273c4a4c78c-15844fe70971f715c01d57c0c6595f45-ld.mp4", + "icon": "/assets/img/3.png" + } + ] + } + } diff --git a/src/App.vue b/src/App.vue index 3030e45..1151225 100755 --- a/src/App.vue +++ b/src/App.vue @@ -6,8 +6,8 @@ ")}catch(c){console&&console.log(c)}}function d(){e||(e=!0,o())}l=function(){var c,t,l,a,o,i=document.createElement("div");i.innerHTML=s,s=null,(c=i.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",t=c,(l=document.body).firstChild?(a=t,(o=l.firstChild).parentNode.insertBefore(a,o)):l.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(o=l,i=c.document,e=!1,(n=function(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(n,50)}d()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,d())})}(window); \ No newline at end of file +!function(c){var t,l,a,o,i,e,n='',s=(s=document.getElementsByTagName("script"))[s.length-1].getAttribute("data-injectcss");if(s&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function h(){i||(i=!0,a())}t=function(){var c,t,l,a;(a=document.createElement("div")).innerHTML=n,n=null,(l=a.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",c=l,(t=document.body).firstChild?(a=c,(l=t.firstChild).parentNode.insertBefore(a,l)):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),t()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(a=t,o=c.document,i=!1,(e=function(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(e,50)}h()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,h())})}(window); \ No newline at end of file diff --git a/src/assets/fonts/iconfont.json b/src/assets/fonts/iconfont.json index e1f6654..41a6bf9 100644 --- a/src/assets/fonts/iconfont.json +++ b/src/assets/fonts/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "106851", + "name": "心", + "font_class": "bqxin", + "unicode": "e68c", + "unicode_decimal": 59020 + }, { "icon_id": "2057047", "name": "叹号", diff --git a/src/assets/fonts/iconfont.svg b/src/assets/fonts/iconfont.svg index 4b6754c..4e417f6 100644 --- a/src/assets/fonts/iconfont.svg +++ b/src/assets/fonts/iconfont.svg @@ -20,6 +20,9 @@ Created by iconfont /> + + + diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf index 26c9ef6..f3d5640 100644 Binary files a/src/assets/fonts/iconfont.ttf and b/src/assets/fonts/iconfont.ttf differ diff --git a/src/assets/fonts/iconfont.woff b/src/assets/fonts/iconfont.woff index 488e60a..1d2566c 100644 Binary files a/src/assets/fonts/iconfont.woff and b/src/assets/fonts/iconfont.woff differ diff --git a/src/assets/fonts/iconfont.woff2 b/src/assets/fonts/iconfont.woff2 index 2849a32..8c124b0 100644 Binary files a/src/assets/fonts/iconfont.woff2 and b/src/assets/fonts/iconfont.woff2 differ diff --git a/src/common/components/index/InfoBar.vue b/src/common/components/index/InfoBar.vue index e212195..3a3024c 100755 --- a/src/common/components/index/InfoBar.vue +++ b/src/common/components/index/InfoBar.vue @@ -1,11 +1,11 @@ - diff --git a/src/views/TPSign.vue b/src/views/TPSign.vue index 90fbb42..43c2e35 100755 --- a/src/views/TPSign.vue +++ b/src/views/TPSign.vue @@ -65,7 +65,7 @@ export default { this.phone = e.target.value; const regTel = /^[1][3456789][0-9]{9}$/; if (!regTel.test(this.phone)) { - console.log('不附和正则表达式'); + this.$toast('手机号格式不正确'); this.btnBg = false; this.disabled = true; } @@ -77,15 +77,25 @@ export default { // eslint-disable-next-line no-useless-escape const regTel = /^[1][3456789][0-9]{9}$/; if (this.phone === '') { - console.log('手机号不能为空'); + this.$toast({ + message: '手机号不能为空', + type: 'error', + duration: 20000, + }); this.disabled = true; this.btnBg = false; } else if (!regTel.test(this.phone)) { - console.log('请填写正确的手机号'); + this.$toast({ + message: '请填写正确的手机号', + type: 'error', + }); this.disabled = true; this.btnBg = false; } else if (this.password === '') { - console.log('密码不能为空'); + this.$toast({ + message: '密码不能为空', + type: 'error', + }); this.disabled = true; this.btnBg = false; } else { diff --git a/src/views/index/Index.vue b/src/views/index/Index.vue index 52b4df5..3f0448a 100755 --- a/src/views/index/Index.vue +++ b/src/views/index/Index.vue @@ -1,41 +1,17 @@ diff --git a/src/views/me/Edit.vue b/src/views/me/Edit.vue index 1e2b57b..dd2f006 100755 --- a/src/views/me/Edit.vue +++ b/src/views/me/Edit.vue @@ -4,7 +4,7 @@
- +

点击更换头像

diff --git a/src/views/me/Me.vue b/src/views/me/Me.vue index 9a94068..9db55a3 100755 --- a/src/views/me/Me.vue +++ b/src/views/me/Me.vue @@ -8,25 +8,26 @@
- - + +
-

爱学习的孩子

- 抖音号：xxxxxx -

越努力越幸运

+

{{useInfo.name}}

+ 抖音号：{{useInfo.sn}} +

{{useInfo.sub}}

- 23岁 - 中国最富垃圾车 - +添加学校等标签 + {{useInfo.age}}岁 + {{useInfo.desc}} + +{{useInfo.tag}}
- 2获赞 + {{useInfo.like}}获赞 543关注 - 2.0W+粉丝 + {{useInfo.fans}}W+粉丝
好好学习，天天向上 @@ -40,24 +41,18 @@
-
- - - +
+
-
- - - +
+
-
- - - +
+
@@ -67,8 +62,10 @@ @@ -206,8 +216,18 @@ export default { } } .tab-wrap { - .tab-con img { - width: 30%; + background-color: #000; + .tab-con { + display: flex; + flex-direction: row; + justify-content: space-between; + flex-wrap: wrap; + .tab-img { + width: 33%; + &:nth-child(3n) { + border-right: 0; + } + } } } } diff --git "a/vue 2.5\345\256\236\347\216\260\350\247\206\351\242\221\347\261\273webApp\345\244\247\347\272\262.md" "b/vue 2.5\345\256\236\347\216\260\350\247\206\351\242\221\347\261\273webApp\345\244\247\347\272\262.md" index 02b16a8..0059973 100644 --- "a/vue 2.5\345\256\236\347\216\260\350\247\206\351\242\221\347\261\273webApp\345\244\247\347\272\262.md" +++ "b/vue 2.5\345\256\236\347\216\260\350\247\206\351\242\221\347\261\273webApp\345\244\247\347\272\262.md" @@ -26,33 +26,34 @@ ### 首页视频详情： -### 点击评论分享： +### 点击评论分享：2 -### 视频自动播放和播放与暂停： +### 视频自动播放和播放与暂停：2 -### 上滑播放和下拉播放： +### 上滑播放和下拉播放：3 -### 评论列表： +### 评论列表：完结 -### 注册登录： +### 注册登录：3月8日 -### 验证码页面： +### 验证码页面：3月8日 -### 登录鉴权： +### 登录鉴权：5 -### 自定义弹出框组件： +### 自定义弹出框组件：6 -### 用户信息页面： +### 用户信息页面：7 -### header组件： +### header组件：8 -### 编辑信息页面： +### 编辑信息页面：9 -### 我的消息页面： +### 我的消息页面：10 -### 发布页面获取电脑摄像头：火力全开完成最后的组件： +### 发布页面获取电脑摄像头：火力全开完成最后的组件：11 +### 打包发布 12 -### 项目总结 +### 项目总结 13 diff --git a/vue.config.js b/vue.config.js index c773879..8c00bc4 100755 --- a/vue.config.js +++ b/vue.config.js @@ -20,16 +20,19 @@ module.exports = { warnings: false, errors: true }, - // host:'0.0.0.0', - // hot: true, + host:'0.0.0.0', + hot: true, // hotOnly: false, // https: false, //代理 proxy: { '/api': { - target: 'http://192.168.43.154:8080', + target: 'http://192.168.88.15:10086', ws: true, - changeOrigin: true + changeOrigin: true, + pathRewrite: { + "^/api": "/" + } }, } diff --git a/yarn.lock b/yarn.lock index 5c5cd97..9a7232a 100755 --- a/yarn.lock +++ b/yarn.lock @@ -1917,6 +1917,13 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + babel-eslint@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" @@ -4150,6 +4157,11 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== +follow-redirects@^1.10.0: + version "1.13.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" + integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"