补充订单跟踪页面关于快递跟踪信息的显示问题

js/api-service.js

@@ -9,6 +9,7 @@
		
	} else { // 测试环境配置
        server = "http://172.19.103.88:9092/wlyy/"
        // server = "http://192.168.131.127:8060/"; //逸祥
	    // server = "http://192.168.131.24:8080/"; //仕杰
        imserver = "http://172.19.103.88:3000/api/v2";
        socketUrl = "http://172.19.103.88:3000";
@@ -19,11 +20,20 @@
    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":4821,"uid":"zbqD201703150228","imei":"864394010176834","token":"73f5ace5c7d4cdb811f743902fd705d9","platform":2,"hospital":"3502050100"}; 
    //userAgent = JSON.stringify(userAgent);
     
	}
    // userAgent = JSON.stringify(userAgent);
    
    if(userAgent) {
        try{
            userAgent = JSON.parse(userAgent)
        }catch(e){
            location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
        }
    } else {
        location.replace(loginUrl+'?redirect_url='+encodeURIComponent(location.href))
    }
	
	function httpGet(url,options) {
		//发送ajax请求

js/buz/order-tracking.js

@@ -60,8 +60,6 @@ function getOrderFollow(){
        }
    });
}
//获得健管师列表
@@ -122,11 +120,48 @@ function queryParams2(params) {
    };
}
function getExpressInfo(){
    var params = {
        prescriptionCode: prescriptionCode
    };
    orderAPI.getOrderExpressInfo({data: params}).then(function(res){
        if(res.status == 200){
            var html = template("expressInfo_tmp", res.data);
            $("#expressInfo").empty().append(html);
        }else{
        }
    });
}
function getExpressRouteInfo(){
    var params = { prescriptionCode: prescriptionCode};
    orderAPI.getSfRouteService({data: params}).then(function(res){
        if(res.status == 200){
            var list = _.map(res.data.list, function(o){
                o.statusName = o.acceptRemark;
                o.createTime = o.acceptTime;
                return o;
            });
            var html = tempalte("flow_tmp", {list: list});
            $("#expressLogs").empty().append("flow_tmp");
        }else{
        }
    });
}
function showOrderFollow(){
    $("#myModal").modal("toggle");
    getOrderFollow();
}
function showExpressFollow(){
    $("#expressModal").modal('toggle');
    getExpressInfo();
    getExpressRouteInfo();
}
function bindEvents(){
    $(".btn-1").on('click', function(){
        $('#docModal').modal('toggle');

js/buz/prescription-tabs.js

@@ -75,6 +75,7 @@ function getPrescriptionInfo(){
    consultingAPI.getPrescriptionInfo({data: params}).then(function(res){
        if(res.status == 200){
            prescriptionCode = res.data.code;
            jwCode = res.data.jwCode;
            updateLinkInfo();
            if(status<50){ //支付成功前不会有订单记录
                links[2].class="hidden";
@@ -108,7 +109,7 @@ function updateLinkInfo(){
        name: '检查检验',
        class: ''
    },{
        url: 'about:blank',
        url: 'jw-prescription-info.html?code='+jwCode+'&patitent='+patiCode,
        name: '诊断/处方',
        class: ''
    },{

js/order-api.js

@@ -73,6 +73,12 @@
        },
        getOrderFollow: function(data){
            return APIService.httpGet('doctor/prescriptionlog/orderFollow', data);
        },
        getSfRouteService: function(data){
            return APIService.httpPost('doctor/sfexpress/sfrouteservice', data);
        },
        getOrderExpressInfo: function(data){
            return APIService.httpGet('doctor/sfexpress/sfgetorderinfoservice', data);
        }
    };

order-tracking.html

@@ -71,6 +71,32 @@
        </div>
    </div>
    <!-- 快递信息 -->
    <div class="modal fade" id="expressModal" tabindex="-1" role="dialog" aria-labelledby="expressModalLabel">
        <div class="modal-dialog" role="document">
        <div class="modal-content">
            <div class="modal-header">
                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                <h4 class="modal-title" id="expressModalLabel">
                    <img src="img/shezi_tankuang_icon.png" class="mr10">订单跟踪详情
                </h4>
            </div>
            <div class="modal-body">
                <div class="container" style="width: 100%;" id="expressInfo">
                    
                </div>
                <div class="straight-line"></div>
                <ul class="s-list" id="expressLogs">
                </ul>
            </div>
            <div class="modal-footer" style="text-align: center;">
                <button type="button" class="btn btn-success" data-dismiss="modal">确定</button>
            </div>
        </div>
        </div>
    </div>
    <!-- 分配健管师Modal -->
    <div class="modal fade" id="docModal" tabindex="-1" role="dialog" aria-labelledby="docModalLabel">
        <div class="modal-dialog" role="document">
@@ -180,7 +206,7 @@
            </div>
            <div class="col-xs-6">
                <span class="c-999">快递单号：</span>
                <span>{{mailno}}</span>
                <a class="c-12b7f5" onclick="showExpressFollow()">{{mailno}}</a>
            </div>
        </div>
        <div class="row mtb5">
@@ -272,6 +298,29 @@
    {{/each}}
    </script>
    <script type="text/html" id="expressInfo_tmp">
        <div class="row">
            <div class="col-xs-6">
                <span class="c-999">物流状态：</span>
                <span>{{expressName}}</span>
            </div>
            <div class="col-xs-6">
                <span class="c-999">承运来源：</span>
                <span>{{expressName}}</span>
            </div>
        </div>
        <div class="row">
            <div class="col-xs-6">
                <span class="c-999">运单编号：</span>
                <span>{{expressMailNo}}</span>
            </div>
            <div class="col-xs-6">
                <span class="c-999">官方电话：</span>
                <span>{{expressPhone}}</span>
            </div>
        </div>
    </script>
    <script src="js/jquery.min.js?v=2.1.4"></script>
    <script src="js/bootstrap.min.js?v=3.3.6"></script>
    <script src="js/plugins/metisMenu/jquery.metisMenu.js"></script>
@@ -285,6 +334,7 @@
    <script src="js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
    <script src="js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
    <script src="js/es6-promise.js"></script>
    <script src="js/underscore.js"></script>
    <script src="js/util.js"></script>
    <script src="js/template.js"></script>
    <script src="js/api-service.js"></script>

prescription-tabs.html

@@ -45,7 +45,8 @@
        {{/each}}
        </script>
    <script src="js/jquery.min.js?v=2.1.4"></script>
    <!-- <script src="js/bootstrap.min.js?v=3.3.6"></script> -->
    <script src="js/bootstrap.min.js?v=3.3.6"></script>
    <script src="js/plugins/toastr/toastr.min.js"></script>
    <script src="js/template.js"></script>
    <script src="js/util.js"></script>
    <script src="js/api-service.js"></script>