chao 4 år sedan
förälder
incheckning
af920cb16a

+ 1 - 1
src/main/resources/config/dev/application-dev.yml

@@ -53,7 +53,7 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境,(2:正式环境,1:测试环境,0:开发环境)
-  spiServer: http://192.168.2.68:8008
+  spiServer: http://192.168.2.75:8008
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

+ 0 - 0
src/main/resources/templates/article/components/footer.html → src/main/resources/templates/article/components/article-footer.html


+ 0 - 0
src/main/resources/templates/article/components/header.html → src/main/resources/templates/article/components/article-header.html


+ 18 - 0
src/main/resources/templates/article/components/article-link.html

@@ -0,0 +1,18 @@
+<meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, account-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="cache-control" content="no-cache">
+    <meta http-equiv="expires" content="0">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta http-equiv="Cache-Control" content="no-transform " />
+    <link rel="shortcut icon" th:href="@{/favicon.png}" type="image/x-icon"/>
+    <link rel="bookmark" th:href="@{/favicon.png}" type="image/x-icon"/>
+    <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
+    <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/article/article.css(v=${version})}" rel="stylesheet" type="text/css">
+    <!--百度统计 start-->
+    <script th:if="${siteEnv}==2">var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src = "https://hm.baidu.com/hm.js?ccdb07ae255aa2a1d68c7c725a40d99c";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
+    <!--百度统计 end-->

+ 0 - 0
src/main/resources/templates/article/components/sidebar.html → src/main/resources/templates/article/components/article-sidebar.html


+ 6 - 20
src/main/resources/templates/article/detail.html

@@ -2,31 +2,17 @@
 <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 name="viewport" content="width=device-width, account-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <title th:text="${article!=null?article.title:''}+'_采美365网'"></title>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta http-equiv="pragma" content="no-cache">
-    <meta http-equiv="cache-control" content="no-cache">
-    <meta http-equiv="expires" content="0">
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
     <meta http-equiv="keywords" th:content="${article?.keyword}">
-    <meta http-equiv="description" th:content="${article?.recommendContent}" >
-    <meta http-equiv="Cache-Control" content="no-transform " />
-    <link rel="shortcut icon" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link rel="bookmark" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/article/article.css(v=${version})}" rel="stylesheet" type="text/css">
-</head>
+    <meta http-equiv="description" th:content="${article?.recommendContent}">
+    <template th:replace="article/components/article-link"></template>
+ </head>
 <body class="home detailData">
 <input type="hidden" th:value="${articleId}" id="articleId">
 <input type="hidden" th:value="${article?.label}" id="articleLabels">
 <div class="cm-modal"></div>
 <!--导航栏-->
-<template th:replace="article/components/header"></template>
+<template th:replace="article/components/article-header"></template>
 <!--面包屑-->
 <div class="bar">
     <a href="/" target="_blank">首页</a> &gt; <a  th:each="type: *{articleType}" th:if="${typeId}==${type.id}" th:text="${type.name}" href="javascript:void(0);" class="title newTitle"></a>&gt; 正文
@@ -94,9 +80,9 @@
         </div>
     </div>
     <!--侧边栏-->
-    <template th:replace="article/components/sidebar"></template>
+    <template th:replace="article/components/article-sidebar"></template>
 </div>
-<template th:replace="article/components/footer"></template>
+<template th:replace="article/components/article-footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.qrcode.min.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>

+ 4 - 18
src/main/resources/templates/article/list.html

@@ -2,29 +2,15 @@
 <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 name="viewport" content="width=device-width, account-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta http-equiv="pragma" content="no-cache">
-    <meta http-equiv="cache-control" content="no-cache">
-    <meta http-equiv="expires" content="0">
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
     <meta http-equiv="keywords" content="采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美">
     <meta http-equiv="description" content="采美365网——中国美业互联网共享经济平台,中国美业较大的光电美容干货信息平台,提供美容专业线客装产品、美容院消耗品、专业线院装产品、光电美容仪器、光电美容项目交易,同时提供采美公益大讲堂、光电美容干货、光电美容资讯、美业动态等行业信息。采集梦想,美启未来。">
-    <meta http-equiv="Cache-Control" content="no-transform " />
-    <link rel="shortcut icon" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link rel="bookmark" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/article/article.css(v=${version})}" rel="stylesheet" type="text/css">
+    <template th:replace="article/components/article-link"></template>
 </head>
 <body class="home listData">
 <div class="cm-modal"></div>
 <!--导航栏-->
