Skip to content

Commit ce378dc

Browse files
uncleLianuncleLian
committed
update
1、添加无限加载 2、修改fetch.js、cache.js 3、添加mock数据参数 4、添加other数据 5、添加全局index.styl的toRem方法 6、添加修改一些样式和代码
1 parent d3073f5 commit ce378dc

31 files changed

+1413
-176
lines changed

‎build/utils.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,16 @@ exports.cssLoaders = function (options) {
5555
}
5656

5757
// https://vue-loader.vuejs.org/en/configurations/extract-css.html
58+
var cssDir = path.resolve(__dirname, '../src/assets/css')
5859
return {
5960
css: generateLoaders(),
6061
postcss: generateLoaders(),
6162
less: generateLoaders('less'),
6263
sass: generateLoaders('sass', { indentedSyntax: true }),
6364
scss: generateLoaders('sass'),
64-
stylus: generateLoaders('stylus'),
65+
stylus: generateLoaders('stylus', {
66+
import: [cssDir+'/*.styl']
67+
}),
6568
styl: generateLoaders('stylus')
6669
}
6770
}

‎build/webpack.dev.conf.js

+6
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ const devWebpackConfig = merge(baseWebpackConfig, {
5050
template: 'index.html',
5151
inject: true
5252
}),
53+
new webpack.ProvidePlugin({
54+
$: 'jquery',
55+
jQuery: 'jquery',
56+
'window.jQuery': 'jquery',
57+
'window.$': 'jquery',
58+
})
5359
]
5460
})
5561

‎build/webpack.prod.conf.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,13 @@ const webpackConfig = merge(baseWebpackConfig, {
115115
to: config.build.assetsSubDirectory,
116116
ignore: ['.*']
117117
}
118-
])
118+
]),
119+
new webpack.ProvidePlugin({
120+
$: 'jquery',
121+
jQuery: 'jquery',
122+
'window.jQuery': 'jquery',
123+
'window.$': 'jquery',
124+
})
119125
]
120126
})
121127

‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
hm.src = "https://hm.baidu.com/hm.js?e07d056f3879241602e0221e10dd7e33";
55
var s = document.getElementsByTagName("script")[0];
66
s.parentNode.insertBefore(hm, s);
7-
})();</script><link href=/static/css/app.d9dc94041eb17dc46dadf3f7cb2d0256.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.d2556a28181d4f3b12c4.js></script><script type=text/javascript src=/static/js/vendor.7aecde06124de9dbb875.js></script><script type=text/javascript src=/static/js/app.0c919b353d055655895c.js></script></body></html>
7+
})();</script><link href=/static/css/app.5505b3476272d10bfa232f811a0b4f69.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6944458cfac7d63041f5.js></script><script type=text/javascript src=/static/js/vendor.1ccd87f825232b0fa7cc.js></script><script type=text/javascript src=/static/js/app.342e4dd1c23b4d037b70.js></script></body></html>

‎docs/static/css/app.d9dc94041eb17dc46dadf3f7cb2d0256.css ‎docs/static/css/app.5505b3476272d10bfa232f811a0b4f69.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/img/header_theme.5857ea0.jpg

-119 KB
Binary file not shown.

‎docs/static/js/0.aed4fbad722320e55796.js

-1
This file was deleted.

‎docs/static/js/0.ed786bb3a38ed4bf5f47.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/1.274ce00109227a3313c7.js

-1
This file was deleted.

‎docs/static/js/1.b5c1ae9166bb29e55a65.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/app.0c919b353d055655895c.js

-1
This file was deleted.

‎docs/static/js/app.342e4dd1c23b4d037b70.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/manifest.d2556a28181d4f3b12c4.js ‎docs/static/js/manifest.6944458cfac7d63041f5.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/vendor.1ccd87f825232b0fa7cc.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/vendor.7aecde06124de9dbb875.js

-1
This file was deleted.

‎package-lock.json

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"amfe-flexible": "^2.2.1",
1515
"axios": "^0.17.1",
1616
"babel-polyfill": "^6.26.0",
17+
"jquery": "^3.3.1",
1718
"material-design-icons": "^3.0.1",
1819
"mockjs": "^1.0.1-beta3",
1920
"muse-ui": "^2.1.0",

‎src/assets/css/index.styl

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
toRem(val) {
2+
return (ceil(val / 37.5 * 100) / 100)rem
3+
}

‎src/assets/css/reset.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ html,body{
1111
-ms-touch-action: manipulation /* IE10+ 禁止双击缩放 */
1212
}
1313
body{
14-
font-family: Microsoft YaHei,STHeiti,Helvetica,Arial,sans-serif;
14+
font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
1515
overflow-y: initial !important; /* music-ui的自带样式会导致body出现滚动条，然后导致scrollBehavior无法获取window的滚动位置 */
1616
}
1717
img{vertical-align: top;border: 0;}

‎src/components/banner.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
}
3232
</script>
3333
<style lang='stylus'>
34-
banner_height = 4.26rem
34+
banner_height = toRem(160)
3535
#banner{
3636
width: 100%;
3737
padding: 10px;
@@ -49,7 +49,7 @@ banner_height = 4.26rem
4949
.swiper-pagination{
5050
width: 100%;
5151
left: 0;
52-
bottom: 0.2666rem;
52+
bottom: toRem(10);
5353
.swiper-pagination-bullet{
5454
background: #fff;
5555
}

‎src/components/list.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default {
3939
}
4040
</script>
4141
<style scoped lang='stylus'>
42-
img_height = 4.6666rem
42+
img_height = toRem(175)
4343
.list{
4444
font-size: 0;
4545
.list-item{

‎src/components/musicBar.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,14 @@ export default {
159159
.sound{
160160
position: relative;
161161
width: 100%;
162-
height: 1.3rem;
163-
padding: 0 0.14rem;
162+
height: toRem(48);
163+
padding: 0 toRem(5);
164164
display: flex;
165165
align-items: center;
166166
.cover{
167167
display: inline-block;
168-
width: 1rem;
169-
height: 1rem;
168+
width: toRem(37.5);
169+
height: toRem(37.5);
170170
border: 1px solid #fff;
171171
box-shadow: 0 0 2px rgba(0,0,0,.2);
172172
overflow: hidden;
@@ -177,7 +177,7 @@ export default {
177177
.info{
178178
flex: 1;
179179
overflow: hidden;
180-
padding: 0 0.2rem;
180+
padding: 0 toRem(7.5);
181181
font-size: 12px;
182182
p{
183183
text-overflow: ellipsis;

0 commit comments

Comments
 (0)