zhs 3 years ago
parent
commit
8f2f2e3855

+ 7 - 0
src/main/java/com/supplier/model/SupplierRoute.java

@@ -6,6 +6,9 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.List;
 import java.util.List;
 
 
+/**
+ * 路线
+ */
 @Data
 @Data
 @Accessors(chain = true)
 @Accessors(chain = true)
 @SuppressWarnings("serial")
 @SuppressWarnings("serial")
@@ -98,4 +101,8 @@ public class SupplierRoute implements Serializable {
      * 地点标题
      * 地点标题
      */
      */
     private String titleDayName;
     private String titleDayName;
+    /**
+     * 注意事项
+     */
+    private String announcements;
 }
 }

+ 2 - 2
src/main/resources/config/mapping/ReleaseMapper.xml

@@ -4,8 +4,8 @@
 <mapper namespace="com.supplier.mapper.ReleaseMapper">
 <mapper namespace="com.supplier.mapper.ReleaseMapper">
     <!-- 供应商发布路线 -->
     <!-- 供应商发布路线 -->
     <insert id="addReleaseVal" parameterType="SupplierRoute">
     <insert id="addReleaseVal" parameterType="SupplierRoute">
-        insert into bus_supplier_route(code,origin,destination,start_time,end_time,look_num,title_img,offer_name,price_all,people_num,uuid,jdrq,update_date,title_day_name,state_type)
-        values(#{code},#{origin},#{destination},#{startTime},#{endTime},0,#{titleImg},#{offerName},#{priceAll},#{peopleNum},#{uuid},CONVERT(VARCHAR(100), SYSDATETIME(), 20),CONVERT(VARCHAR(100), SYSDATETIME(), 20),#{titleDayName},'1')
+        insert into bus_supplier_route(code,origin,destination,start_time,end_time,look_num,title_img,offer_name,price_all,people_num,uuid,jdrq,update_date,title_day_name,state_type,addReleaseVal)
+        values(#{code},#{origin},#{destination},#{startTime},#{endTime},0,#{titleImg},#{offerName},#{priceAll},#{peopleNum},#{uuid},CONVERT(VARCHAR(100), SYSDATETIME(), 20),CONVERT(VARCHAR(100), SYSDATETIME(), 20),#{titleDayName},'1',#{addReleaseVal})
     </insert>
     </insert>
     <!-- 查询路线发布 -->
     <!-- 查询路线发布 -->
     <select id="getRelease" parameterType="SupplierRoute" resultType="SupplierRoute">
     <select id="getRelease" parameterType="SupplierRoute" resultType="SupplierRoute">

+ 20 - 5
src/main/resources/static/css/demandForSingle/offer.css

@@ -63,7 +63,7 @@
     position: sticky;
     position: sticky;
     top: 50px;
     top: 50px;
     overflow: auto;
     overflow: auto;
-    max-height: calc(100vh - 400px);
+    max-height: calc(100vh - 345px);
 }
 }
 .timeline[data-v-2d69a44a] {
 .timeline[data-v-2d69a44a] {
     --dark-color: #e3e4e5;
     --dark-color: #e3e4e5;
@@ -493,12 +493,12 @@
     border: 0;
     border: 0;
 }
 }
 .select_template{
 .select_template{
-    width: 236px;
-    min-width: 236px;
-    height: 60px;
+    width: 200px;
+    min-width: 200px;
+    height: 50px;
     background: #0095f3;
     background: #0095f3;
     border-radius: 30px;
     border-radius: 30px;
-    line-height: 60px;
+    line-height: 50px;
     text-align: center;
     text-align: center;
     color: #fff;
     color: #fff;
     font-size: 20px;
     font-size: 20px;
@@ -898,4 +898,19 @@ img {
     margin-top: 10px;
     margin-top: 10px;
     color: red;
     color: red;
     padding-left: 60px;
     padding-left: 60px;
+}
+.cover_img_p{
+    width: 210px;
+    color: #ff3b00ad;
+}
+.img_div{
+    width: 100px;
+    height: 100px;
+    border: 1px solid #ccc;
+    display: none;
+}
+.img_div img{
+    width: 100%;
+    height: 100%;
+    border: 1px solid #ccc;
 }
 }

+ 7 - 1
src/main/resources/static/css/indexHome/index.css

@@ -97,7 +97,7 @@ body,html{
 }
 }
 .layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a, .layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a, .layui-nav-tree .layui-this>a:hover {
 .layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a, .layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a, .layui-nav-tree .layui-this>a:hover {
     background-color: #0095F3;
     background-color: #0095F3;
-    color: #fff;
+    color: #fff!important;
 }
 }
 .layui-nav-tree .layui-nav-child dd.layui-this a, .layui-nav-tree dd.layui-this {
 .layui-nav-tree .layui-nav-child dd.layui-this a, .layui-nav-tree dd.layui-this {
     background-color: #0095F3!important;
     background-color: #0095F3!important;
@@ -685,4 +685,10 @@ cite img{
 }
 }
 .layui-nav-item{
 .layui-nav-item{
     cursor: pointer;
     cursor: pointer;
+}
+.layui-nav-tree .layui-nav-item>a .layui-nav-more{
+    padding: 0;
+}
+.layui-nav-tree .layui-nav-item>a{
+    padding-top: 0;
 }
 }

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

@@ -134,6 +134,10 @@ function addDay(addTiemVal){
     "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
     "                                <i class=\"icon icon-location\" 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='delPlace(this)'>\n" +
+    "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
+    "                                <span data-v-67b53f28=\"\">删除当前天</span>\n" +
+    "                            </div>\n" +
     "                        </div>\n" +
     "                        </div>\n" +
     "                    </div>\n" +
     "                    </div>\n" +
     "                    <!-- 酒店 -->\n" +
     "                    <!-- 酒店 -->\n" +
@@ -213,6 +217,10 @@ function addDay(addTiemVal){
     "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
     "                                <i class=\"icon icon-location\" 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='delPlace(this)'>\n" +
+    "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
+    "                                <span data-v-67b53f28=\"\">删除当前天</span>\n" +
+    "                            </div>\n" +
     "                        </div>\n" +
     "                        </div>\n" +
     "                    </div>\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "                </div>\n" +
@@ -1053,4 +1061,15 @@ function getByNumber(){
             layer.closeAll("loading");
             layer.closeAll("loading");
         }
         }
     });
     });
