修改

src/main/resources/config/mapping/HomePageMapper.xml

@@ -133,6 +133,7 @@
             DATEDIFF( YEAR, jdrq, SYSDATETIME ( ) ) = 0
         GROUP BY
             destination
+        ORDER BY value desc
     </select>
     <!-- 查询消息提醒 -->
     <select id="getMessageRemid" resultType="Map">

src/main/resources/static/css/Login.css

@@ -2,23 +2,150 @@ html,body{
     overflow: hidden;
     width: 100%;
     height: 100%;
-    background-color: #ccc;
 }
-.login_div{
-    width: 600px;
-    height: 400px;
+#app {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+}
+.n-config-provider {
+    display: flex;
+    flex: 1 1;
+    flex-direction: column;
+}
+main[data-v-04b1a0e0] {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 100vh;
+    background-color: transparent;
+}
+main {
+    min-width: 1024px;
     background-color: #fff;
-    margin: auto;
-    margin-top: 150px;
-    border-radius: 30px;
 }
-.login_font{
-    padding-top: 20px;
-    padding-bottom: 20px;
+.introduce[data-v-77180172] {
+    position: relative;
+    width: 1140px;
+    height: 100vh;
+    background-image: url(https://lidaotech.oss-cn-beijing.aliyuncs.com/test/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20220629165117.png);
+    background-position: right center;
+    background-size: cover;
+    transition: width .3s;
+}
+.logo[data-v-77180172] {
+    position: relative;
+    z-index: 2;
+    display: inline-block;
+    padding: 54px 0 0 74px;
+    transition: margin .3s, padding .3s;
+}
+.logo img[data-v-77180172] {
+    width: 140px;
+}
+.message[data-v-77180172] {
+    position: relative;
+    z-index: 2;
+    width: 100%;
+    padding-left: 280px;
+    margin-top: 226px;
+    color: #fff;
+    transition: margin .3s, padding .3s;
+}
+.message h2[data-v-77180172] {
+    font-size: 30px;
+    letter-spacing: 10px;
+}
+.message h3[data-v-77180172] {
+    margin-top: 18px;
+    font-size: 22px;
+    letter-spacing: 3px;
+}
+.message-list[data-v-77180172] {
+    margin-top: 82px;
+    font-size: 16px;
+    font-weight: 400;
+}
+.message-list li[data-v-77180172]:first-child {
+    margin: 0;
+}
+.message-list li[data-v-77180172] {
+    display: flex;
+    align-items: center;
+    margin-top: 24px;
+    line-height: 1;
+    letter-spacing: 2px;
+}
+.bubble-group[data-v-77180172] {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1;
+    width: 100%;
+    height: 100%;
+}
+.bubble-group li[data-v-77180172]:nth-child(1) {
+    top: 58%;
+    left: 10%;
+    animation-duration: 12s;
+    animation-delay: 0s;
+}
+.bubble-group li[data-v-77180172] {
+    position: absolute;
+    width: 0;
+    height: 0;
+    -webkit-user-select: none;
+    user-select: none;
+    background-color: #fff3;
+    border-radius: 50%;
+    opacity: 0;
+    transition: opacity .5s ease-in-out;
+    animation: bubble-move-77180172 20s infinite;
+}
+.info[data-v-53ab3540] {
+    position: relative;
+    display: flex;
+    flex: 1 1;
+    align-items: center;
+    justify-content: center;
+    height: 100vh;
+    overflow: hidden;
+}
+.lottie[data-v-53ab3540] {
+    position: absolute;
+    top: -540px;
+    right: -160px;
+    z-index: -1;
+    width: 1000px;
+    transform: rotate(45deg) scale(2);
+    transform-origin: center 60%;
+}
+.mobile-logo[data-v-53ab3540] {
+    position: absolute;
+    top: 20px;
+    left: 18px;
+    z-index: 2;
+    display: none;
+}
+.lottie-animation-container {
+    height: 100%;
+    background-color: transparent;
+    overflow: hidden;
+    margin: 0 auto;
+}
+.login[data-v-53ab3540] {
+    position: relative;
+    z-index: 2;
+    width: 430px;
+}
+.login h1[data-v-53ab3540] {
+    margin-bottom: 34px;
+    font-size: 30px;
+    font-weight: 700;
+    line-height: 1;
+    color: #333;
     text-align: center;
-    line-height: 36px;
-    font-size: 28px;
-    font-weight: bold;
+    letter-spacing: 2px;
 }
 .field[data-v-37e40e1d] {
     --icon-group: url("/images/login/denglu.png");
@@ -32,27 +159,11 @@ html,body{
     background-color: #eee;
     border-radius: 27px;
     transition: width .3s;
-    margin-bottom: 20px;
-}
-.el-select {
-    --el-select-border-color-hover: var(--el-border-color-hover);
-    --el-select-disabled-border: var(--el-disabled-border-color);
-    --el-select-font-size: var(--el-font-size-base);
-    --el-select-close-hover-color: var(--el-text-color-secondary);
-    --el-select-input-color: var(--el-text-color-placeholder);
-    --el-select-multiple-input-color: var(--el-text-color-regular);
-    --el-select-input-focus-border-color: var(--el-color-primary);
-    --el-select-input-font-size: 14px;
-}
-.el-select {
-    display: inline-block;
-    position: relative;
-    line-height: 32px;
 }
-.tel-prefix[data-v-37e40e1d] {
-    --el-input-bg-color: pink;
-    width: 70px;
-    background-color: transparent;
+.phone-icon[data-v-37e40e1d] {
+    width: 24px;
+    height: 24px;
+    background: url("/images/login/denglu.png") -10px -10px;
 }
 .field input[data-v-37e40e1d] {
     flex: 1 1;
@@ -65,69 +176,30 @@ html,body{
     background-color: transparent;
     border: unset;
 }
-.field input[data-v-37e40e1d] {
-    flex: 1 1;
-    min-width: 120px;
-    padding: 0 10px;
-    font-size: 16px;
-    line-height: 1;
-    color: #333;
-    letter-spacing: 1px;
-    background-color: transparent;
-    border: unset;
+input, textarea {
+    outline: none;
 }
-.el-input__inner {
-    --el-input-inner-height: calc(32px - 2px);
-    width: 100%;
-    flex-grow: 1;
-    -webkit-appearance: none;
-    color: #606266;
-    font-size: inherit;
-    height: calc(32px - 2px);
-    line-height: calc(32px - 2px);
-    padding: 0;
-    outline: 0;
-    border: none;
-    background: 0 0;
-    box-sizing: border-box;
-}
-.el-select .el-input__inner {
-    cursor: pointer;
+.field[data-v-37e40e1d]:nth-of-type(2) {
+    margin-bottom: 0;
 }
-.el-input__suffix {
-    display: inline-flex;
-    white-space: nowrap;
-    flex-shrink: 0;
-    flex-wrap: nowrap;
-    height: 100%;
-    text-align: center;
-    color: #a8abb2;
-    transition: all .3s;
-    pointer-events: none;
+.login-btn[data-v-53ab3540] {
+    display: block;
+    width: 350px;
+    height: 54px;
+    margin: 22px auto 0;
+    border-radius: 28px;
 }
-.el-input__suffix-inner {
-    pointer-events: all;
-    display: inline-flex;
+.button__component {
+    border-radius: 100000px;
+    background-image: linear-gradient(270deg,#015eea,#00c0fa);
+    color: #fff;
+    border: unset;
+    cursor: pointer;
+    display: flex;
     align-items: center;
     justify-content: center;
+    line-height: 1;
 }
-.el-select .el-input .el-select__caret.el-icon {
-    position: relative;
-    height: inherit;
-    z-index: 2;
-}
-.el-select .el-input .el-select__caret {
-    color: #a8abb2;
-    font-size: 14px;
-    transition: transform .3s;
-    transform: rotate(180deg);
-    cursor: pointer;
-}
-.el-icon svg {
-    height: 1em;
-    width: 1em;
-}
-
 .code-btn[data-v-37e40e1d] {
     min-width: 94px;
     font-size: 16px;
@@ -139,21 +211,42 @@ html,body{
     background-color: transparent;
     border: unset;
 }
-.button__component {
-    border-radius: 100000px;
-    background-image: linear-gradient(270deg,#015eea,#00c0fa);
-    color: #fff;
-    border: unset;
-    cursor: pointer;
+.code-icon[data-v-37e40e1d] {
+    width: 24px;
+    height: 24px;
+    background: url("/images/login/denglu.png") -54px -10px;
+}
+.terms[data-v-37e40e1d] {
     display: flex;
     align-items: center;
     justify-content: center;
+    margin-top: 44px;
+}
+.terms_select {
+    width: 16px;
+    height: 16px;
+    margin-right: 8px;
+    cursor: pointer;
+    border: 2px solid #999;
+    border-radius: 50%;
+    transition: background-color .3s,border-color .3s;
+}
+.terms p[data-v-37e40e1d] {
+    font-size: 16px;
     line-height: 1;
+    color: #666;
+    letter-spacing: 1px;
 }
-.login-btn[data-v-53ab3540] {
-    display: block;
-    width: 350px;
-    height: 54px;
-    margin: 22px auto 0;
-    border-radius: 28px;
+.terms p a[data-v-37e40e1d] {
+    color: #666;
+}
+.terms p span[data-v-37e40e1d] {
+    text-decoration: underline;
+}
+.layui-form-checkbox[lay-skin=primary] i{
+    border-radius: 50%;
+}
+.layui-form-checked[lay-skin=primary] i{
+    border-color: #2789f0!important;
+    background-color: #2789f0;
 }

src/main/resources/static/css/homeIndex.css

@@ -17,10 +17,10 @@ html,body{
 }
 .head_three_block{
     float: left;
-    width: 31%;
+    width: 32%;
     height: 204px;
     border-radius: 10px;
-    margin-right: 30px;
+    margin-right: 27px;
     padding: 30px 0;
 }
 .head_three_block:last-child{
@@ -28,12 +28,15 @@ html,body{
 }
 .quotation_single{
     background-image: url("/images/indeHome/baojiadan.png");
+    background-size: 100% 100%;
 }
 .clinch_a_deal{
     background-image: url("/images/indeHome/chengjiao.png");
+    background-size: 100% 100%;
 }
 .offer_num_div{
     background-image: url("/images/indeHome/baojiadancishu.png");
+    background-size: 100% 100%;
 }
 .head_title_div{
     font-size: 24px;
@@ -111,7 +114,7 @@ html,body{
     margin-bottom: 20px;
 }
 .chart_div{
-    width: 49%;
+    width: 49.5%;
     height: 100%;
     background: #FFFFFF;
     border-radius: 10px;

src/main/resources/static/css/indexHome/index.css

@@ -154,6 +154,10 @@ cite img{
 .check_div span{
     color: #fff!important;
 }
+.check_div .close_button{
+    background: #fff;
+    color: #2d8cf0;
+}
 .close_button{
     width: 13px;
     height: 13px;
@@ -669,4 +673,12 @@ cite img{
 }
 .head_hove li[data-v-2c3b76b8]:hover {
     background-color: #e3e5e7;
+}
+.contact_us{
+    font-size: 18px;
+    font-weight: bold;
+    text-align: right;
+    cursor: pointer;
+    margin-bottom: 10px;
+    color: #5c64ff;
 }

src/main/resources/static/js/Login/index.js

@@ -66,6 +66,10 @@ layui.use(["layer", "form"], function(){
             layer.msg("手机号格式不正确", {icon: 2});
             return false;
         }
+        if($("input[name=termsSelect]").prop("checked") == false){
+            layer.msg("请点击同意协议", {icon: 2});
+            return false;
+        }
         //登录
         $.ajax({
             url: "https://www.tuyatrip.com/api/supplier/updateUser",
@@ -79,7 +83,7 @@ layui.use(["layer", "form"], function(){
                 if(data.msg == "500"){
                     layer.msg(data.errMsg, {icon: 2});
                     return false;
-                } else {
+                } else if(data.msg == "100"){
                     window.location.href="/page/registered/" + tel;
                 }
                 localStorage.setItem("token", data.data.token);

src/main/resources/static/js/huanxin.js

@@ -39,7 +39,7 @@ conn.listen({
                     "                                            title=\""+ userMap.nickname +"\">"+ userMap.nickname +"</span><span>"+ format(parseInt(message.time)).split("|")[1] +"</span></p>\n" +
                     "                                        <p title=\""+ message.data  +"\">"+ message.data +"</p></div>\n" +
                     "                                </div>");
-            })
+            });
         }
         if(!clickMessageType){
             countSum++;

src/main/resources/static/js/index/function.js

@@ -147,15 +147,21 @@ function chinaMapLoad(data){
     let myChart = echarts.init(document.getElementById('destination_chart'));
     // echarts全局注册中国地图
     // echarts.registerMap('china', data);
+    for(var i = 0; i < data.map.length; i++){
+        if(i >= 0 && i <= 3){
+            data.map[i].itemStyle = {normal: {areaColor: '#001aff', label: {show: false}}};
+        } else if(i >= 4 && i <= 10){
+            data.map[i].itemStyle = {normal: {areaColor: '#7a91ff', label: {show: false}}};
+        } else {
+            data.map[i].itemStyle = {normal: {areaColor: '#b3ddff', label: {show: false}}};
+        }
+    }
     var option = {
         visualMap: {
             left: 'right',
             min: 0,
             max: 1000,
-            inRange: {
-                color: ['#313695', '#4575b4', '#74add1', '#abd9e9', '#e0f3f8', '#ffffbf', '#fee090', '#fdae61', '#f46d43', '#d73027', '#a50026']
-            },
-            calculable: true
+            // calculable: true
         },
         title: {
             text: '热门目的地',
@@ -177,7 +183,7 @@ function chinaMapLoad(data){
                 map: 'china',  // 中国地图
                 roam: false, // 滚动缩放
                 itemStyle: {
-                    areaColor: '#d0d2d4'  // 省份块的颜色
+                    // areaColor: "#d60f04",
                 },
                 //省份名称是否显示
                 label: {

src/main/resources/static/js/indexHome/function.js

@@ -1,5 +1,9 @@
 //菜单点击监听事件
 function clickItem(obj){
+    if($(obj).attr("name") == "途丫旅游"){
+        window.open("https://www.tuyatrip.com/", "_blank");
+        return false;
+    }
     if($(obj).hasClass("layui-nav-itemed")){
         $.each($(".layui-nav-item"), (index, item) => {
             $(item).find("a cite img").attr("src",  "/images/indeHome/" + $(item).attr("titleVal") + ".png");
@@ -257,7 +261,6 @@ function sendPrivateText(textVal) {
 //消息切换
 function clickMessage(obj){
     var id = $(obj).attr("id");
-    console.log(id)
     var name = $(obj).attr("name");
     avatarUrlParty = $(obj).find("img").attr("src");
     userID = id;

src/main/resources/static/js/indexHome/index.js

@@ -144,6 +144,7 @@ layui.use(["layer", "form", "upload"], function(){
     },false);
 
     getSupplierUser();
+    //语言移入移出
     $('.language').hover(function() {
         // 鼠标移入时添加hover类
         $(".language-selector").show();
@@ -151,7 +152,7 @@ layui.use(["layer", "form", "upload"], function(){
          // 鼠标移出时移出hover类
         $(".language-selector").hide();
      });
-
+    //头像移入移出
     $('.head_portrait_hove').hover(function() {
         // 鼠标移入时添加hover类
         $(".head_hove").show();
@@ -159,5 +160,11 @@ layui.use(["layer", "form", "upload"], function(){
         // 鼠标移出时移出hover类
         $(".head_hove").hide();
     });
+    //联系我们
+    $(".contact_us").on("click", (e) => {
+        userID = "sup0000001";
+        $(".chat__room-info-title h4").html("平台客服");
+        $(".right_el_scrollbar div").remove();
+    });
     translationVal(type);
 });

src/main/resources/templates/indexHome.html

@@ -137,6 +137,14 @@
                             </a>
                             <dl class="layui-nav-child">
 
+                            </dl>
+                        </li>
+                        <li class="layui-nav-item" name="途丫旅游" titleVal="tuya" onclick="clickItem(this)">
+                            <a lay-id="#" lay-url="#">
+                                <i class="ri-shield-keyhole-line"></i>&emsp;<cite name="途丫旅游"><img src="/images/indeHome/tuya.png"/><span>途丫旅游</span></cite>
+                            </a>
+                            <dl class="layui-nav-child">
+
                             </dl>
                         </li>
                     </ul>
@@ -169,6 +177,7 @@
                         <input type="text" name="sessionSearch" oninput="getValue(this)" autocomplete="off" placeholder="搜索"></div>
                 </div>
                 <div class="chat__room-session-group">
+                    <div class="contact_us">联系平台</div>
                     <div class="el-scrollbar">
                         <div class="el-scrollbar__wrap el-scrollbar__wrap--hidden-default">
                             <div class="el-scrollbar__view left_el_scrollbar">