Authored by 郭成尧

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

... ... @@ -90,11 +90,11 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'm.yohoblk.com for test',
domains: {
api: 'http://dev-api.yohops.com:9999/',
service: 'http://dev-service.yohops.com:9999/'
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/'
// api: 'http://api-test1.yohops.com:9999/',
// service: 'http://service-test1.yohops.com:9999/'
api: 'http://api-test1.yohops.com:9999/',
service: 'http://service-test1.yohops.com:9999/'
},
memcache: {
master: ['127.0.0.1:12111'],
... ...
... ... @@ -47,7 +47,7 @@ $(() => {
}
});
yoho.addNativeMethod('triggerEvent', (eventName) => {
yoho.addNativeMethod('triggerH5Event', (eventName) => {
alert(eventName);
bus.$emit(eventName);
});
... ...