Просмотр исходного кода

修改返回按钮控制逻辑

yezehua 7 лет назад
Родитель
Сommit
1b9241eba8
3 измененных файлов с 36 добавлено и 16 удалено
  1. 6 3
      js/api-service.js
  2. 8 2
      js/buz/prescription-detail.js
  3. 22 11
      js/buz/prescription-tabs.js

+ 6 - 3
js/api-service.js

@ -20,7 +20,7 @@
    userAgent = localStorage.getItem(agentName)
    //hard code userAgent for test
    //全科
    // userAgent = {"id":4817,"uid":"xh1D2017031502222","imei":"864394010176834","token":"7273b147bd09da2ce2daae9fb5066a9c","platform":2,"hospital":"3502050100","appVersion":"1.3.6"}; 
    // userAgent = {"id":4798,"uid":"hxmD201703150222","token":"a69244e7c000c2db07f6cb5c2e44e8f4","imei":"A8221352625AFE32","platform":4}
	//健管
    // userAgent = {"id":4821,"uid":"zbqD201703150228","imei":"864394010176834","token":"73f5ace5c7d4cdb811f743902fd705d9","platform":2,"hospital":"3502050100"}; 
    // userAgent = JSON.stringify(userAgent);
@ -29,7 +29,10 @@
        try{
            userAgent = JSON.parse(userAgent)
        }catch(e){
            location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
        	toastr && toastr.warning("登录失效,请重新登录")
        	setTimeout(function() {
        		location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
        	}, 2000)  
        }
    } else {
        location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
@ -130,7 +133,7 @@
		}
		if(tip) {
			toastr && toastr.warning(tip)
			location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
			// location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
		}
    }
	

+ 8 - 2
js/buz/prescription-detail.js

@ -4,7 +4,9 @@ $(function(){
	var request = getRequest(),
	    teamCode = request.id,
	    isLeader = isTeamLeader(),
	    prescriptionCode = request.code;
	    prescriptionCode = request.code,
	    from = request.from, // 判断是否是tab页加载进来
	    fromTabIdx = request.fromTabIdx; 
    
    var $main = $('#main');
    
@ -185,7 +187,11 @@ $(function(){
    	})
    	
    	$('#backBtn').on('click',function() {
    		history.go(-1);
    		if(from == 'tab') {
    			top.toPrePrescriptionTab && top.toPrePrescriptionTab()
    		} else {
    			history.go(-1);
    		}
    	})
    	
    	$('#adjustReason').on('click','li',function() {

+ 22 - 11
js/buz/prescription-tabs.js

@ -10,17 +10,19 @@ var request = getRequest(),
var docInfo = window.localStorage.getItem("docInfo");
docInfo = JSON.parse(docInfo);
var fromTabIdx = tab; // 记录前一个Tab索引,用于返回按钮
//初始tab的链接
var links = [{
    url: 'prescription-consulting.html?sessionId='+sessionId,
    url: 'prescription-consulting.html?from=tab&sessionId='+sessionId,
    name: '咨询',
    class: ''
},{
    url: 'prescription-detail.html?code='+prescriptionCode,
    url: 'prescription-detail.html?from=tab&code='+prescriptionCode,
    name: '续方详情',
    class: ''
},{
    url: 'order-tracking.html?code='+prescriptionCode,
    url: 'order-tracking.html?from=tab&code='+prescriptionCode,
    name: '订单跟踪',
    class: '',
},{
@ -32,11 +34,11 @@ var links = [{
    name: '检查检验',
    class: ''
},{
    url: 'jw-prescription-info.html?code='+jwCode+'&patient='+patiCode,
    url: 'jw-prescription-info.html?from=tab&code='+jwCode+'&patient='+patiCode,
    name: '诊断/处方',
    class: ''
},{
    url: 'prescription-list.html?teamCode='+teamCode+'&patient='+patiCode,
    url: 'prescription-list.html?from=tab&teamCode='+teamCode+'&patient='+patiCode,
    name: '历史续方',
    class: ''
}];
@ -63,13 +65,22 @@ function initPage(){
    $("#tabs").on('click', 'a', function(){
        var $this = $(this),
            $li = $this.parent();
        fromTabIdx = $("#tabs li.active").index();  
        $li.siblings().removeClass("active");
        $li.addClass("active");
        tab = $this.data('index');
        parent.document.getElementById('main').src = links[tab].url;
        parent.document.getElementById('main').src = links[tab].url+'&from=tab';
    })
}
function toPrePrescriptionTab() {
	if(fromTabIdx!=null && fromTabIdx != undefined) {
		$("#tabs li").eq(fromTabIdx).find('a').trigger('click')
	}
}
top.toPrePrescriptionTab = toPrePrescriptionTab
function getPrescriptionInfo(){
    patiCode = sessionId.split("_")[0];
    consultCode = sessionId.split("_")[1];
@ -111,15 +122,15 @@ function getPrescriptionInfoByCode(){
function updateLinkInfo(){
    links = [{
        url: 'prescription-consulting.html?sessionId='+sessionId,
        url: 'prescription-consulting.html?from=tab&sessionId='+sessionId,
        name: '咨询',
        class: ''
    },{
        url: 'about:blank',
        url: 'prescription-detail.html?from=tab&code='+prescriptionCode,
        name: '续方详情',
        class: ''
    },{
        url: 'order-tracking.html?code='+prescriptionCode,
        url: 'order-tracking.html?from=tab&code='+prescriptionCode,
        name: '订单跟踪',
        class: '',
    },{
@ -131,11 +142,11 @@ function updateLinkInfo(){
        name: '检查检验',
        class: ''
    },{
        url: 'jw-prescription-info.html?code='+jwCode+'&patient='+patiCode,
        url: 'jw-prescription-info.html?from=tab&code='+jwCode+'&patient='+patiCode,
        name: '诊断/处方',
        class: ''
    },{
        url: 'prescription-list.html?teamCode='+teamCode+'&patient='+patiCode,
        url: 'prescription-list.html?from=tab&teamCode='+teamCode+'&patient='+patiCode,
        name: '历史续方',
        class: ''
    }];