Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-27 fbf6a877aae46e19a8d3c0058cefa3f81c72715f

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html

@@ -114,11 +114,14 @@
                        width: "8%",
                        title: '联系方式'
                    },
                    // {
                    //     field: 'enabled', width: 80,  title: '状态', templet: function (d) {
                    //         return d.hospitalState == 0 ? "试用" : "正式"
                    //     }
                    // },
                    {
                        field: 'orderType', width: 80,  title: '状态', templet: function (d) {
                            if(d.orderType==null){
                                return "";
                            }
                            return d.orderType ? "试用" : "正式"
                        }
                    },
                    {
                        field: 'isScreen',
                        width: "4%",
@@ -223,7 +226,7 @@
                    }
                });
            } else if(layEvent=="health"){
                //充值
                //运动处方服务
                admin.putTempData("t_hospital", data);
                admin.popupCenter({
                    title: '运动处方服务',