Browse Source

Merge remote-tracking branch 'origin/master'

yfh 1 day ago
parent
commit
21072bcc04

+ 1 - 0
fs-service/src/main/java/com/fs/his/config/AgreementConfig.java

@@ -10,4 +10,5 @@ public class AgreementConfig implements Serializable {
     String userPrivacy;
     String userHealth;
     String vipService;
+    String vipAutomaticService;
 }

+ 12 - 0
fs-user-app/src/main/java/com/fs/app/controller/H5Controller.java

@@ -64,4 +64,16 @@ public class H5Controller
     }
 
 
+    @GetMapping("/vipAutomaticService")
+    public ModelAndView vipAutomaticService( )
+    {
+        String json=configService.selectConfigByKey("his.agreementConfig");
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
+        ModelAndView mv=new ModelAndView();
+        mv.addObject("vipAutomaticService", config.getVipAutomaticService());
+        mv.setViewName("vipAutomaticService");
+        return mv;
+    }
+
+
 }

+ 21 - 0
fs-user-app/src/main/resources/templates/vipAutomaticService.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+    <title >会员自动续费服务协议</title>
+    <link  rel="stylesheet"/>
+    <style>
+        body{
+            background-color:#F8F8F8;
+        }
+    </style>
+<body>
+<div th:utext="${vipAutomaticService}" ></div>
+<script th:inline="javascript">
+
+</script>
+
+</body>
+</html>