Commit a76f2c3a authored by nano's avatar nano

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/models/user.js
parent a96f7307
{
let publicPath = 'https://cdn01.moecube.com/accounts/'
let defineConf = {
apiRoot: process.env["BUILD"] == 'development' ? 'http://114.215.243.95:8082' : 'https://api.moeube.com/accounts'
}
export default {
"entry": "src/index.js", "entry": "src/index.js",
"publicPath":"https://cdn01.moecube.com/accounts/", publicPath,
define: {...defineConf},
"env": { "env": {
"development": { "development": {
"extraBabelPlugins": [ "extraBabelPlugins": [
......
{ {
"private": true, "private": true,
"scripts": { "scripts": {
"start": "roadhog server", "start": "BUILD=development roadhog server",
"build:dev":"BUILD=development roadhog build",
"build": "roadhog build", "build": "roadhog build",
"lint": "eslint --ext .js src test", "lint": "eslint --ext .js src test",
"precommit": "npm run lint" "precommit": "npm run lint"
...@@ -14,14 +15,10 @@ ...@@ -14,14 +15,10 @@
"babel-runtime": "^6.9.2", "babel-runtime": "^6.9.2",
"dva": "^1.2.1", "dva": "^1.2.1",
"dva-loading": "^0.2.1", "dva-loading": "^0.2.1",
"egg-init": "^1.8.1",
"rc-queue-anim": "^0.13.3",
"react": "^15.4.0", "react": "^15.4.0",
"react-addons-transition-group": "^15.4.2",
"react-cropper": "^0.10.1", "react-cropper": "^0.10.1",
"react-document-title": "^2.0.2", "react-document-title": "^2.0.2",
"react-dom": "^15.4.0", "react-dom": "^15.4.0",
"react-image-crop": "^2.0.3",
"react-intl": "^2.2.3", "react-intl": "^2.2.3",
"react-particles-js": "^1.5.0", "react-particles-js": "^1.5.0",
"url-api-polyfill": "^1.1.0" "url-api-polyfill": "^1.1.0"
......
export default { export default {
apiRoot: 'http://192.168.1.9:3000' apiRoot: apiRoot
}; };
...@@ -150,8 +150,8 @@ export default { ...@@ -150,8 +150,8 @@ export default {
} }
} }
} catch (error) { } catch (error) {
yield put(routerRedux.replace('/signin')); yield put(routerRedux.replace("/signin"))
message.error(error.message); // message.error(error.message)
} }
}, },
*updateProfile({ payload }, { call, put, select }) { *updateProfile({ payload }, { call, put, select }) {
......
...@@ -13,7 +13,7 @@ import config from '../config' ...@@ -13,7 +13,7 @@ import config from '../config'
const FormItem = Form.Item; const FormItem = Form.Item;
const TabPane = Tabs.TabPane; const TabPane = Tabs.TabPane;
const defaultAvatar = "https://r.my-card.in/accounts/images/default_avatar.jpg" const defaultAvatar = require("../../public/default_avatar.jpg")
const formItemLayout = { const formItemLayout = {
labelCol: { span: 4 }, labelCol: { span: 4 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment