Authored by 陈轩

im android

@@ -10,6 +10,7 @@ import appBridge from 'yoho-app'; @@ -10,6 +10,7 @@ import appBridge from 'yoho-app';
10 import {time} from './time'; 10 import {time} from './time';
11 import {api} from './store'; 11 import {api} from './store';
12 import {RatingView, LeaveMSGView, OrderListView } from './view'; 12 import {RatingView, LeaveMSGView, OrderListView } from './view';
  13 +import qs from 'yoho-qs';
13 14
14 var socket = require('./socket-chat'), 15 var socket = require('./socket-chat'),
15 socketConf = require('./socket-config'); 16 socketConf = require('./socket-config');
@@ -811,10 +812,14 @@ $('#chat-window').on('click', '.chat-image', function() { @@ -811,10 +812,14 @@ $('#chat-window').on('click', '.chat-image', function() {
811 }); 812 });
812 813
813 if (appBridge.isApp) { 814 if (appBridge.isApp) {
814 - $('#js-back').on('click', function(e) { 815 + $('#js-back').removeAttr('href').on('click', function(e) {
815 e.preventDefault(); 816 e.preventDefault();
816 817
817 - appBridge.invokeMethod('go.back', {}); 818 + if ((qs.clientType || '').toLowerCase() === 'android') {
  819 + window.im.goBack();
  820 + } else {
  821 + appBridge.invokeMethod('go.back', {});
  822 + }
818 }); 823 });
819 } 824 }
820 825