ソースを参照

修复认证通页面链接问题。首屏加载问题

xiebaomin 2 年 前
コミット
47c7f4f5ac

+ 9 - 0
src/main/java/com/caimei/www/controller/authorized/AccountController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 public class AccountController extends BaseController {
     /** 登录 */
 	private static final String LOGIN_PATH = "account/login";
+
+    private static final String REGISTER_SUPPLIER_LOGIN = "supplier_login/index";
     /** 注册 */
 	private static final String REGISTER_PATH = "account/register";
 	private static final String REGISTER_SUPPLIER = "account/register-supplier";
@@ -52,6 +54,13 @@ public class AccountController extends BaseController {
         return REGISTER_SUPPLIER;
     }
 
+    /**
+     * 供应商落地页
+     */
+    @GetMapping("/supplier-login/index.html")
+    public String signUpSupplierLogin() {
+        return REGISTER_SUPPLIER_LOGIN;
+    }
 
     /**
      * 注册选择页

+ 6 - 0
src/main/resources/static/css/activity/attestation-new.css

@@ -4,6 +4,9 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
+    [v-cloak] {
+        opacity: 0;
+    }
     .el-carousel__item {
         display: flex;
         justify-content: space-between;
@@ -283,6 +286,9 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
+    [v-cloak] {
+        opacity: 0;
+    }
     .section_banner{width: 100%;height: 42vw;background: url("/img/activity/logo-new/H5-banner_.png");background-size: cover;-webkit-box-sizing: border-box;box-sizing: border-box;padding-top: 11vw;}
     .section_banner h1{font-size: 6.4vw;line-height: 36px;margin-bottom: 4.3vw;text-align: center;color: #FFFFFF;}
     .section_banner p{font-size: 4vw;line-height: 4vw;text-align: center;color: #FFFFFF;}

+ 13 - 0
src/main/resources/static/css/supplier-login/components/loginTop.css

@@ -0,0 +1,13 @@
+#login_header{
+    width: 100vw;
+    height: 10vh;
+    display: flex;
+    justify-content: center;
+}
+#login_header_container{
+    width: 90vw;
+    display: flex;
+    justify-content: space-between;
+    border: 1px solid #ccc;
+    height: 10vh;
+}

+ 0 - 0
src/main/resources/static/css/supplier-login/login.css


+ 2 - 2
src/main/resources/static/js/activity/attestation-new.js

@@ -20,7 +20,7 @@ new Vue({
             {
                 logo: '/img/activity/attestation/10.png',
                 name: '上海禾雅堂科技有限公司',
-                entryRoute: '/15/hty',
+                entryRoute: '/15/hyt',
                 secondRoute: '',
                 redirect: 'http://zprz.hoyabeauty.com'
             },
@@ -85,7 +85,7 @@ new Vue({
                 id: 4,
                 logo: '/img/activity/logo-new/hyt-new.jpg',
                 name: '禾雅堂机构认证',
-                entryRoute: '/15/hty',
+                entryRoute: '/15/hyt',
                 secondRoute: '',
                 // redirect: 'http://zprz.hoyabeauty.com',
                 redirect: '',

+ 1 - 1
src/main/resources/static/js/activity/attestation.js

@@ -20,7 +20,7 @@ new Vue({
             {
                 logo: '/img/activity/attestation/10.png',
                 name: '上海禾雅堂科技有限公司',
-                entryRoute: '/15/hty',
+                entryRoute: '/15/hyt',
                 secondRoute: '',
                 redirect: 'http://zprz.hoyabeauty.com'
             },

+ 9 - 0
src/main/resources/static/js/supplier-login/components/loginTop.js

@@ -0,0 +1,9 @@
+new Vue({
+    el: "#login_header",
+    data() {},
+    computed: {},
+    watch: {},
+    mounted() {
+    },
+    methods: {},
+})

+ 13 - 0
src/main/resources/static/js/supplier-login/login.js

@@ -0,0 +1,13 @@
+new Vue({
+    el: "#login_content",
+    data() {
+
+    },
+    created() {},
+    mounted() {
+        console.log(1234)
+    },
+    watch: {},
+    computed: {},
+    methods: {},
+})

+ 17 - 17
src/main/resources/templates/activity/attestation-new.html

@@ -26,8 +26,8 @@
         <div class="section_main four">
 <!--            <div class="pageNoChangeLeft isActivePage" @click="changePageNoLeft( firstEntryList[0].id!== 1 || isAuthActiveNum !== 0)" v-if="isPC"><</div>-->
 <!--            <div class="pageNoChangeRight isActivePage" @click="changePageNoRight(firstEntryList[0].id === 1)" v-if="isPC">></div>-->
-            <div class="pageNoChangeLeft" :class="isActivePageLeft ? 'isActivePage' : ''" @click="changePageNoLeft" v-if="isPC"><</div>
-            <div class="pageNoChangeRight" :class="isActivePageRight ? 'isActivePage' : ''" @click="changePageNoRight" v-if="isPC">></div>
+            <div class="pageNoChangeLeft" :class="isActivePageLeft ? 'isActivePage' : ''" @click="changePageNoLeft" v-if="isPC" v-cloak><</div>
+            <div class="pageNoChangeRight" :class="isActivePageRight ? 'isActivePage' : ''" @click="changePageNoRight" v-if="isPC" v-cloak>></div>
             <div class="inner">
                 <div class="title">
                     <h1>正品查询快捷入口</h1>
@@ -48,20 +48,20 @@
 <!--                            </div>-->
 <!--                        </div>-->
 <!--                    </div>-->
-                    <el-carousel indicator-position="outside" height="500px" ref="pcSwiper" :autoplay="false">
+                    <el-carousel indicator-position="outside" height="500px" ref="pcSwiper" :autoplay="false" v-if="firstEntryList">
                         <el-carousel-item>
                             <div class="section_li li1" v-for="(item, index) in firstEntryList" :key="index" v-if="index<4" @click="changePageNoLink(index, item)">
                                 <div class="box front">
                                     <img :src="item.logo" alt="" class="icon">
-                                    <h1>{{ item.name }}</h1>
-                                    <p><el-button :plain="true" @click="changePageNoLink(index, item)">立即查看</el-button></p>
+                                    <h1 v-cloak>{{ item.name }}</h1>
+                                    <p><el-button :plain="true" @click="changePageNoLink(index, item)" v-cloak>立即查看</el-button></p>
                                 </div>
                                 <div class="box back">
                                     <div :class="item.className"></div>
                                     <div class="content-box">
                                         <img :src="item.logo" alt="" class="icon">
-                                        <h1>{{ item.name }}</h1>
-                                        <p><el-button @click="changePageNoLink(index, item)" :plain="true" style="border: 1px solid #fff;">立即查看</el-button></p>
+                                        <h1 v-cloak>{{ item.name }}</h1>
+                                        <p><el-button @click="changePageNoLink(index, item)" :plain="true" style="border: 1px solid #fff;" v-cloak>立即查看</el-button></p>
                                     </div>
                                 </div>
                             </div>
@@ -70,15 +70,15 @@
                             <div class="section_li li1" v-for="(item, index) in firstEntryList" :key="index" v-if="index>3" @click="changePageNoLink(index, item)">
                                 <div class="box front">
                                     <img :src="item.logo" alt="" class="icon">
-                                    <h1 :class="isAuthActiveNum === index ? 'isAuthH1' : ''">{{ item.name }}</h1>
-                                    <p><el-button :plain="true" @click="changePageNoLink(index, item)">立即查看</el-button></p>
+                                    <h1 :class="isAuthActiveNum === index ? 'isAuthH1' : ''" v-cloak>{{ item.name }}</h1>
+                                    <p><el-button :plain="true" @click="changePageNoLink(index, item)" v-cloak>立即查看</el-button></p>
                                 </div>
                                 <div class="box back">
                                     <div :class="item.className"></div>
                                     <div class="content-box">
                                         <img :src="item.logo" alt="" class="icon">
-                                        <h1>{{ item.name }}</h1>
-                                        <p><el-button @click="changePageNoLink(index, item)" :plain="true">立即查看</el-button></p>
+                                        <h1 v-cloak>{{ item.name }}</h1>
+                                        <p><el-button @click="changePageNoLink(index, item)" :plain="true" v-cloak>立即查看</el-button></p>
                                     </div>
                                 </div>
                             </div>
@@ -91,17 +91,17 @@
 <!--                    </div>-->
 <!--                </div>-->
                 <div class="section_content" v-if="!isPC">
-                    <div>
+                    <div v-if="firstEntryList">
                         <el-carousel indicator-position="outside" ref="nop" height="600px" :autoplay="false">
-                            <div @touchmove="move($event)" @touchstart="start($event)">
+                            <div @touchmove="move($event)" @touchstart="start($event)" v-if="firstEntryList">
                                 <el-carousel-item>
                                     <div v-for="(item, index) in firstEntryList" :key="item.id" v-if="index < 4" class="authlistH5" @click="changePageNoLink(index, item)">
                                         <div>
                                             <img :src="item.logo" alt="" class="icon">
                                         </div>
-                                        <div>{{item.name}}</div>
+                                        <div v-cloak>{{item.name}}</div>
                                         <div>
-                                            <el-button @click="changePageNoLink(index, item)">立即查看</el-button>
+                                            <el-button @click="changePageNoLink(index, item)" v-cloak>立即查看</el-button>
                                         </div>
                                     </div>
                                 </el-carousel-item>
@@ -110,9 +110,9 @@
                                         <div>
                                             <img :src="item.logo" alt="" class="icon">
                                         </div>
-                                        <div>{{item.name}}</div>
+                                        <div v-cloak>{{item.name}}</div>
                                         <div>
-                                            <el-button @click="changePageNoLink(index, item)">立即查看</el-button>
+                                            <el-button @click="changePageNoLink(index, item)" v-cloak>立即查看</el-button>
                                         </div>
                                     </div>
                                 </el-carousel-item>

+ 8 - 0
src/main/resources/templates/supplier_login/components/loginTop.html

@@ -0,0 +1,8 @@
+<header id="globalHead" xmlns:th="http://www.w3.org/1999/xhtml">
+    <!--顶部导航-->
+    <div id="login_header">
+        <div id="login_header_container">
+
+        </div>
+    </div>
+</header>

+ 37 - 0
src/main/resources/templates/supplier_login/index.html

@@ -0,0 +1,37 @@
+<!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="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=0"/>
+    <title>采美</title>
+    <link rel="canonical" href="https://www.caimei365.com/"/>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/floor.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/index/index_new.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/index/index_new.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/lib/css/swiper-bundle.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-login/login.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-login/components/loginTop.css(v=${version})}" rel="stylesheet" type="text/css">
+    <!--element ui 样式表-->
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"/>
+    <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="supplier_login/components/loginTop"></template>
+<div id="login_content">
+
+</div>
+<!-- 底部区域 end -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmsMixins.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-login/components/loginTop.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-login/login.js(v=${version})}"></script>
+</body>
+</html>