-<template th:replace="article/components/header"></template>
+<template th:replace="article/components/article-header"></template>
 <!--面包屑-->
 <div th:if="${typeId}>0" class="bar">
     <a href="/" target="_blank">首页</a>&gt; <a  th:each="type: ${articleType}" th:if="${typeId}==${type.id}" th:text="${type.name}" href="javascript:void(0);" class="title newTitle"></a>
@@ -96,14 +82,14 @@
         </div>
     </div>
     <!--侧边栏-->
-    <template th:replace="article/components/sidebar"></template>
+    <template th:replace="article/components/article-sidebar"></template>
     <div id="scrollTop">
         <div class="item">
             <span class="toTop icon mIcon">置顶</span>
         </div>
     </div>
 </div>
-<template th:replace="article/components/footer"></template>
+<template th:replace="article/components/article-footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>

+ 2 - 0
src/main/resources/templates/components/head-link.html

@@ -13,4 +13,6 @@
     <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/base.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/base.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <!--百度统计 start-->
     <script th:if="${siteEnv}==2">var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src = "https://hm.baidu.com/hm.js?ccdb07ae255aa2a1d68c7c725a40d99c";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
+    <!--百度统计 end-->

+ 1 - 15
src/main/resources/templates/pay/caimei-pay.html

@@ -2,21 +2,7 @@
 <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>
-    <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width,account-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <meta http-equiv="keywords" content="采美、易耗品商城、光电美容仪器项目、光电中心、皮肤管理中心、光电转型、美容院转型、光电美容">
-    <meta http-equiv="description" content="采美365网——中国美业互联网共享经济平台,中国美业较大的光电美容干货信息平台,提供美容专业线客装产品、美容院消耗品、专业线院装产品、光电美容仪器、光电美容项目交易,同时提供采美公益大讲堂、光电美容干货、光电美容资讯、美业动态等行业信息。采集梦想,美启未来。">
-    <link rel="shortcut icon" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link rel="bookmark" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
-    <link href="/lib/css/viewer.min.css" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/base/base.pc.css(v=${version})}"  rel="stylesheet" type="text/css">
+    <template th:replace="pay/components/pay-link"></template>
     <link th:href="@{/css/pay/caimei-pay.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>

+ 1 - 15
src/main/resources/templates/pay/caimei-paymobile.html

@@ -2,21 +2,7 @@
 <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>
-    <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width,account-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <meta http-equiv="keywords" content="采美、易耗品商城、光电美容仪器项目、光电中心、皮肤管理中心、光电转型、美容院转型、光电美容">
-    <meta http-equiv="description" content="采美365网——中国美业互联网共享经济平台,中国美业较大的光电美容干货信息平台,提供美容专业线客装产品、美容院消耗品、专业线院装产品、光电美容仪器、光电美容项目交易,同时提供采美公益大讲堂、光电美容干货、光电美容资讯、美业动态等行业信息。采集梦想,美启未来。">
-    <link rel="shortcut icon" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link rel="bookmark" th:href="@{/favicon.png}" type="image/x-icon"/>
-    <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
-    <link href="/lib/css/viewer.min.css" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/base/base.pc.css(v=${version})}"  rel="stylesheet" type="text/css">
+    <template th:replace="pay/components/pay-link"></template>
     <link th:href="@{/css/pay/caimei-paymobile.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>

+ 11 - 36
src/main/resources/templates/pay/caimei-starspay.html

@@ -1,44 +1,17 @@
-<%@ page import="com.caimei.utils.SysConfig" %><%--
-  Created by IntelliJ IDEA.
-  User: 828
-  Date: 2018/5/10
-  Time: 10:01
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%
-    request.setAttribute("oldApi", SysConfig.getStringConfig("caimei.api.old"));
-    request.setAttribute("newApi", SysConfig.getStringConfig("caimei.api.new"));
-%>
 <!DOCTYPE html>
