Comparing version 0.5.0 to 0.5.2
@@ -123,3 +123,3 @@ 'use strict'; | ||
export function closeWebview() { | ||
export function closeToRoot() { | ||
ready().then(() => { | ||
@@ -132,3 +132,3 @@ if (isAvailable('closeCurrentPushPage')) { | ||
export function closeCurrentPage() { | ||
export function close() { | ||
return window.FengjrApp && window.FengjrApp.closeCurrentPage('fuck'); | ||
@@ -160,3 +160,1 @@ } | ||
} | ||
export default exports; |
import React from "react"; | ||
import fjApp from "fengui/component/fjApp" | ||
import {setPageTitle} from "fengui/component/fjApp" | ||
import BrowserEnv from "../lib/BrowserEnv" | ||
@@ -22,7 +22,7 @@ let styles = require('./Header.scss'); | ||
if (BrowserEnv.isInApp()) { | ||
fjApp.setPageTitle(this.props.title); | ||
setPageTitle(this.props.title); | ||
return <div></div> | ||
} else { | ||
let {title, subTitle, subTitleClick} = this.props; | ||
if(subTitle && subTitle.length>4){ | ||
if(subTitle && subTitle.length>4) { | ||
subTitle = subTitle.substr(0,3)+ '...'; | ||
@@ -29,0 +29,0 @@ } |
@@ -8,3 +8,5 @@ let Promise = require('bluebird'); | ||
exports.WxSharePopup = require("./WxSharePopup"); | ||
exports.CustomPopup = require("./CustomPopup"); | ||
exports.alert = function (message, okText = '确定') { | ||
@@ -60,3 +62,3 @@ return new Promise(function (resolve, reject) { | ||
exports.toast = function (toastValue, time = 1500, hasAnimate) { | ||
exports.toast = function (toastValue, time = 2000, hasAnimate) { | ||
return new Promise(function (resolve, reject) { | ||
@@ -91,3 +93,2 @@ dispatch(actions.setVars("fuiToast", { | ||
} | ||
//location.href = 'https://update.fengjr.com/v1/update/app-h5/direct&apos'; | ||
dispatch(actions.setVars("fuiAlert", "")); | ||
@@ -94,0 +95,0 @@ resolve(); |
{ | ||
"name": "fengui", | ||
"version": "0.5.0", | ||
"version": "0.5.2", | ||
"description": "", | ||
@@ -22,3 +22,3 @@ "main": "dist/fengjr", | ||
], | ||
"author": "Tobias Koppers @sokra", | ||
"author": "fengjr.com mobile web team", | ||
"license": "MIT", | ||
@@ -34,3 +34,2 @@ "devDependencies": { | ||
"body-parser": "^1.9.3", | ||
"chart.js": "^1.0.2", | ||
"config": "^1.21.0", | ||
@@ -37,0 +36,0 @@ "connect-multiparty": "^2.0.0", |
@@ -20,2 +20,2 @@ 'use strict'; | ||
module.exports = createStore(mainReducer); | ||
export default module.exports = createStore(mainReducer); |
309857
55
114
5439