Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

api/http-request.js

@@ -28,7 +28,7 @@
        socketUrl = "http://172.19.103.88:3000";
//      server = "http://192.168.131.154:8080/"
        articleServer="http://172.19.103.88:9092/wlyy/"
//      server = "http://192.168.131.130:8080/";
     server = "http://192.168.131.130:8080/";
//		server = "http://192.168.131.123:8080/"; // 明芬
//      server = "http://192.168.131.127:8060/"; //逸祥
//      server = "http://192.168.131.24:8080/"; //仕杰

app/rehabilitation/js/health_control.js

@@ -192,15 +192,13 @@ layui.use('element', function () {
                        vm.docInfo = JSON.parse(window.localStorage.getItem('wlyyAgent'))
                        vm.doctorType= vm.docInfo.doctorType
                        if(vm.doctorType==1){
                        if(vm.doctorType!==1){
                            $(".neironglef>button").attr('disabled',"true")
                            $(".neironglef>button").addClass("falsebutton")
                            $(".neironglef>button").css("color","white")
                            }else{
                                $(".stopBtn").attr('disabled',"true")
                                $(".stopBtn").addClass("falsebutton")
                            $(".stopBtn").attr('disabled',"true")
                            $(".stopBtn").addClass("falsebutton")
                            }
                        
                      
                    } else {
@@ -309,18 +307,8 @@ layui.use('element', function () {
                location.href="../../recover/html/new_recover.html"
            },
            checkPlan:function(data){
                layer.open({
                    type: 2,
                    area: ['600px', '650px'],
                    shade: 0.5,
                    title: '服务项目内容',
                    fixed: true, //不固定
                    maxmin: true,
                    closeBtn:1,
                    shift: 5,
                    shadeClose: false, //点击遮罩关闭层
                    content: '../../rehabilitation/html/service_item_content.html?planids='+data.id
                  });
                location.href = "../../rehabilitation/html/rehabilitation_management.html?planId=" + data.id
            }