+<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="pragma" content="no-cache">
-    <meta http-equiv="cache-control" content="no-cache">
-    <meta http-equiv="expires" content="0">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta http-equiv="keywords" content="采美平台业务包括采美采购商城,采美正品联盟,美业供应链合作,美业平台综合运营,三方项目服务合作,美业信息咨询服务,美业二手市场,医美直播,品牌招商等。其中采购商城包括热门小气泡仪器、皮肤检测,水光仪器,中胚层治疗仪器,激光仪器,射频仪器,超声仪器,微针射频仪器,脱毛仪器、红蓝光,身体塑形溶脂仪器等。产品包括:医美术后修复产品,高端SPA产品,高端院线产品,医美家居护理产品,玻尿酸,动能素,精纯液,填充针剂,线材,消耗品等。">
-    <meta http-equiv="description" content="采美365网,生美医美正品采购服务平台,国内第一家美容行业的B2B平台,具有一,二,三类医疗器械销售资质和进出口资质。聚集全球100多个优质供应商资源,包括医疗、非医疗美容产品和仪器设备,能够一站式满足医疗美容机构、生活美容机构、新兴皮肤管理中心等多样化采购需求。同时提供供应链合作,整合上下游资源,为美容产业的持续前进和发展提出新的解决方案。">
-    <link rel="shortcut icon" href="/web/common/img/favicon.ico" type="image/x-icon">
-    <link rel="stylesheet" href="/web/common/css/reset.css">
-    <link rel="stylesheet" href="/web/login/css/register.css?version=<%=Math.random()%>">
-    <link rel="stylesheet" href="/web/order/css/caimei-starspay.css?version=<%=Math.random()%>">
-    <script src="/web/common/js/tools.js"></script>
-    <script src="/public/3.0/js/lib/layer/layer.min.js"></script>
-    <script src="/web/common/js/common.js?version=<%=Math.random()%>"></script>
-    <script src="/public/3.0/js/lib/vue2.6.11.js"></script>
-    <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
+    <template th:replace="pay/components/pay-link"></template>
+    <link th:href="@{/css/pay/caimei-pay.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="head-wrap">
-    <div class="head clearfix">
-        <div class="fl logo-to-index xf-logo"><img src="/web/order/img/xf-logo@2x.png" alt=""></div>
-        <div class="fl main-thing">星范采购商城</div>
-        <input id="oldApi" value='${oldApi}' type="hidden">
-        <input id="newApi" value='${newApi}' type="hidden">
+    <div class="inner clear">
+        <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
+        <div class="text">生美/医美采购服务平台</div>
+        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>
 <div class="pay-container clearfix" id="payContainer" :class="isRequest ? 'active' : ''">
@@ -144,11 +117,13 @@
         </div>
     </div>
 </div>
+<!--
 <script src="/web/common/js/ajax.service.js?version=<%=Math.random()%>"></script>
 <script src="/web/common/js/api/user.service.js?version=<%=Math.random()%>"></script>
 <script src="/web/common/js/api/utils.service.js?version=<%=Math.random()%>"></script>
 <script src="/web/common/js/api/pay.service.js?version=<%=Math.random()%>"></script>
 <script src="/web/order/js/caimei-pay.js?version=<%=Math.random()%>"></script>
+-->
 
 </body>
 </html>

+ 18 - 0
src/main/resources/templates/pay/components/pay-link.html

@@ -0,0 +1,18 @@
+<meta charset="UTF-8">
+    <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
+    <meta name="viewport" content="width=device-width,account-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta http-equiv="keywords" content="采美、易耗品商城、光电美容仪器项目、光电中心、皮肤管理中心、光电转型、美容院转型、光电美容">
+    <meta http-equiv="description" content="采美365网——中国美业互联网共享经济平台,中国美业较大的光电美容干货信息平台,提供美容专业线客装产品、美容院消耗品、专业线院装产品、光电美容仪器、光电美容项目交易,同时提供采美公益大讲堂、光电美容干货、光电美容资讯、美业动态等行业信息。采集梦想,美启未来。">
+    <link rel="shortcut icon" th:href="@{/favicon.png}" type="image/x-icon"/>
+    <link rel="bookmark" th:href="@{/favicon.png}" type="image/x-icon"/>
+    <link href="/lib/swiper.min.css" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
+    <link href="/lib/jquery-confirm.min.css" rel="stylesheet" type="text/css">
+    <link href="/lib/css/viewer.min.css" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/base.pc.css(v=${version})}"  rel="stylesheet" type="text/css">
+    <!--百度统计 start-->
+    <script th:if="${siteEnv}==2">var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src = "https://hm.baidu.com/hm.js?ccdb07ae255aa2a1d68c7c725a40d99c";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
+    <!--百度统计 end-->