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

src/main/resources/static/css/activity/attestation.css

@@ -290,10 +290,10 @@ li{list-style:none}
     .section_main.ten .section_content .section_li:nth-child(2n) { margin-right: 0}
     .section_main.ten .section_content .section_li .logo{ width: 12.9vw;height: 12.9vw;margin-bottom: 3.3vw;border-radius: 50%; }
     .section_main.ten .section_content .section_li .name{ font-size: 3.6vw; color: #fff }
-    .section_main.ten .section_content .section_li:nth-child(1){background-image: url("/img/activity/attestation/section_bg_club_01.png") }
-    .section_main.ten .section_content .section_li:nth-child(2){background-image: url("/img/activity/attestation/section_bg_device_01.png") }
-    .section_main.ten .section_content .section_li:nth-child(3){background-image: url("/img/activity/attestation/section_bg_club_02.png") }
-    .section_main.ten .section_content .section_li:nth-child(4){background-image: url("/img/activity/attestation/section_bg_device_02.png") }
+    .section_main.ten .section_content .section_li:nth-child(1){background-image: url("/img/activity/attestation/section_bg_device_01.png") }
+    .section_main.ten .section_content .section_li:nth-child(2){background-image: url("/img/activity/attestation/section_bg_device_02.png") }
+    /*.section_main.ten .section_content .section_li:nth-child(3){background-image: url("/img/activity/attestation/section_bg_club_02.png") }*/
+    /*.section_main.ten .section_content .section_li:nth-child(4){background-image: url("/img/activity/attestation/section_bg_device_02.png") }*/
 
     /*侧边栏-联系我们*/
     .section-tel{width: 52px;height: 92px;position: fixed;right: 0;top: 50%;z-index: 99;border-radius: 2px;-webkit-box-shadow: 0px 2px 12px 0px rgba(43, 43, 43, 0.1);box-shadow: 0px 2px 12px 0px rgba(43, 43, 43, 0.1);}

src/main/resources/static/css/supplier-center/article/article-edit.css

@@ -2,6 +2,7 @@
 .hide-upload .el-upload{display:none}
 .cm-label{margin-right:24px}
 .cm-label em{color:#f56c6c;margin-right:4px}
+.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.right{ width: auto !important; }
 
 @media screen  and (min-width: 768px){
 .article-edit .top-tip{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:60px;text-align:center;font-size:12px;line-height:20px;color:#E15616;background:-webkit-gradient(linear,left top,right top,from(#FFFFFF),color-stop(50%,rgba(225,86,22,0.1)),to(#FFFFFF));background:-o-linear-gradient(left,#FFFFFF 0%,rgba(225,86,22,0.1) 50%,#FFFFFF 100%);background:linear-gradient(90deg,#FFFFFF 0%,rgba(225,86,22,0.1) 50%,#FFFFFF 100%)}

src/main/resources/static/css/supplier-center/encyclopedia/edit-page-style.css

@@ -1,3 +1,4 @@
+.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.right{ width: auto !important; }
 
 .cm-label{margin-right:24px}
 .cm-label em{color:#f56c6c;margin-right:4px}

src/main/resources/static/js/activity/attestation.js

@@ -8,32 +8,57 @@ new Vue({
             { icon:'/img/activity/attestation/section_icon_4.png', text:'更快更专业'  }
         ],
         //认证通合作伙伴
-        suppileData:[
-            { logo:'/img/activity/attestation/1.jpg', appId: 'wxdef0c3c369ff7013', name: '上海品辉医疗科技有限公司官方授权', title: '上海品辉医疗科技有限公司', type: 'home'},
-            { logo:'/img/activity/attestation/2.jpg', appId: '', name: '认证通', title: '科医人医疗激光设备贸易公司', type: 'home'},
-            { logo:'/img/activity/attestation/3.jpg', appId: 'ldm', name: '认证通', title: '广州埃墨莉素生物科技有限公司', type: 'home'},
+        suppileData: [
+            {
+                logo: '/img/activity/attestation/1.jpg',
+                name: '上海品辉医疗科技有限公司',
+                entryRoute: '/62/app',
+                secondRoute: ''
+            },
+            {
+                logo: '/img/activity/attestation/2.jpg',
+                name: '科医人医疗激光设备贸易公司',
+                entryRoute: '',
+                secondRoute: ''
+            },
+            {
+                logo: '/img/activity/attestation/3.jpg',
+                name: '广州埃墨莉素生物科技有限公司',
+                entryRoute: 'https://wangdian.skinovachina.com',
+                secondRoute: '',
+                redirect: 'https://wangdian.skinovachina.com'
+            },
         ],
         // 认证通快捷入口
         firstEntryList: [
-             // { logo: '/img/activity/attestation/1.jpg', appId: 'wxdef0c3c369ff7013', name: '品辉机构认证', title: '品辉机构认证' },
-            { logo: '/img/activity/attestation/shuishu.jpg', appId: 'wxdef0c3c369ff7013', name: '水素水设备认证', title: '水素水设备认证', type: 'device' },
-            // { logo: '/img/activity/attestation/3.jpg', appId: '', name: 'LDM机构认证', title: 'LDM机构认证' },
-            { logo: '/img/activity/attestation/3.jpg', appId: 'ldm', name: 'LDM设备认证', title: 'LDM设备认证' , type: 'club'},
+            {
+                logo: '/img/activity/attestation/shuishu.jpg',
+                name: '水素水设备认证',
+                entryRoute: '/62/app',
+                secondRoute: '/approve/device?id=18'
+            },
+            {
+                logo: '/img/activity/attestation/3.jpg',
+                name: 'LDM设备认证',
+                entryRoute: '',
+                secondRoute: '',
+                redirect: 'https://wangdian.skinovachina.com'
+            },
         ]
     },
     methods: {
-        handleClick: function (data, type) {
-            if (!data.appId) {
+        handleClick: function (data) {
+            if(data.redirect){
+                window.open(data.redirect, '_blank')
+                return
+            }
+            if (!data.entryRoute) {
                 this.popupVisiable = true;
                 return false
             }
-            if (data.type === 'device') {
-                window.open(`https://zp.caimei365.com/#/approve/device?appId=${data.appId}`);
-            } else if(data.type === 'club'){
-                window.open(`https://zp.caimei365.com/#/approve/club?appId=${data.appId}`);
-            } else {
-                window.open(`https://zp.caimei365.com/#/home?appId=${data.appId}`);
-            }
+            // 将要跳转的链接
+            var baseUrl = 'https://zp-b.caimei365.com' + data.entryRoute + data.secondRoute
+            window.open(baseUrl, '_blank')
         }
     }
 }).$mount('#attestation');

src/main/resources/static/js/product/alliance-page.js

@@ -100,7 +100,19 @@ var zplm = new Vue({
         // 获取授权信息
         fetchProductAuthInfo: function fetchProductAuthInfo() {
             var that = this;
-            ProductApi.GetAuthProductDeatil({ productId: that.productId }, function (res) {
+            var data = {productId:that.productId}
+            $.ajax({
+                url: 'https://zplma-b.caimei365.com/wx/auth/product/details',
+                data: data,
+                xhrFields: {//此处为跨域后台保持session一致,切勿删除!!!
+                    withCredentials: true
+                },
+                type: 'GET',
+                dataType: "json",
+                async: false,
+                // contentType: contentType,
+                contentType: 'application/json;charset=UTF-8',
+            }).then(res => {
                 // 获取授权信息失败
                 if (res.code) {
                     that.isRequest = false;
@@ -109,7 +121,7 @@ var zplm = new Vue({
                 // 获取授权信息成功
                 that.productAuthInfo = res.data;
                 that.isRequest = false;
-            });
+            })
             setTimeout(function(){
                 if(that.isRequest){
                     that.isRequest = false;

src/main/resources/static/js/product/qualityauthorize.js

@@ -40,7 +40,20 @@ var qualityAuthorize = new Vue({
         //获取商品参数对象
         initParams:function(){
            var _that = this;
-           ProductApi.GetAuthProductDeatil({productId:_that.productId},function(res){
+            var NODE_ENV_BASE_URL = $("#coreServer").val();
+            var data = {productId:_that.productId}
+            $.ajax({
+                url: NODE_ENV_BASE_URL + '/wx/auth/product/details',
+                data: data,
+                xhrFields: {//此处为跨域后台保持session一致,切勿删除!!!
+                    withCredentials: true
+                },
+                type: 'GET',
+                dataType: "json",
+                async: false,
+                // contentType: contentType,
+                contentType: 'application/json;charset=UTF-8',
+            }).then(res =>{
                 if(res.code === 0){
                     _that.parameters = res.data;
                     console.log(_that.parameters)
@@ -49,11 +62,21 @@ var qualityAuthorize = new Vue({
                     _that.message = res.msg;
                     _that.isLoading = true;
                 }
-                // else{
-                //     //如果该产品不存在，跳转到404页面
-                //     window.location.href = '/404.html'
-                // }
-           });
+            })
+           // ProductApi.GetAuthProductDeatil({productId:_that.productId},function(res){
+           //      if(res.code === 0){
+           //          _that.parameters = res.data;
+           //          console.log(_that.parameters)
+           //          _that.isLoading = true;
+           //      }else{
+           //          _that.message = res.msg;
+           //          _that.isLoading = true;
+           //      }
+           //      // else{
+           //      //     //如果该产品不存在，跳转到404页面
+           //      //     window.location.href = '/404.html'
+           //      // }
+           // });
         },
         // 代理声明弹出框
         openStatementDialog:function(flag){

src/main/resources/templates/activity/attestation.html

@@ -26,9 +26,9 @@
                     <h1>认证通快捷入口</h1>
                 </div>
                 <div class="section_content clear">
-                    <div class="section_li" v-for="(data , index) in firstEntryList" @click="handleClick(data,1)">
+                    <div class="section_li" v-for="(data , index) in firstEntryList" @click="handleClick(data)">
                         <img class="logo" :src="data.logo" >
-                        <div class="name" v-text="data.title"></div>
+                        <div class="name" v-text="data.name"></div>
                     </div>
                 </div>
             </div>
@@ -39,16 +39,17 @@
                     <h1>他们都在用认证通<span>（排名不分先后顺序）</span></h1>
                 </div>
                 <div class="section_content clear">
-                    <div class="section_li" v-for="(data , index) in suppileData" @click="handleClick(data,2)">
+                    <div class="section_li" v-for="(data , index) in suppileData" @click="handleClick(data)">
                         <img class="logo" :src="data.logo" >
                         <div class="content">
                             <span class="icon-marks"></span>
-                            <div class="name" v-text="data.title"></div>
+                            <div class="name" v-text="data.name"></div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+<!--        1-->
         <div class="section_main one">
             <div class="inner">
                 <div class="title">

src/main/resources/templates/document/components/beautyIndustry-footer.html

@@ -18,9 +18,7 @@
         <p>
             <span>Copyright © 2015-2022 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美网络信息有限公司</span>
             <span>
-                <!-- CNZZ统计 start -->
-                <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1279558759'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279558759%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script><span id="cnzz_stat_icon_1279558759"><a href="https://www.cnzz.com/stat/website.php?web_id=1279558759" target="_blank" title="站长统计"><img border="0" hspace="0" vspace="0" src="https://icon.cnzz.com/img/pic.gif"></a></span><script src="https://s9.cnzz.com/z_stat.php?id=1279558759&amp;show=pic" type="text/javascript"></script><script src="https://c.cnzz.com/core.php?web_id=1279558759&amp;show=pic&amp;t=z" charset="utf-8" type="text/javascript"></script>
-            <!-- CNZZ统计 start -->
+                <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1279558759'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279558759%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script>
             </span>
         </p>
     </div>

src/main/resources/templates/product/alliance-page.html

@@ -10,7 +10,6 @@
 		<link th:href="@{/css/product/alliance-page.css(v=${version})}" rel="stylesheet" type="text/css">
 	</head>
 	<body>
-	    <input type="hidden" th:value="${coreServer}" id="coreServer">
 		<div id="zplm" v-cloak v-loading="isRequest">
 			<template v-if="!isRequest && !errorMessage">
 				<!-- 顶部 -->