zhs 3 years ago
parent
commit
be6b841039

+ 3 - 0
src/main/resources/static/css/demandForSingle/offer.css

@@ -127,6 +127,7 @@
     padding-left: 76px;
     padding-left: 76px;
     float: left;
     float: left;
     width: calc(100% - 76px);
     width: calc(100% - 76px);
+    margin-top: 20px;
 }
 }
 .content_add_div .layui-form-label{
 .content_add_div .layui-form-label{
     width: auto;
     width: auto;
@@ -566,6 +567,7 @@
     width: calc(100% - 76px);
     width: calc(100% - 76px);
     padding-left: 76px;
     padding-left: 76px;
     margin-bottom: 20px;
     margin-bottom: 20px;
+    margin-top: 20px;
 }
 }
 .name_private_offer{
 .name_private_offer{
     float: left;
     float: left;
@@ -921,6 +923,7 @@ img {
     width: 100px;
     width: 100px;
     height: 100px;
     height: 100px;
     border: 1px solid #ccc;
     border: 1px solid #ccc;
+    margin-top: 30px;
     display: none;
     display: none;
 }
 }
 .img_div img{
 .img_div img{

+ 1 - 1
src/main/resources/static/js/demandForSingle/offer/function.js

@@ -541,7 +541,7 @@ function elementDrawing(data){
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay()\")\">\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay()\")\">\n" +
                 "                                <i class=\"icon icon-dir\" data-v-67b53f28=\"\"></i>\n" +
                 "                                <i class=\"icon icon-dir\" data-v-67b53f28=\"\"></i>\n" +
-                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiamulu\">"+ paramReturn("添加目录天", parent.type) +"</span>\n" +
+                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiamulu\">"+ paramReturn("增加天数", parent.type) +"</span>\n" +
                 "                            </div>\n" +
                 "                            </div>\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addPlace(this)\">\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addPlace(this)\">\n" +
                 "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
                 "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +

+ 22 - 25
src/main/resources/static/js/release/index/function.js

@@ -48,7 +48,7 @@ function addDay(addTiemVal){
         "                        <i data-v-2d69a44a=\"\">Day"+ (parseInt(dayNum) + 1) +"</i>\n" +
         "                        <i data-v-2d69a44a=\"\">Day"+ (parseInt(dayNum) + 1) +"</i>\n" +
         "                        <span data-v-2d69a44a=\"\"></span>\n" +
         "                        <span data-v-2d69a44a=\"\"></span>\n" +
         "                    </li>");
         "                    </li>");
-    $(".all_price").before("<div class=\"content_add_div\" daynum="+ (parseInt(dayNum) + 1) +">\n" +
+    $(".attention_div").before("<div class=\"content_add_div\" daynum="+ (parseInt(dayNum) + 1) +">\n" +
         "                <!-- 日期选择 -->\n" +
         "                <!-- 日期选择 -->\n" +
         "                <div class=\"layui-inline\">\n" +
         "                <div class=\"layui-inline\">\n" +
         "                    <label class=\"layui-form-label\" data-locale=\"riqi\" style=\"margin-top: 8px\">"+ paramReturn("日&nbsp;&nbsp;&nbsp;&nbsp;期", parent.type) +":</label>\n" +
         "                    <label class=\"layui-form-label\" data-locale=\"riqi\" style=\"margin-top: 8px\">"+ paramReturn("日&nbsp;&nbsp;&nbsp;&nbsp;期", parent.type) +":</label>\n" +
@@ -109,7 +109,7 @@ function addDay(addTiemVal){
         "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
         "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
         "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onclick=\"addDay()\")\">\n" +
         "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onclick=\"addDay()\")\">\n" +
         "                                <i class=\"icon icon-location addday\" data-v-67b53f28=\"\"></i>\n" +
         "                                <i class=\"icon icon-location addday\" data-v-67b53f28=\"\"></i>\n" +
-        "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiamulu\">"+ paramReturn("添加目录天", parent.type) +"</span>\n" +
+        "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiamulu\">"+ paramReturn("添加天", parent.type) +"</span>\n" +
         "                            </div>\n" +
         "                            </div>\n" +
         "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onclick='addPlace(this)'>\n" +
         "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onclick='addPlace(this)'>\n" +
         "                                <i class=\"icon icon-location adddidian\" data-v-67b53f28=\"\"></i>\n" +
         "                                <i class=\"icon icon-location adddidian\" data-v-67b53f28=\"\"></i>\n" +
@@ -454,7 +454,7 @@ function elementDrawing(data){
                     "                        <span data-v-2d69a44a=\"\"></span>\n" +
                     "                        <span data-v-2d69a44a=\"\"></span>\n" +
                     "                    </li>")
                     "                    </li>")
             }
             }
-            $(".all_price").before(
+            $(".attention_div").before(
                 "<div class='content_add_div' dayNum="+ item.dayNum +">" +
                 "<div class='content_add_div' dayNum="+ item.dayNum +">" +
                 "                <!-- 日期选择 -->\n" +
                 "                <!-- 日期选择 -->\n" +
                 "                <div class=\"layui-inline\">\n" +
                 "                <div class=\"layui-inline\">\n" +
@@ -530,13 +530,25 @@ function elementDrawing(data){
                 "                        </div>\n" +
                 "                        </div>\n" +
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay()\")\">\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay()\")\">\n" +
-                "                                <i class=\"icon icon-dir\" data-v-67b53f28=\"\"></i>\n" +
-                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiamulu\">"+ paramReturn("添加目录天", parent.type) +"</span>\n" +
+                "                                <i class=\"icon icon-location addday\" data-v-67b53f28=\"\"></i>\n" +
+                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiamulu\">"+ paramReturn("增加天数", parent.type) +"</span>\n" +
                 "                            </div>\n" +
                 "                            </div>\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addPlace(this)\">\n" +
                 "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addPlace(this)\">\n" +
-                "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
+                "                                <i class=\"icon icon-location adddidian\" data-v-67b53f28=\"\"></i>\n" +
                 "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiadidian\">"+ paramReturn("添加地点", parent.type) +"</span>\n" +
                 "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiadidian\">"+ paramReturn("添加地点", parent.type) +"</span>\n" +
                 "                            </div>\n" +
                 "                            </div>\n" +
+                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addHotel(this)\">\n" +
+                "                                <i class=\"icon icon-location addjiudian\" data-v-67b53f28=\"\"></i>\n" +
+                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiadidian\">增加酒店</span>\n" +
+                "                            </div>\n" +
+                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addCharter(this)\">\n" +
+                "                                <i class=\"icon icon-location addche\" data-v-67b53f28=\"\"></i>\n" +
+                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiadidian\">增加包车</span>\n" +
+                "                            </div>\n" +
+                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"delPlace(this)\">\n" +
+                "                                <i class=\"icon icon-location addshanchu\" data-v-67b53f28=\"\"></i>\n" +
+                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiadidian\">删除当前天</span>\n" +
+                "                            </div>\n" +
                 "                        </div>\n" +
                 "                        </div>\n" +
                 "                    </div>");
                 "                    </div>");
         }else if(elem.typeVal == "1"){
         }else if(elem.typeVal == "1"){
@@ -594,24 +606,6 @@ function elementDrawing(data){
                 "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
                 "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
                 "                            <i class=\"layui-icon layui-icon-close\"></i>\n" +
                 "                            <i class=\"layui-icon layui-icon-close\"></i>\n" +
                 "                        </div>\n" +
                 "                        </div>\n" +
-                "                    </div>\n" +
-                "                    <!-- 悬浮效果 -->\n" +
-                "                    <div class=\"operation\" data-v-67b53f28=\"\" data-v-5161540f=\"\" onmouseover=\"operationOver(this)\" onmouseout=\"operationOut(this)\">\n" +
-                "                        <div class=\"operation-leader\" data-v-67b53f28=\"\">\n" +
-                "                            <svg viewBox=\"0 0 1024 1024\" xmlns=\"http://www.w3.org/2000/svg\" data-v-67b53f28=\"\">\n" +
-                "                                <path fill=\"currentColor\" d=\"M480 480V128a32 32 0 0 1 64 0v352h352a32 32 0 1 1 0 64H544v352a32 32 0 1 1-64 0V544H128a32 32 0 0 1 0-64h352z\"></path>\n" +
-                "                            </svg>\n" +
-                "                        </div>\n" +
-                "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
-                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay()\">\n" +
-                "                                <i class=\"icon icon-dir\" data-v-67b53f28=\"\"></i>\n" +
-                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiamulu\">"+ paramReturn("添加目录天", parent.type) +"</span>\n" +
-                "                            </div>\n" +
-                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addPlace(this)\">\n" +
-                "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
-                "                                <span data-v-67b53f28=\"\" data-locale=\"tianjiadidian\">"+ paramReturn("添加地点", parent.type) +"</span>\n" +
-                "                            </div>\n" +
-                "                        </div>\n" +
                 "                    </div>");
                 "                    </div>");
         }
         }
         var imgUrlArray = elem.imgUrl == null ? new Array() : elem.imgUrl.split(",");
         var imgUrlArray = elem.imgUrl == null ? new Array() : elem.imgUrl.split(",");
@@ -639,6 +633,10 @@ function elementDrawing(data){
         }
         }
     })
     })
     addUrl(uuid);
     addUrl(uuid);
+    observer.disconnect();
+    $.each($(".content_add_div"), (index, item) => {
+        observer.observe(item);
+    });
 }
 }
 //查询订制
 //查询订制
 function getData(){
 function getData(){
@@ -789,7 +787,6 @@ function theValues(){
                 var name = $(element).find(".title_name_spot input").val();
                 var name = $(element).find(".title_name_spot input").val();
                 titleDayName = titleDayName + name + ","
                 titleDayName = titleDayName + name + ","
                 var content = $(element).find(".editor-content textarea").val();
                 var content = $(element).find(".editor-content textarea").val();
-                console.log(imgUrl)
                 releasePlay.push({"dayNum": dayNum, "imgUrl": (imgUrl == "undefined" ? null : imgUrl), "videoUrl": (videoUrl == "undefined" ? null : videoUrl), "name": name, "content": content, "typeVal": "0"});
                 releasePlay.push({"dayNum": dayNum, "imgUrl": (imgUrl == "undefined" ? null : imgUrl), "videoUrl": (videoUrl == "undefined" ? null : videoUrl), "name": name, "content": content, "typeVal": "0"});
             });
             });
             //酒店
             //酒店

+ 0 - 1
src/main/resources/static/js/release/index/index.js

@@ -111,7 +111,6 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
     });
     });
 
 
     $(".list_div").focus(() => {
     $(".list_div").focus(() => {
-        console.log(1)
         let startTime = $("input[name=startTime]").val();
         let startTime = $("input[name=startTime]").val();
         let endTime = $("input[name=endTime]").val();
         let endTime = $("input[name=endTime]").val();
         if(startTime == "" || endTime == ""){
         if(startTime == "" || endTime == ""){

+ 1 - 1
src/main/resources/static/json/kor.json

@@ -142,7 +142,7 @@
   "插入图片": "사진추가",
   "插入图片": "사진추가",
   "地点介绍": "장소 소개",
   "地点介绍": "장소 소개",
   "修改意见内容": "의견 내용을 고치다",
   "修改意见内容": "의견 내용을 고치다",
-  "添加目录天": "일/디렉터리를 추가합니다",
+  "添加天": "일/디렉터리를 추가합니다",
   "添加地点": "위치 추가",
   "添加地点": "위치 추가",
   "酒店介绍": "호텔 소개",
   "酒店介绍": "호텔 소개",
   "包车车型": "전세 차",
   "包车车型": "전세 차",

+ 2 - 2
src/main/resources/static/json/zh.json

@@ -38,7 +38,7 @@
   "charutupian": "插入图片",
   "charutupian": "插入图片",
   "didianjieshao": "地点介绍",
   "didianjieshao": "地点介绍",
   "xiugaiyijianneirong": "修改意见内容",
   "xiugaiyijianneirong": "修改意见内容",
-  "tianjiamulu": "添加目录",
+  "tianjiamulu": "添加天数",
   "tianjiadidian": "添加地点",
   "tianjiadidian": "添加地点",
   "jiudianmingcheng": "酒店名称",
   "jiudianmingcheng": "酒店名称",
   "jiudianjieshao": "酒店介绍",
   "jiudianjieshao": "酒店介绍",
@@ -148,7 +148,7 @@
   "插入图片": "插入图片",
   "插入图片": "插入图片",
   "地点介绍": "地点介绍",
   "地点介绍": "地点介绍",
   "修改意见内容": "修改意见内容",
   "修改意见内容": "修改意见内容",
-  "添加目录天": "添加目录/天",
+  "添加天": "添加天",
   "添加地点": "添加地点",
   "添加地点": "添加地点",
   "酒店介绍": "酒店介绍",
   "酒店介绍": "酒店介绍",
   "包车车型": "包车,车型",
   "包车车型": "包车,车型",

+ 1 - 1
src/main/resources/templates/release/index.html

@@ -149,7 +149,7 @@
                         <div class="icon-group" data-v-67b53f28="">
                         <div class="icon-group" data-v-67b53f28="">
                             <div class="icon-item" data-v-67b53f28="" onClick="addDay()">
                             <div class="icon-item" data-v-67b53f28="" onClick="addDay()">
                                 <i class="icon icon-location addday" data-v-67b53f28=""></i>
                                 <i class="icon icon-location addday" data-v-67b53f28=""></i>
-                                <span data-v-67b53f28="" data-locale="tianjiamulu">添加目录/天</span>
+                                <span data-v-67b53f28="" data-locale="tianjiamulu">添加天</span>
                             </div>
                             </div>
                             <div class="icon-item" data-v-67b53f28="" onClick="addPlace(this)">
                             <div class="icon-item" data-v-67b53f28="" onClick="addPlace(this)">
                                 <i class="icon icon-location adddidian" data-v-67b53f28=""></i>
                                 <i class="icon icon-location adddidian" data-v-67b53f28=""></i>