From 10d96349e7f06ed4eed19b5aa48ba54497d5bc4b Mon Sep 17 00:00:00 2001 From: tony Date: Tue, 5 Jun 2018 18:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=83=A8=E5=88=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +++- src/DataStore.js | 8 +++++--- src/components/Progress.js | 4 +++- src/components/Volume.js | 4 +++- src/index.js | 16 ++++++++++++++-- yarn.lock | 6 +++++- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 5d919e8..2849926 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.2.1", "private": true, "proxy": "https://node.dengtongyu.com", - "homepage":"/pages/glassplayer/", + "homepage": "/", "dependencies": { "antd": "^3.2.3", "autoprefixer": "7.1.6", @@ -14,6 +14,7 @@ "babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-preset-react-app": "^3.1.1", "babel-runtime": "6.26.0", + "browser-demote": "^1.1.2", "case-sensitive-paths-webpack-plugin": "2.1.1", "chalk": "1.1.3", "css-loader": "0.28.7", @@ -36,6 +37,7 @@ "postcss-loader": "2.0.8", "promise": "8.0.1", "raf": "3.4.0", + "rc-slider": "^8.6.1", "react": "^16.2.0", "react-dev-utils": "^5.0.0", "react-dom": "^16.2.0", diff --git a/src/DataStore.js b/src/DataStore.js index 8c933ba..4fe2c89 100644 --- a/src/DataStore.js +++ b/src/DataStore.js @@ -2,6 +2,8 @@ import { observable } from 'mobx' let isFetching = false; +let host = 'https://node.dengtongyu.com'; + async function urlFetch(url) { if(isFetching) return Promise.reject('您点太快了！'); @@ -11,7 +13,7 @@ async function urlFetch(url) { return result; } -const searchUrl = '/data/songSearch'; +const searchUrl = host + '/data/songSearch'; async function getSearchSongList(keyWord,page,size) { if(!keyWord) keyWord = ''; @@ -22,7 +24,7 @@ async function getSearchSongList(keyWord,page,size) { return result; } -const newSongUrl = '/data/newSong'; +const newSongUrl = host + '/data/newSong'; async function getNewSongList() { let url = newSongUrl + '?json=true'; @@ -30,7 +32,7 @@ async function getNewSongList() { return result; } -const songMassgeUrl = '/data/songMsg'; +const songMassgeUrl = host + '/data/songMsg'; async function getSongMassge(hash) { let url = songMassgeUrl + '?hash=' + hash; diff --git a/src/components/Progress.js b/src/components/Progress.js index 9493723..4fb0e59 100644 --- a/src/components/Progress.js +++ b/src/components/Progress.js @@ -1,6 +1,8 @@ import React, { Component } from 'react'; -import { Slider } from 'antd'; +import Slider from 'rc-slider'; import { observer } from 'mobx-react'; + +import 'rc-slider/assets/index.css'; import './Progress.css'; import { DataStore } from '../DataStore'; diff --git a/src/components/Volume.js b/src/components/Volume.js index c35f231..68c1707 100644 --- a/src/components/Volume.js +++ b/src/components/Volume.js @@ -1,6 +1,8 @@ import React, { Component } from 'react'; -import { Slider } from 'antd'; +import Slider from 'rc-slider'; import { observer } from 'mobx-react'; + +import 'rc-slider/assets/index.css'; import './Volume.css'; import { DataStore } from '../DataStore'; diff --git a/src/index.js b/src/index.js index fae3e35..4e150aa 100644 --- a/src/index.js +++ b/src/index.js @@ -1,8 +1,20 @@ +import demote from 'browser-demote'; import React from 'react'; import ReactDOM from 'react-dom'; import './index.css'; import App from './App'; import registerServiceWorker from './registerServiceWorker'; -ReactDOM.render(, document.getElementById('root')); -registerServiceWorker(); +demote.use({ + refuse:['box-sizing', 'border-radius','transform'], + continueFunction:function(){ + ReactDOM.render(, document.getElementById('root')); + registerServiceWorker(); + } +}); + +if(!demote.status().isShow) { + ReactDOM.render(, document.getElementById('root')); + registerServiceWorker(); +} + diff --git a/yarn.lock b/yarn.lock index 5acedcb..3963a17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1213,6 +1213,10 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" +browser-demote@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/browser-demote/-/browser-demote-1.1.2.tgz#791f6462167be6b6d59d8f7dd89c119c9a3a61d1" + browser-resolve@^1.11.2: version "1.11.2" resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce" @@ -5936,7 +5940,7 @@ rc-select@~7.7.0: rc-util "^4.0.4" warning "^3.0.0" -rc-slider@~8.6.0: +rc-slider@^8.6.1, rc-slider@~8.6.0: version "8.6.1" resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.1.tgz#ee5e0380dbdf4b5de6955a265b0d4ff6196405d1" dependencies: