zhs 3 лет назад
Родитель
Сommit
2a84c5ba16

+ 4 - 4
src/main/resources/static/css/demandForSingle/offer.css

@@ -57,9 +57,9 @@
 .day_column{
     float: left;
     width: 188px;
-    height: 100%;
+    height: 72%;
     padding-top: 10px;
-    padding-bottom: 60px;
+    /*padding-bottom: 60px;*/
     position: sticky;
     top: 50px;
     overflow: auto;
@@ -120,7 +120,7 @@
 .content_right{
     float: left;
     width: calc(100% - 188px - 6px);
-    height: calc(100% - 60px - 80px);
+    height: calc(100% - 60px - 100px);
     border-left: 1px solid #e3e4e5;
     margin-top: 10px;
     overflow-y: auto;
@@ -263,7 +263,7 @@
 }
 .editor-content[data-v-400c2eb9] {
     position: relative;
-    margin: 40px 36px 18px;
+    margin: 10px 36px 18px;
     font-size: 18px;
     line-height: 24px;
     color: #666;

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

@@ -507,7 +507,7 @@ function elementDrawing(data){
     $.each(data.data[0].releasePlay, (index, elem) => {
         if(elem.typeVal == "0"){
             $(".content_add_div[daynum="+ elem.dayNum +"] .play_div").append("<!-- 地点 -->\n" +
-                "                    <div class=\"play_content_div scenic_spot_div "+ elem.uuid + "-" + elem.typeVal +"\">\n" +
+                "                    <div class=\"play_content_div scenic_spot_div "+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +"\">\n" +
                 "                        <div class=\"title_name_spot\">\n" +
                 "                            <svg viewBox=\"0 0 1024 1024\" class=\"title_name_img\">\n" +
                 "                                <path d=\"M512 64C317.92 64 160 221.92 160 416c0 187.36 315.424 520.032 328.832 534.08C494.88 956.448 503.264 960 512 960c0.224 0 0.48 0 0.704 0 8.992 0 17.472-4.192 23.392-10.944l109.216-125.12C790.432 646.176 864 508.928 864 416 864 221.92 706.08 64 512 64zM512 576c-88.384 0-160-71.616-160-160s71.616-160 160-160 160 71.616 160 160S600.384 576 512 576z\" p-id=\"2190\"></path>\n" +
@@ -557,7 +557,7 @@ function elementDrawing(data){
                 "                    </div>");
         }else if(elem.typeVal == "1"){
             $(".content_add_div[daynum="+ elem.dayNum +"] .play_div").append("<!-- 酒店 -->\n" +
-                "                    <div class=\"play_content_div hotel_play_div "+ elem.uuid + "-" + elem.typeVal +"\">\n" +
+                "                    <div class=\"play_content_div hotel_play_div "+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +"\">\n" +
                 "                        <div class=\"title_name_spot\">\n" +
                 "                            <svg viewBox=\"0 0 1024 1024\" class=\"title_name_img\">\n" +
                 "                                <path d=\"M512 64C317.92 64 160 221.92 160 416c0 187.36 315.424 520.032 328.832 534.08C494.88 956.448 503.264 960 512 960c0.224 0 0.48 0 0.704 0 8.992 0 17.472-4.192 23.392-10.944l109.216-125.12C790.432 646.176 864 508.928 864 416 864 221.92 706.08 64 512 64zM512 576c-88.384 0-160-71.616-160-160s71.616-160 160-160 160 71.616 160 160S600.384 576 512 576z\" p-id=\"2190\"></path>\n" +
@@ -588,7 +588,7 @@ function elementDrawing(data){
                 "                    </div>");
         }else if(elem.typeVal == "2"){
             $(".content_add_div[daynum="+ elem.dayNum +"] .play_div").append("<!-- 包车,车型-->\n" +
-                "                    <div class=\"play_content_div charte_play_div "+ elem.uuid + "-" + elem.typeVal +"\">\n" +
+                "                    <div class=\"play_content_div charte_play_div "+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +"\">\n" +
                 "                        <div class=\"title_name_spot\">\n" +
                 "                            <svg viewBox=\"0 0 1024 1024\" class=\"title_name_img\">\n" +
                 "                                <path d=\"M512 64C317.92 64 160 221.92 160 416c0 187.36 315.424 520.032 328.832 534.08C494.88 956.448 503.264 960 512 960c0.224 0 0.48 0 0.704 0 8.992 0 17.472-4.192 23.392-10.944l109.216-125.12C790.432 646.176 864 508.928 864 416 864 221.92 706.08 64 512 64zM512 576c-88.384 0-160-71.616-160-160s71.616-160 160-160 160 71.616 160 160S600.384 576 512 576z\" p-id=\"2190\"></path>\n" +
@@ -639,7 +639,7 @@ function elementDrawing(data){
         var imgUrlArray = elem.imgUrl == null ? new Array() : elem.imgUrl.split(",");
         var videoUrlArray = elem.videoUrl == null ? new Array() : elem.videoUrl.split(",");
         for(var i = 0; i < imgUrlArray.length; i++){
-            $("."+ elem.uuid + "-" + elem.typeVal +" .editor-assets-content").append("<div class=\"editor-assets-content-info\" data-v-400c2eb9=\"\">\n" +
+            $("."+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +" .editor-assets-content").append("<div class=\"editor-assets-content-info\" data-v-400c2eb9=\"\">\n" +
                 "                                    <div class=\"el-image\" data-v-400c2eb9=\"\"><img style='width: 100px;height: 100px;' onclick='clickImg(this)' alt=\"upload-assets\"\n" +
                 "                                                                                  src="+ imgUrlArray[i] +"\n" +
                 "                                                                                  class=\"el-image__inner el-image__preview\"\n" +
@@ -652,7 +652,7 @@ function elementDrawing(data){
                 "                                </div>");
         }
         for(var j = 0; j < videoUrlArray.lengthl; j++){
-            $("."+ elem.uuid + "-" + elem.typeVal +" .editor-assets-content").append("<video src="+ videoUrlArray[j] +" controls=\"\" data-v-400c2eb9=\"\"></video>");
+            $("."+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +" .editor-assets-content").append("<video src="+ videoUrlArray[j] +" controls=\"\" data-v-400c2eb9=\"\"></video>");
         }
         //如果有修改内容的话则显示修改框
         if(elem.updateContent != null && elem.updateContent != ""){

+ 24 - 18
src/main/resources/static/js/release/index/function.js

@@ -65,7 +65,6 @@ function addDay(addTiemVal){
         "                        <div class=\"date_content_div\">\n" +
         "                            <input type=\"text\" data-locale=\"shijian\" class=\"layui-input date_hours_content_input date_hours_content_val"+ uuid +"\" value='08:00' placeholder=\"时间\">\n" +
         "                            <input type=\"text\" data-locale=\"qingshuruneirong\" class=\"layui-input date_hours_content date_content_input\" placeholder=\""+ paramReturn("请输入内容", parent.type) +"\">\n" +
-        "                            <div class=\"del_date\" onclick=\"delteDate(this)\"><i class=\"layui-icon layui-icon-subtraction\"></i></div>\n" +
         "                        </div>\n" +
         "                        <img class=\"add_date\" src=\"/images/demandForSingle/add_date.png\"  onClick=\"addDate(this)\">\n" +
         "                    </div>\n" +
@@ -426,6 +425,7 @@ function elementDrawing(data){
     $("input[name=startTime]").val(data.data[0].startTime);
     $("input[name=endTime]").val(data.data[0].endTime);
     $("input[name=peopleNum]").val(data.data[0].peopleNum);
+    $("input[name=announcements]").val(data.data[0].announcements);
     titleImg = data.data[0].titleImg
     $(".cover_img_p").hide();
     $(".img_div").show();
@@ -488,7 +488,7 @@ function elementDrawing(data){
     $.each(data.data[0].releasePlay, (index, elem) => {
         if(elem.typeVal == "0"){
             $(".content_add_div[daynum="+ elem.dayNum +"] .play_div").append("<!-- 地点 -->\n" +
-                "                    <div class=\"play_content_div scenic_spot_div "+ elem.uuid + "-" + elem.typeVal +"\">\n" +
+                "                    <div class=\"play_content_div scenic_spot_div "+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +"\">\n" +
                 "                        <div class=\"title_name_spot\">\n" +
                 "                            <svg viewBox=\"0 0 1024 1024\" class=\"title_name_img\">\n" +
                 "                                <path d=\"M512 64C317.92 64 160 221.92 160 416c0 187.36 315.424 520.032 328.832 534.08C494.88 956.448 503.264 960 512 960c0.224 0 0.48 0 0.704 0 8.992 0 17.472-4.192 23.392-10.944l109.216-125.12C790.432 646.176 864 508.928 864 416 864 221.92 706.08 64 512 64zM512 576c-88.384 0-160-71.616-160-160s71.616-160 160-160 160 71.616 160 160S600.384 576 512 576z\" p-id=\"2190\"></path>\n" +
@@ -535,7 +535,7 @@ function elementDrawing(data){
                 "                    </div>");
         }else if(elem.typeVal == "1"){
             $(".content_add_div[daynum="+ elem.dayNum +"] .play_div").append("<!-- 酒店 -->\n" +
-                "                    <div class=\"play_content_div scenic_spot_div "+ elem.uuid + "-" + elem.typeVal +"\">\n" +
+                "                    <div class=\"play_content_div hotel_play_div "+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +"\">\n" +
                 "                        <div class=\"title_name_spot\">\n" +
                 "                            <svg viewBox=\"0 0 1024 1024\" class=\"title_name_img\">\n" +
                 "                                <path d=\"M512 64C317.92 64 160 221.92 160 416c0 187.36 315.424 520.032 328.832 534.08C494.88 956.448 503.264 960 512 960c0.224 0 0.48 0 0.704 0 8.992 0 17.472-4.192 23.392-10.944l109.216-125.12C790.432 646.176 864 508.928 864 416 864 221.92 706.08 64 512 64zM512 576c-88.384 0-160-71.616-160-160s71.616-160 160-160 160 71.616 160 160S600.384 576 512 576z\" p-id=\"2190\"></path>\n" +
@@ -563,7 +563,7 @@ function elementDrawing(data){
                 "                    </div>");
         }else if(elem.typeVal == "2"){
             $(".content_add_div[daynum="+ elem.dayNum +"] .play_div").append("<!-- 包车,车型-->\n" +
-                "                    <div class=\"play_content_div scenic_spot_div "+ elem.uuid + "-" + elem.typeVal +"\">\n" +
+                "                    <div class=\"play_content_div charte_play_div "+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +"\">\n" +
                 "                        <div class=\"title_name_spot\">\n" +
                 "                            <svg viewBox=\"0 0 1024 1024\" class=\"title_name_img\">\n" +
                 "                                <path d=\"M512 64C317.92 64 160 221.92 160 416c0 187.36 315.424 520.032 328.832 534.08C494.88 956.448 503.264 960 512 960c0.224 0 0.48 0 0.704 0 8.992 0 17.472-4.192 23.392-10.944l109.216-125.12C790.432 646.176 864 508.928 864 416 864 221.92 706.08 64 512 64zM512 576c-88.384 0-160-71.616-160-160s71.616-160 160-160 160 71.616 160 160S600.384 576 512 576z\" p-id=\"2190\"></path>\n" +
@@ -611,20 +611,25 @@ function elementDrawing(data){
         var imgUrlArray = elem.imgUrl == null ? new Array() : elem.imgUrl.split(",");
         var videoUrlArray = elem.videoUrl == null ? new Array() : elem.videoUrl.split(",");
         for(var i = 0; i < imgUrlArray.length; i++){
-            $("."+ elem.uuid + "-" + elem.typeVal +" .editor-assets-content").append("<div class=\"editor-assets-content-info\" data-v-400c2eb9=\"\">\n" +
-                "                                    <div class=\"el-image\" data-v-400c2eb9=\"\"><img style='width: 100px;height: 100px;' onclick='clickImg(this)' alt=\"upload-assets\"\n" +
-                "                                                                                  src="+ imgUrlArray[i] +"\n" +
-                "                                                                                  class=\"el-image__inner el-image__preview\"\n" +
-                "                                                                                  style=\"object-fit: cover;\"><!--v-if-->\n" +
-                "                                    </div>\n" +
-                "                                    <svg viewBox=\"0 0 1024 1024\" xmlns=\"http://www.w3.org/2000/svg\" onclick=\"closeSvg(this)\" data-v-400c2eb9=\"\">\n" +
-                "                                        <path fill=\"currentColor\"\n" +
-                "                                              d=\"M512 64a448 448 0 1 1 0 896 448 448 0 0 1 0-896zm0 393.664L407.936 353.6a38.4 38.4 0 1 0-54.336 54.336L457.664 512 353.6 616.064a38.4 38.4 0 1 0 54.336 54.336L512 566.336 616.064 670.4a38.4 38.4 0 1 0 54.336-54.336L566.336 512 670.4 407.936a38.4 38.4 0 1 0-54.336-54.336L512 457.664z\"></path>\n" +
-                "                                    </svg>\n" +
-                "                                </div>");
+            console.log()
+            if(imgUrlArray[i] != ""){
+                $("."+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +" .editor-assets-content").append("<div class=\"editor-assets-content-info\" data-v-400c2eb9=\"\">\n" +
+                    "                                    <div class=\"el-image\" data-v-400c2eb9=\"\"><img style='width: 100px;height: 100px;' onclick='clickImg(this)' alt=\"upload-assets\"\n" +
+                    "                                                                                  src="+ imgUrlArray[i] +"\n" +
+                    "                                                                                  class=\"el-image__inner el-image__preview\"\n" +
+                    "                                                                                  style=\"object-fit: cover;\"><!--v-if-->\n" +
+                    "                                    </div>\n" +
+                    "                                    <svg viewBox=\"0 0 1024 1024\" xmlns=\"http://www.w3.org/2000/svg\" onclick=\"closeSvg(this)\" data-v-400c2eb9=\"\">\n" +
+                    "                                        <path fill=\"currentColor\"\n" +
+                    "                                              d=\"M512 64a448 448 0 1 1 0 896 448 448 0 0 1 0-896zm0 393.664L407.936 353.6a38.4 38.4 0 1 0-54.336 54.336L457.664 512 353.6 616.064a38.4 38.4 0 1 0 54.336 54.336L512 566.336 616.064 670.4a38.4 38.4 0 1 0 54.336-54.336L566.336 512 670.4 407.936a38.4 38.4 0 1 0-54.336-54.336L512 457.664z\"></path>\n" +
+                    "                                    </svg>\n" +
+                    "                                </div>");
+            }
         }
         for(var j = 0; j < videoUrlArray.lengthl; j++){
-            $("."+ elem.uuid + "-" + elem.typeVal +" .editor-assets-content").append("<video src="+ videoUrlArray[j] +" controls=\"\" data-v-400c2eb9=\"\"></video>");
+            if(videoUrlArray[j] != ""){
+                $("."+ elem.uuid + "-" + elem.typeVal +"-"+ elem.id +" .editor-assets-content").append("<video src="+ videoUrlArray[j] +" controls=\"\" data-v-400c2eb9=\"\"></video>");
+            }
         }
     })
     addUrl(uuid);
@@ -761,7 +766,7 @@ function theValues(){
             $.each($(elemVal).find(".scenic_spot_div"), (index, element) => {
                 var imgUrl = "";
                 var videoUrl = "";
-                $.each($(element).find(".editor-assets .editor-assets-content"), function(index, element1){
+                $.each($(element).find(".editor-assets .editor-assets-content .editor-assets-content-info"), function(index, element1){
                     if(typeof($(element1).find("img")) != "undefined") {
                         imgUrl = imgUrl + $(element1).find("img").attr("src") + ","
                     }
@@ -775,10 +780,10 @@ function theValues(){
                 if(videoUrl != ""){
                     videoUrl = videoUrl.substring(0, videoUrl.length - 1);
                 }
-
                 var name = $(element).find(".title_name_spot input").val();
                 titleDayName = titleDayName + name + ","
                 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"});
             });
             //酒店
@@ -809,6 +814,7 @@ function theValues(){
                 var imgUrl = "";
                 var videoUrl = "";
                 $.each($(element).find(".editor-assets .editor-assets-content .editor-assets-content-info"), function(index, element1){
+                    console.log(typeof($(element1).find("img")))
                     if(typeof($(element1).find("img")) != "undefined") {
                         imgUrl = imgUrl + $(element1).find("img").attr("src") + ","
                     }

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

@@ -110,6 +110,16 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         ,range: ['#test-startDate-1', '#test-endDate-1']
     });
 
+    $(".list_div").focus(() => {
+        console.log(1)
+        let startTime = $("input[name=startTime]").val();
+        let endTime = $("input[name=endTime]").val();
+        if(startTime == "" || endTime == ""){
+            layer.msg("请先输入时间", {icon: 2});
+            return false;
+        }
+    });
+
     getData();//元素渲染
     translationVal(parent.type);//翻译
 

+ 1 - 1
src/main/resources/templates/demandForSingle/offer.html

@@ -299,7 +299,7 @@
                 <div class="all_price_font" data-locale="zongjia">总价:</div>
                 <div class="all_price_input">
                     <span>¥</span>
-                    <input name="priceAll" oninput="getPriceAll(this)" autoComplete="off" type="text">
+                    <input name="priceAll" oninput="getPriceAll(this)" autoComplete="off" type="number">
                 </div>
                 <span class="percentage_fee_price">平台手续费比例为:1%,本单手续费为:1¥,本单实际收入为:1¥</span>
                 <div class="amount_icon"></div>

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

@@ -70,7 +70,6 @@
                         </div>
                     </div>
                 </span>
-                <span class="division_div">|</span>
             </div>
         </div>
     </div>
@@ -124,7 +123,6 @@
                         <div class="date_content_div">
                             <input type="text" data-locale="shijian" class="layui-input date_hours_content_input" value="08:00" placeholder="时间">
                             <input type="text" data-locale="qingshuruneirong" class="layui-input date_hours_content date_content_input" placeholder="请输入内容">
-                            <div class="del_date" onclick="delteDate(this)"><i class="layui-icon layui-icon-subtraction"></i></div>
                         </div>
                         <img class="add_date" src="/images/demandForSingle/add_date.png" onClick="addDate(this)"/>
                     </div>
@@ -264,7 +262,7 @@
                 <div class="all_price_font" data-locale="zongjia">总价:</div>
                 <div class="all_price_input">
                     <span>¥</span>
-                    <input name="priceAll" autoComplete="off" type="text">
+                    <input name="priceAll" autoComplete="off" type="number">
                 </div>
                 <div class="amount_icon"></div>
             </div>