il y a 3 ans · fedb4e26bd
--- a/src/main/java/com/caimei/www/controller/BaseController.java
+++ b/src/main/java/com/caimei/www/controller/BaseController.java
@@ -23,6 +23,8 @@ import java.util.List;
 
				 public class BaseController {
			
 
				 	@Value("${caimei.coreServer}")
			
 
				 	private String coreServer;
			
 
				+	@Value("${caimei.zplmDomain}")
			
 
				+	private String zplmDomain;
			
 
				     /** 打包时间 */
			
 
				     @Value("${caimei.siteEnv}")
			
 
				     private String siteEnv;
			
@@ -56,6 +58,8 @@ public class BaseController {
 
				 	    model.addAttribute("version", buildTime);
			
 
				 		// spi服务器地址
			
 
				 		model.addAttribute("coreServer", coreServer);
			
 
				+		// zplm服务器地址
			
 
				+		model.addAttribute("zplmDomain", zplmDomain);
			
 
				 		// 搜索热门关键字
			
 
				 		List<String> searchHotWord = baseService.getSearchHotWord();
			
 
				 		model.addAttribute("searchHotWord", searchHotWord);
			
--- a/src/main/resources/config/dev/application-dev.yml
+++ b/src/main/resources/config/dev/application-dev.yml
@@ -60,7 +60,8 @@ caimei:
 
				   imageDomain: https://img-b.caimei365.com
			
 
				   wwwDomain: http:localhost:8009
			
 
				   destPath: classpath:/
			
 
				-
			
 
				+  # 正品联盟（临时配置）
			
 
				+  zplmDomain: http://zp-b.caimei365.com
			
 
				 
			
 
				 #DFS配置
			
 
				 fdfs:
			
--- a/src/main/resources/config/prod/application-prod.yml
+++ b/src/main/resources/config/prod/application-prod.yml
@@ -54,7 +54,8 @@ caimei:
 
				   imageDomain: https://img.caimei365.com
			
 
				   wwwDomain: https://www.caimei365.com
			
 
				   destPath: /mnt/newdatadrive/data/runtime/h5-instance/static/www
			
 
				-
			
 
				+  # 正品联盟（临时配置）
			
 
				+  zplmDomain: http://zp.caimei365.com
			
 
				 
			
 
				 #DFS配置
			
 
				 fdfs:
			
--- a/src/main/resources/static/js/activity/attestation.js
+++ b/src/main/resources/static/js/activity/attestation.js
@@ -21,15 +21,9 @@ var orderPage = new Vue({
 
				             }
			
 
				         ],
			
 
				         suppileData:[
			
 
				-            {   logo:'/img/activity/attestation/1.jpg' , appId: 'abcdefg', name: '上海品辉医疗科技有限公司官方授权'},
			
 
				-            {   logo:'/img/activity/attestation/2.jpg' },
			
 
				-            {   logo:'/img/activity/attestation/3.jpg' },
			
 
				-            // {   logo:'/img/activity/attestation/4.jpg' },
			
 
				-            // {   logo:'/img/activity/attestation/5.jpg' },
			
 
				-            // {   logo:'/img/activity/attestation/6.jpg' },
			
 
				-            // {   logo:'/img/activity/attestation/7.jpg' },
			
 
				-            // {   logo:'/img/activity/attestation/8.jpg' }
			
 
				-
			
 
				+            {   logo:'/img/activity/attestation/1.jpg' , appId: 'shanghaipinhuiyiliao', name: '上海品辉医疗科技有限公司官方授权'},
			
 
				+            {   logo:'/img/activity/attestation/2.jpg' , appId: '', name: '认证通'},
			
 
				+            {   logo:'/img/activity/attestation/3.jpg' , appId: '', name: '认证通'},
			
 
				         ]
			
 
				     },
			
 
				     computed: {
			
@@ -38,7 +32,7 @@ var orderPage = new Vue({
 
				     methods: {
			
 
				         handleClick: function(data){
			
 
				             if(!data.appId) return;
			
 
				-            window.localStorage.setItem('approveAppId', data.appid);
			
 
				+            window.localStorage.setItem('approveAppId', data.appId);
			
 
				             window.localStorage.setItem('approveIframeName', data.name);
			
 
				             window.open('/approve-iframe.html');
			
 
				         }
			
--- a/src/main/resources/templates/activity/approveIframe.html
+++ b/src/main/resources/templates/activity/approveIframe.html
@@ -1,5 +1,6 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
			
 
				+      xsi:schemaLocation="https://www.thymeleaf.org ">
			
 
				 <head>
			
 
				     <meta charset="UTF-8"/>
			
 
				     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
			
@@ -51,6 +52,7 @@
 
				     </style>
			
 
				 </head>
			
 
				 <body>
			
 
				+<input type="hidden" th:value="${zplmDomain}" id="zplmDomain">
			
 
				 <div class="iframe" id="iframe">
			
 
				     <iframe :src="resultSrc" frameborder="0"></iframe>
			
 
				 </div>
			
@@ -63,14 +65,14 @@
 
				         },
			
 
				         computed: {
			
 
				             resultSrc: function () {
			
 
				-                // http://zp.caimei365.com/#/pages/approve/index
			
 
				-                // http://zp-b.caimei365.com/#/pages/approve/index
			
 
				-                return `http://zp-b.caimei365.com/#/pages/approve/index?appId=${this.appId}`
			
 
				+                var zplmDomain = document.querySelector('#zplmDomain').value;
			
 
				+                return zplmDomain + '/#/pages/entry/auth?appId=' + this.appId;
			
 
				+                // return `http://localhost:8081/#/pages/entry/auth?appId=${this.appId}`
			
 
				             }
			
 
				         },
			
 
				         created: function () {
			
 
				             this.appId = window.localStorage.getItem('approveAppId');
			
 
				-            const title = window.localStorage.getItem('approveIframeName');
			
 
				+            var title = window.localStorage.getItem('approveIframeName');
			
 
				             window.document.title = title;
			
 
				         }
			
 
				     }).$mount('#iframe')
			
--- a/src/main/resources/templates/activity/attestation.html
+++ b/src/main/resources/templates/activity/attestation.html
@@ -8,6 +8,7 @@
 
				     <template th:replace="components/analysis"></template>
			
 
				 </head>
			
 
				 <body>
			
 
				+<input type="hidden" th:value="${zplmDomain}" id="zplmDomain">
			
 
				 <!-- 引用头部 -->
			
 
				 <template th:replace="components/header"></template>