+}
+//删除当前天
+function delPlace(obj){
+    let num = $(obj).parent().parent().parent().parent().attr("dayNum");
+    let divLength = $(".content_add_div").length;
+    if(divLength == "1"){
+        layer.msg("删除失败,至少保留一天", {icon:  2});
+        return false;
+    }
+    $(".timeline li[dayNum="+ num +"]").remove();
+    $(obj).parent().parent().parent().parent().remove();
 }
 }

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

@@ -94,6 +94,9 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         ,done: function(res){
         ,done: function(res){
             layer.msg("上传成功", {icon: 1});
             layer.msg("上传成功", {icon: 1});
             titleImg = res.data;
             titleImg = res.data;
+            $(".cover_img_p").hide();
+            $(".img_div").show();
+            $(".img_div img").attr("src", titleImg);
             layer.closeAll("loading");
             layer.closeAll("loading");
         }
         }
         ,error: function(){
         ,error: function(){

+ 3 - 2
src/main/resources/static/js/indexHome/function.js

@@ -4,6 +4,7 @@ function clickItem(obj){
         window.open("https://www.tuyatrip.com/", "_blank");
         window.open("https://www.tuyatrip.com/", "_blank");
         return false;
         return false;
     }
     }
+    $(".layui-nav-child dd").removeClass("layui-this");
     if($(obj).hasClass("layui-nav-itemed")){
     if($(obj).hasClass("layui-nav-itemed")){
         $.each($(".layui-nav-item"), (index, item) => {
         $.each($(".layui-nav-item"), (index, item) => {
             $(item).find("a cite img").attr("src",  "/images/indeHome/" + $(item).attr("titleVal") + ".png");
             $(item).find("a cite img").attr("src",  "/images/indeHome/" + $(item).attr("titleVal") + ".png");
@@ -11,10 +12,10 @@ function clickItem(obj){
         $(obj).find("a cite img").attr("src",  "/images/indeHome/" + $(obj).attr("titleVal") + "_click.png");
         $(obj).find("a cite img").attr("src",  "/images/indeHome/" + $(obj).attr("titleVal") + "_click.png");
         //个人信息特殊处理
         //个人信息特殊处理
         if($(obj).find("a cite").attr("name") == "账户信息"){
         if($(obj).find("a cite").attr("name") == "账户信息"){
-            $(".layui-nav-child dd").removeClass("layui-this");
+            $(obj).addClass("layui-this")
             iframeClick(obj);
             iframeClick(obj);
         }else if($(obj).find("a cite").attr("name") == "路线发布"){//路线发布特殊处理
         }else if($(obj).find("a cite").attr("name") == "路线发布"){//路线发布特殊处理
-            $(".layui-nav-child dd").removeClass("layui-this");
+            $(obj).addClass("layui-this")
             iframeClick(obj);
             iframeClick(obj);
         }
         }
     }else{
     }else{

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

@@ -115,6 +115,10 @@ function addDay(addTiemVal){
         "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
         "                                <i class=\"icon icon-location\" 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='delPlace(this)'>\n" +
+        "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
+        "                                <span data-v-67b53f28=\"\">删除当前天</span>\n" +
+        "                            </div>\n" +
         "                        </div>\n" +
         "                        </div>\n" +
         "                    </div>\n" +
         "                    </div>\n" +
         "                    <!-- 酒店 -->\n" +
         "                    <!-- 酒店 -->\n" +
@@ -188,6 +192,10 @@ function addDay(addTiemVal){
         "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
         "                                <i class=\"icon icon-location\" 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='delPlace(this)'>\n" +
+        "                                <i class=\"icon icon-location\" data-v-67b53f28=\"\"></i>\n" +
+        "                                <span data-v-67b53f28=\"\">删除当前天</span>\n" +
+        "                            </div>\n" +
         "                        </div>\n" +
         "                        </div>\n" +
         "                    </div>\n" +
         "                    </div>\n" +
         "                </div>\n" +
         "                </div>\n" +
@@ -303,6 +311,7 @@ function submitAdd(){
             "startTime": arryValue.startTime,
             "startTime": arryValue.startTime,
             "endTime": arryValue.endTime,
             "endTime": arryValue.endTime,
             "origin": arryValue.origin,
             "origin": arryValue.origin,
+            "announcements": arryValue.announcements,
             "destination": arryValue.destination,
             "destination": arryValue.destination,
             "peopleNum": arryValue.peopleNum,
             "peopleNum": arryValue.peopleNum,
             "titleDayName": arryValue.titleDayName.substr(0, arryValue.titleDayName.length - 1)
             "titleDayName": arryValue.titleDayName.substr(0, arryValue.titleDayName.length - 1)
@@ -686,6 +695,7 @@ function theValues(){
     var peopleNum = $("input[name=peopleNum]").val();//人数
     var peopleNum = $("input[name=peopleNum]").val();//人数
     var origin = $("input[name=origin]").val();//起始地
     var origin = $("input[name=origin]").val();//起始地
     var destination = $("input[name=destination]").val();//目的地
     var destination = $("input[name=destination]").val();//目的地
+    var announcements = $("input[name=announcements]").val();//注意事项
     var titleDayName = "";//地点名称
     var titleDayName = "";//地点名称
     if(startTime == null || startTime == ""){
     if(startTime == null || startTime == ""){
         layer.msg(paramReturn("开始时间不能为空", parent.type), {icon: 2, time: 1000});
         layer.msg(paramReturn("开始时间不能为空", parent.type), {icon: 2, time: 1000});
@@ -718,6 +728,7 @@ function theValues(){
     map.endTime = endTime;
     map.endTime = endTime;
     map.peopleNum = peopleNum;
     map.peopleNum = peopleNum;
     map.origin = origin;
     map.origin = origin;
+    map.announcements = announcements;
     map.destination = destination;
     map.destination = destination;
     //取值
     //取值
     $.each($(".content_add_div"), (index, item) => {
     $.each($(".content_add_div"), (index, item) => {
@@ -916,4 +927,15 @@ function clickVideo(obj){
         anim: 2,
         anim: 2,
         content: "<video src="+ videoUrl +" controls=\"\" data-v-400c2eb9=\"\"></video>"
         content: "<video src="+ videoUrl +" controls=\"\" data-v-400c2eb9=\"\"></video>"
     })
     })
+}
+//删除当前天
+function delPlace(obj){
+    let num = $(obj).parent().parent().parent().parent().attr("dayNum");
+    let divLength = $(".content_add_div").length;
+    if(divLength == "1"){
+        layer.msg("删除失败,至少保留一天", {icon:  2});
+        return false;
+    }
+    $(".timeline li[dayNum="+ num +"]").remove();
+    $(obj).parent().parent().parent().parent().remove();
 }
 }

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

@@ -72,6 +72,9 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         ,done: function(res){
         ,done: function(res){
             layer.msg("上传成功", {icon: 1});
             layer.msg("上传成功", {icon: 1});
             titleImg = res.data;
             titleImg = res.data;
+            $(".cover_img_p").hide();
+            $(".img_div").show();
+            $(".img_div img").attr("src", titleImg);
             layer.closeAll("loading");
             layer.closeAll("loading");
         }
         }
         ,error: function(){
         ,error: function(){

+ 2 - 0
src/main/resources/templates/demandForSingle/offer.html

@@ -58,6 +58,8 @@
             <div class="editor-assets-control-item cover_img" data-v-400c2eb9="">
             <div class="editor-assets-control-item cover_img" data-v-400c2eb9="">
                 <i class="assets-icon assets-images-icon" data-v-400c2eb9=""></i>
                 <i class="assets-icon assets-images-icon" data-v-400c2eb9=""></i>
                 <span data-v-400c2eb9="" data-locale="shangchuanfengmiantu">上传封面图</span>
                 <span data-v-400c2eb9="" data-locale="shangchuanfengmiantu">上传封面图</span>
+                <p class="cover_img_p">图片上传大小推荐1920*1080大小</p>
+                <div class="img_div"><img src=""/></div>
             </div>
             </div>
             <!--选择模板按钮-->
             <!--选择模板按钮-->
             <div class="select_template" data-locale="xuanzemoban">选择模板</div>
             <div class="select_template" data-locale="xuanzemoban">选择模板</div>

+ 1 - 1
src/main/resources/templates/indexHome.html

@@ -91,7 +91,7 @@
                                     <a lay-id="HotDestination" lay-url="HotDestination" locale="daihuida" idVal="0" onClick="iframeClick(this)">
                                     <a lay-id="HotDestination" lay-url="HotDestination" locale="daihuida" idVal="0" onClick="iframeClick(this)">
                                         <cite name="待回答">
                                         <cite name="待回答">
                                             <span data-locale="daihuida">待回答</span>
                                             <span data-locale="daihuida">待回答</span>
-                                            <div class="message_num" style="top: 13px;left: 128px;">0</div>
+                                            <div class="message_num" style="top: 12px;left: 128px;">0</div>
                                         </cite>
                                         </cite>
                                     </a>
                                     </a>
                                 </dd>
                                 </dd>

+ 19 - 0
src/main/resources/templates/release/index.html

@@ -70,6 +70,15 @@
                         </div>
                         </div>
                     </div>
                     </div>
                 </span>
                 </span>
+                <span class="division_div">|</span>
+                <span class="people_number">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">注意事项</label>
+                        <div class="layui-input-inline" style="width: 100px;">
+                          <input type="text" name="announcements" lay-verify="title" autocomplete="off" placeholder="注意事项" class="layui-input">
+                        </div>
+                    </div>
+                </span>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
@@ -83,6 +92,8 @@
             <div class="editor-assets-control-item cover_img" data-v-400c2eb9="">
             <div class="editor-assets-control-item cover_img" data-v-400c2eb9="">
                 <i class="assets-icon assets-images-icon" data-v-400c2eb9=""></i>
                 <i class="assets-icon assets-images-icon" data-v-400c2eb9=""></i>
                 <span data-v-400c2eb9="" data-locale="shangchuanfengmiantu">上传封面图</span>
                 <span data-v-400c2eb9="" data-locale="shangchuanfengmiantu">上传封面图</span>
+                <p class="cover_img_p">图片上传大小推荐1920*1080大小</p>
+                <div class="img_div"><img src=""/></div>
             </div>
             </div>
         </div>
         </div>
         <!-- 左侧天数选择 -->
         <!-- 左侧天数选择 -->
@@ -167,6 +178,10 @@
                                 <i class="icon icon-location" data-v-67b53f28=""></i>
                                 <i class="icon icon-location" data-v-67b53f28=""></i>
                                 <span data-v-67b53f28="" data-locale="tianjiadidian">添加地点</span>
                                 <span data-v-67b53f28="" data-locale="tianjiadidian">添加地点</span>
                             </div>
                             </div>
+                            <div class="icon-item" data-v-67b53f28="" onClick="delPlace(this)">
+                                <i class="icon icon-location" data-v-67b53f28=""></i>
+                                <span data-v-67b53f28="">删除当前天</span>
+                            </div>
                         </div>
                         </div>
                     </div>
                     </div>
                     <!-- 酒店 -->
                     <!-- 酒店 -->
@@ -239,6 +254,10 @@
                                 <i class="icon icon-location" data-v-67b53f28=""></i>
                                 <i class="icon icon-location" data-v-67b53f28=""></i>
                                 <span data-v-67b53f28="" data-locale="tianjiadidian">添加地点</span>
                                 <span data-v-67b53f28="" data-locale="tianjiadidian">添加地点</span>
                             </div>
                             </div>
+                            <div class="icon-item" data-v-67b53f28="" onClick="delPlace(this)">
+                                <i class="icon icon-location" data-v-67b53f28=""></i>
+                                <span data-v-67b53f28="">删除当前天</span>
+                            </div>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>