zhs пре 3 година
родитељ
комит
717935bf10

+ 17 - 0
src/main/java/com/supplier/config/SaticScheduleTask.java

@@ -2,11 +2,16 @@ package com.supplier.config;
 
 import com.supplier.service.WxPayService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+
 /**
  * 定时任务
  */
@@ -17,6 +22,17 @@ public class SaticScheduleTask {
     @Autowired
     private WxPayService wxPayService;
 
+    /**
+     * 定时任务线程自定义
+     * @return
+     */
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+        taskScheduler.setPoolSize(50);
+        return taskScheduler;
+    }
+
     /**
      * 删除多余的余额充值记录
      */
@@ -24,4 +40,5 @@ public class SaticScheduleTask {
     public void delTopUp(){
         wxPayService.getTopUpTimeOut();
     }
+
 }

+ 2 - 1
src/main/java/com/supplier/controller/WxPayAppController.java

@@ -213,6 +213,7 @@ public class WxPayAppController extends WxPayUtils {
                 } else { //报价单购买
                     wxPayService.payUpdate(wxPay);
                     //修改报价单信息
+                    System.out.println((String)packageParams.get("attach"));
                     SupplierRelease supplierRelease = new SupplierRelease().setUuid((String)packageParams.get("attach"));
                     List<SupplierRelease> list = supplierReleaseService.getSupplierRelease(supplierRelease);
 
@@ -229,7 +230,7 @@ public class WxPayAppController extends WxPayUtils {
                             //用户购买报价单后将100%的资金转入供应商余额
                             Map<String, Object> mapCommis = supplierReleaseService.getSitesInfo();//查询系统配置
                             BigDecimal bigDecimal = new BigDecimal(wxPay.getTotalFee());//支付金额
-                            BigDecimal bigDecimal1 = new BigDecimal((String) mapCommis.get("percentageFee"));//平台手续费
+                            BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(mapCommis.get("percentage_fee")));//平台手续费
                             BigDecimal poundage = bigDecimal.multiply(bigDecimal1);//手续费
                             //实际金额 - 手续费 = 供应商收入
                             poundage = bigDecimal.subtract(poundage);

+ 4 - 4
src/main/resources/application.yml

@@ -16,10 +16,10 @@ spring:
       enabled: true
       max-file-size: 100MB
       max-request-size: 100MB
-  task:
-    scheduling:
-      pool:
-        size: 8 #配置Scheduled定时任务为多线程 否则默认为单线程同一时间段不执行
+#  task:
+#    scheduling:
+#      pool:
+#        size: 8 #配置Scheduled定时任务为多线程 否则默认为单线程同一时间段不执行
 logging:
   level:
     com:

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

@@ -124,6 +124,7 @@
     border-left: 1px solid #e3e4e5;
     margin-top: 60px;
     overflow-y: auto;
+    overflow-x: hidden;
 }
 .content_right .content_add_div{
     padding-left: 76px;

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

@@ -1,5 +1,6 @@
 //查询指定报价单内容
 function getPrivateOrder(){
+    layer.load(3);
     $.ajax({
         url: "/privateOrder/getPrivateOrderById",
         type: "get",
@@ -23,6 +24,17 @@ function getPrivateOrder(){
                     }
                     offerCode = data.data.userId;
                 }
+                //滚动条监听
+                var observer = new IntersectionObserver(value => {
+                    console.log(value)
+                    var target = value[0].target
+                    console.log($(target).attr("dayNum"))
+                }, {
+                    root: document.querySelector(".content_right")
+                });
+                $.each($(".content_add_div"), (index, item) => {
+                    observer.observe(item)
+                });
             } else {
                 layer.alert(paramReturn("服务器异常,请联系管理员", parent.type), {icon: 2});
             }
@@ -46,164 +58,165 @@ function operationOut(obj){
 function addDay(addTiemVal){
    var uuid = guid();
    var dayNum = $(".timeline li").length;
+   var lastTime = $(".content_add_div").last().find(".date_content_div input").val();
     $(".timeline ul").append("<li onClick='clickDayNum(this)' dayNum="+ (parseInt(dayNum) + 1) +" data-v-2d69a44a=\"\">\n" +
         "                        <i data-v-2d69a44a=\"\">Day"+ (parseInt(dayNum) + 1) +"</i>\n" +
         "                        <span data-v-2d69a44a=\"\"></span>\n" +
         "                    </li>");
     $(".contract_uplod").before("<div class=\"content_add_div\" daynum="+ (parseInt(dayNum) + 1) +">\n" +
-        "                <!-- 日期选择 -->\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" +
-        "                    <div class=\"layui-input-inline\">\n" +
-        "                        <div class=\"date_content_div\">\n" +
-        "                            <img class=\"date_content_img\" src=\"/images/demandForSingle/date.png\">\n" +
-        "                            <input value="+ (typeof addTiemVal == "undefined" ? nowTime : addTiemVal) +" type=\"text\" class=\"layui-input date_content_input select_date_input"+ uuid +"\" name='planDate' data-locale=\"qingshurushijian\" placeholder=\"请输入时间 年.月.日\" lay-key=\"1\" readonly = \"readonly\">\n" +
-        "                        </div>\n" +
-        "                    </div>\n" +
-        "                </div>\n" +
-        "                <!-- 时间增加 -->\n" +
-        "                <div class=\"layui-inline\">\n" +
-        "                    <label class=\"layui-form-label\" data-locale=\"shijiandian\" style=\"margin-top: 8px\">"+ paramReturn("时间点", parent.type) +":</label>\n" +
-        "                    <div class=\"layui-input-inline positioning_div\" style=\"width: 90%\">\n" +
-        "                        <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" +
-        "                </div>\n" +
-        "                <!-- 游玩内容 -->\n" +
-        "                <div class=\"play_div\">\n" +
-        "                    <!-- 地点 -->\n" +
-        "                    <div class=\"play_content_div scenic_spot_div\">\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" +
-        "                            </svg>\n" +
-        "                            <input type=\"text\" data-locale=\"didianmingcheng\" placeholder=\""+ paramReturn("地点名称", parent.type) +"\" class=\"layui-input date_content_input\">\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-assets\" data-v-400c2eb9=\"\">\n" +
-        "                            <div class=\"editor-assets-control\" data-v-400c2eb9=\"\">\n" +
-        "                                <div class=\"editor-assets-control-item file_videos"+ uuid +"\" data-v-400c2eb9=\"\"><i\n" +
-        "                                        class=\"assets-icon assets-videos-icon\" data-v-400c2eb9=\"\"></i><span\n" +
-        "                                        data-v-400c2eb9=\"\" data-locale=\"charushipin\">"+ paramReturn("插入视频", parent.type) +"</span></div>\n" +
-        "                                <div class=\"editor-assets-control-item file_img"+ uuid +" file_margin\" data-v-400c2eb9=\"\"><i\n" +
-        "                                        class=\"assets-icon assets-images-icon\" data-v-400c2eb9=\"\"></i><span\n" +
-        "                                        data-v-400c2eb9=\"\" data-locale=\"charutupian\">"+ paramReturn("插入图片", parent.type) +"</span></div>\n" +
-        "                            </div>\n" +
-        "                            <div class=\"editor-assets-content\" data-v-400c2eb9=\"\"></div>\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"didianjieshao\">"+ paramReturn("地点介绍", parent.type) +"</p>\n" +
-        "                            <textarea data-locale=\"didianjieshao\" placeholder=\""+ paramReturn("地点介绍", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"xiugaiyijianneirong\">"+ paramReturn("修改意见内容", parent.type) +"</p>\n" +
-        "                            <textarea data-locale=\"xiugaiyijianneirong\" placeholder=\""+ paramReturn("修改意见内容", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
-        "                        </div>\n" +
-        "                        <!-- 关闭按钮 -->\n" +
-        "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
-        "                           <i class=\"layui-icon layui-icon-close\"></i>\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(\'"+ nowTime +"\')\")\">\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>\n" +
-        "                    <!-- 酒店 -->\n" +
-        "                    <div class=\"play_content_div hotel_play_div\">\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" +
-        "                            </svg>\n" +
-        "                            <input type=\"text\" placeholder=\"酒店名称\" class=\"layui-input date_content_input\">\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-assets\" data-v-400c2eb9=\"\">\n" +
-        "                            <div class=\"editor-assets-control\" data-v-400c2eb9=\"\">\n" +
-        "                                <div class=\"editor-assets-control-item file_videos"+ uuid +"\" data-v-400c2eb9=\"\"><i\n" +
-        "                                        class=\"assets-icon assets-videos-icon\" data-v-400c2eb9=\"\"></i><span\n" +
-        "                                        data-v-400c2eb9=\"\" data-locale=\"charushipin\">"+ paramReturn("插入视频", parent.type) +"</span></div>\n" +
-        "                                <div class=\"editor-assets-control-item file_img"+ uuid +" file_margin\" data-v-400c2eb9=\"\"><i\n" +
-        "                                        class=\"assets-icon assets-images-icon\" data-v-400c2eb9=\"\"></i><span\n" +
-        "                                        data-v-400c2eb9=\"\" data-locale=\"charutupian\">"+ paramReturn("插入图片", parent.type) +"</span></div>\n" +
-        "                            </div>\n" +
-        "                            <div class=\"editor-assets-content\" data-v-400c2eb9=\"\"></div>\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"jiudianjieshao\">"+ paramReturn("酒店介绍", parent.type) +"</p>\n" +
-        "                            <textarea data-locale=\"jiudianjieshao\" placeholder=\""+ paramReturn("酒店介绍", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"xiugaiyijianneirong\">"+ paramReturn("修改意见内容", parent.type) +"</p>\n" +
-        "                            <textarea data-locale=\"xiugaiyijianneirong\" placeholder=\""+ paramReturn("修改意见内容", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
-        "                        </div>\n" +
-        "                        <!-- 关闭按钮 -->\n" +
-        "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
-        "                           <i class=\"layui-icon layui-icon-close\"></i>\n" +
-        "                        </div>\n" +
-        "                    </div>\n" +
-        "                    <!-- 包车,车型-->\n" +
-        "                    <div class=\"play_content_div charte_play_div\">\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" +
-        "                            </svg>\n" +
-        "                            <input type=\"text\" data-locale=\"baoche\" placeholder=\""+ paramReturn("包车车型", parent.type) +"\" class=\"layui-input date_content_input\">\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-assets\" data-v-400c2eb9=\"\">\n" +
-        "                            <div class=\"editor-assets-control\" data-v-400c2eb9=\"\">\n" +
-        "                                <div class=\"editor-assets-control-item file_videos"+ uuid +"\" data-v-400c2eb9=\"\"><i\n" +
-        "                                        class=\"assets-icon assets-videos-icon\" data-v-400c2eb9=\"\"></i><span\n" +
-        "                                        data-v-400c2eb9=\"\" data-locale=\"charushipin\">"+ paramReturn("插入视频", parent.type) +"</span></div>\n" +
-        "                                <div class=\"editor-assets-control-item file_img"+ uuid +" file_margin\" data-v-400c2eb9=\"\"><i\n" +
-        "                                        class=\"assets-icon assets-images-icon\" data-v-400c2eb9=\"\"></i><span\n" +
-        "                                        data-v-400c2eb9=\"\" data-locale=\"charutupian\">"+ paramReturn("插入图片", parent.type) +"</span></div>\n" +
-        "                            </div>\n" +
-        "                            <div class=\"editor-assets-content\" data-v-400c2eb9=\"\"></div>\n" +
-        "                        </div>\n" +
+    "                <!-- 日期选择 -->\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" +
+    "                    <div class=\"layui-input-inline\">\n" +
+    "                        <div class=\"date_content_div\">\n" +
+    "                            <img class=\"date_content_img\" src=\"/images/demandForSingle/date.png\">\n" +
+    "                            <input value="+ (typeof addTiemVal == "undefined" ? addDatePlus(lastTime, 1) : addTiemVal) +" type=\"text\" class=\"layui-input date_content_input select_date_input"+ uuid +"\" name='planDate' data-locale=\"qingshurushijian\" placeholder=\"请输入时间 年.月.日\" lay-key=\"1\" readonly = \"readonly\">\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <!-- 时间增加 -->\n" +
+    "                <div class=\"layui-inline\">\n" +
+    "                    <label class=\"layui-form-label\" data-locale=\"shijiandian\" style=\"margin-top: 8px\">"+ paramReturn("时间点", parent.type) +":</label>\n" +
+    "                    <div class=\"layui-input-inline positioning_div\" style=\"width: 90%\">\n" +
+    "                        <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" +
+    "                </div>\n" +
+    "                <!-- 游玩内容 -->\n" +
+    "                <div class=\"play_div\">\n" +
+    "                    <!-- 地点 -->\n" +
+    "                    <div class=\"play_content_div scenic_spot_div\">\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" +
+    "                            </svg>\n" +
+    "                            <input type=\"text\" data-locale=\"didianmingcheng\" placeholder=\""+ paramReturn("地点名称", parent.type) +"\" class=\"layui-input date_content_input\">\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-assets\" data-v-400c2eb9=\"\">\n" +
+    "                            <div class=\"editor-assets-control\" data-v-400c2eb9=\"\">\n" +
+    "                                <div class=\"editor-assets-control-item file_videos"+ uuid +"\" data-v-400c2eb9=\"\"><i\n" +
+    "                                        class=\"assets-icon assets-videos-icon\" data-v-400c2eb9=\"\"></i><span\n" +
+    "                                        data-v-400c2eb9=\"\" data-locale=\"charushipin\">"+ paramReturn("插入视频", parent.type) +"</span></div>\n" +
+    "                                <div class=\"editor-assets-control-item file_img"+ uuid +" file_margin\" data-v-400c2eb9=\"\"><i\n" +
+    "                                        class=\"assets-icon assets-images-icon\" data-v-400c2eb9=\"\"></i><span\n" +
+    "                                        data-v-400c2eb9=\"\" data-locale=\"charutupian\">"+ paramReturn("插入图片", parent.type) +"</span></div>\n" +
+    "                            </div>\n" +
+    "                            <div class=\"editor-assets-content\" data-v-400c2eb9=\"\"></div>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"didianjieshao\">"+ paramReturn("地点介绍", parent.type) +"</p>\n" +
+    "                            <textarea data-locale=\"didianjieshao\" placeholder=\""+ paramReturn("地点介绍", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"xiugaiyijianneirong\">"+ paramReturn("修改意见内容", parent.type) +"</p>\n" +
+    "                            <textarea data-locale=\"xiugaiyijianneirong\" placeholder=\""+ paramReturn("修改意见内容", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+    "                        </div>\n" +
+    "                        <!-- 关闭按钮 -->\n" +
+    "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
+    "                           <i class=\"layui-icon layui-icon-close\"></i>\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>\n" +
+    "                    <!-- 酒店 -->\n" +
+    "                    <div class=\"play_content_div hotel_play_div\">\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" +
+    "                            </svg>\n" +
+    "                            <input type=\"text\" placeholder=\"酒店名称\" class=\"layui-input date_content_input\">\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-assets\" data-v-400c2eb9=\"\">\n" +
+    "                            <div class=\"editor-assets-control\" data-v-400c2eb9=\"\">\n" +
+    "                                <div class=\"editor-assets-control-item file_videos"+ uuid +"\" data-v-400c2eb9=\"\"><i\n" +
+    "                                        class=\"assets-icon assets-videos-icon\" data-v-400c2eb9=\"\"></i><span\n" +
+    "                                        data-v-400c2eb9=\"\" data-locale=\"charushipin\">"+ paramReturn("插入视频", parent.type) +"</span></div>\n" +
+    "                                <div class=\"editor-assets-control-item file_img"+ uuid +" file_margin\" data-v-400c2eb9=\"\"><i\n" +
+    "                                        class=\"assets-icon assets-images-icon\" data-v-400c2eb9=\"\"></i><span\n" +
+    "                                        data-v-400c2eb9=\"\" data-locale=\"charutupian\">"+ paramReturn("插入图片", parent.type) +"</span></div>\n" +
+    "                            </div>\n" +
+    "                            <div class=\"editor-assets-content\" data-v-400c2eb9=\"\"></div>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"jiudianjieshao\">"+ paramReturn("酒店介绍", parent.type) +"</p>\n" +
+    "                            <textarea data-locale=\"jiudianjieshao\" placeholder=\""+ paramReturn("酒店介绍", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"xiugaiyijianneirong\">"+ paramReturn("修改意见内容", parent.type) +"</p>\n" +
+    "                            <textarea data-locale=\"xiugaiyijianneirong\" placeholder=\""+ paramReturn("修改意见内容", parent.type) +"\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+    "                        </div>\n" +
+    "                        <!-- 关闭按钮 -->\n" +
+    "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
+    "                           <i class=\"layui-icon layui-icon-close\"></i>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                    <!-- 包车,车型-->\n" +
+    "                    <div class=\"play_content_div charte_play_div\">\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" +
+    "                            </svg>\n" +
+    "                            <input type=\"text\" data-locale=\"baoche\" placeholder=\""+ paramReturn("包车车型", parent.type) +"\" class=\"layui-input date_content_input\">\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-assets\" data-v-400c2eb9=\"\">\n" +
+    "                            <div class=\"editor-assets-control\" data-v-400c2eb9=\"\">\n" +
+    "                                <div class=\"editor-assets-control-item file_videos"+ uuid +"\" data-v-400c2eb9=\"\"><i\n" +
+    "                                        class=\"assets-icon assets-videos-icon\" data-v-400c2eb9=\"\"></i><span\n" +
+    "                                        data-v-400c2eb9=\"\" data-locale=\"charushipin\">"+ paramReturn("插入视频", parent.type) +"</span></div>\n" +
+    "                                <div class=\"editor-assets-control-item file_img"+ uuid +" file_margin\" data-v-400c2eb9=\"\"><i\n" +
+    "                                        class=\"assets-icon assets-images-icon\" data-v-400c2eb9=\"\"></i><span\n" +
+    "                                        data-v-400c2eb9=\"\" data-locale=\"charutupian\">"+ paramReturn("插入图片", parent.type) +"</span></div>\n" +
+    "                            </div>\n" +
+    "                            <div class=\"editor-assets-content\" data-v-400c2eb9=\"\"></div>\n" +
+    "                        </div>\n" +
 
-        "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"baochesijijieshao\">"+ paramReturn("包车司机介绍", parent.type) +"</p>\n" +
-        "                            <textarea placeholder=\""+ paramReturn("包车司机介绍", parent.type) +"\" data-locale=\"baochesijijieshao\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
-        "                        </div>\n" +
-        "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"xiugaiyijianneirong\">"+ paramReturn("修改意见内容", parent.type) +"</p>\n" +
-        "                            <textarea placeholder=\""+ paramReturn("修改意见内容", parent.type) +"\" data-locale=\"xiugaiyijianneirong\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
-        "                        </div>\n" +
-        "                        <!-- 关闭按钮 -->\n" +
-        "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
-        "                           <i class=\"layui-icon layui-icon-close\"></i>\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(\'"+ nowTime +"\')\")\">\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>\n" +
-        "                </div>\n" +
-        "            </div>");
+    "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"baochesijijieshao\">"+ paramReturn("包车司机介绍", parent.type) +"</p>\n" +
+    "                            <textarea placeholder=\""+ paramReturn("包车司机介绍", parent.type) +"\" data-locale=\"baochesijijieshao\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\" data-locale=\"xiugaiyijianneirong\">"+ paramReturn("修改意见内容", parent.type) +"</p>\n" +
+    "                            <textarea placeholder=\""+ paramReturn("修改意见内容", parent.type) +"\" data-locale=\"xiugaiyijianneirong\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+    "                        </div>\n" +
+    "                        <!-- 关闭按钮 -->\n" +
+    "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
+    "                           <i class=\"layui-icon layui-icon-close\"></i>\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>\n" +
+    "                </div>\n" +
+    "            </div>");
     addUrl(uuid);
 
 }
@@ -513,7 +526,7 @@ function elementDrawing(data){
                 "                            </svg>\n" +
                 "                        </div>\n" +
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
-                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay(\'"+ nowTime +"\')\")\">\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" +
@@ -593,7 +606,7 @@ function elementDrawing(data){
                 "                            </svg>\n" +
                 "                        </div>\n" +
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
-                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay(\'"+ nowTime +"\')\">\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" +

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

@@ -134,6 +134,7 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         }
         selectTemplate(uuidTemplate);
     });
+
     registerUser();
     getPrivateOrder(); //数据渲染
     getData();//内容渲染

+ 6 - 5
src/main/resources/static/js/release/index/function.js

@@ -41,6 +41,7 @@ function operationOut(obj){
 function addDay(addTiemVal){
     var uuid = guid();
     var dayNum = $(".timeline li").length;
+    var lastTime = $(".content_add_div").last().find(".date_content_div input").val();
     // $(".timeline ul").find("li").removeClass("pre-actived");
     $(".timeline ul").append("<li onClick='clickDayNum(this)' dayNum="+ (parseInt(dayNum) + 1) +" data-v-2d69a44a=\"\">\n" +
         "                        <i data-v-2d69a44a=\"\">Day"+ (parseInt(dayNum) + 1) +"</i>\n" +
@@ -53,7 +54,7 @@ function addDay(addTiemVal){
         "                    <div class=\"layui-input-inline\">\n" +
         "                        <div class=\"date_content_div\">\n" +
         "                            <img class=\"date_content_img\" src=\"/images/demandForSingle/date.png\">\n" +
-        "                            <input value="+ (typeof addTiemVal == "undefined" ? nowTime : addTiemVal) +" type=\"text\" class=\"layui-input date_content_input select_date_input"+ uuid +"\" data-locale=\"qingshurushijian\" name='planDate' placeholder=\"请输入时间 年.月.日\" lay-key=\"1\" readonly = \"readonly\">\n" +
+        "                            <input value="+ (typeof addTiemVal == "undefined" ? addDatePlus(lastTime, 1) : addTiemVal) +" type=\"text\" class=\"layui-input date_content_input select_date_input"+ uuid +"\" data-locale=\"qingshurushijian\" name='planDate' placeholder=\"请输入时间 年.月.日\" lay-key=\"1\" readonly = \"readonly\">\n" +
         "                        </div>\n" +
         "                    </div>\n" +
         "                </div>\n" +
@@ -106,7 +107,7 @@ function addDay(addTiemVal){
         "                            </svg>\n" +
         "                        </div>\n" +
         "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
-        "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onclick=\"addDay(\'"+ nowTime +"\')\")\">\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" +
@@ -179,7 +180,7 @@ function addDay(addTiemVal){
         "                            </svg>\n" +
         "                        </div>\n" +
         "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
-        "                           <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay(\'"+ nowTime +"\')\")\">\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" +
@@ -504,7 +505,7 @@ function elementDrawing(data){
                 "                            </svg>\n" +
                 "                        </div>\n" +
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
-                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay(\'"+ nowTime +"\')\")\">\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" +
@@ -578,7 +579,7 @@ function elementDrawing(data){
                 "                            </svg>\n" +
                 "                        </div>\n" +
                 "                        <div class=\"icon-group\" data-v-67b53f28=\"\">\n" +
-                "                            <div class=\"icon-item\" data-v-67b53f28=\"\" onClick=\"addDay(\'"+ nowTime +"\')\">\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" +

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

@@ -66,7 +66,7 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         ,accept: 'file'
         ,acceptMime: 'image/*,video/*'
         ,headers: {token: token}
-        ,before: function (){z``
+        ,before: function (){
             layer.load(2);
         }
         ,done: function(res){
@@ -105,7 +105,8 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
     translationVal(parent.type);//翻译
 
     $(document).on("click", ".close_play_button" , (e) => {
-        console.log($(this)[0])
         $($(this)[0]).remove()
     });
+    //日期框默认值
+    $(".select_date_input").val(nowTime);
 });

+ 1 - 0
src/main/resources/static/js/translationVal.js

@@ -1,6 +1,7 @@
 function translationVal(type){ //翻译
     layer.load(3)
     $.ajax({
+        async: false,
         url: "/json/"+ type +".json",
         type: "get",
         dateType: "json",