修改

src/main/java/com/supplier/controller/SupplierReleaseController.java

@@ -213,6 +213,7 @@ public class SupplierReleaseController {
                     list.add(usedUser);
                 }
                 confirmOrdering1.setUsedUserArray(list);
+                confirmOrdering1.setPhone(DesDecry.decrypt(confirmOrdering1.getPhone()));
             }
             //行程
             StringBuilder trip = new StringBuilder();

src/main/resources/static/js/demandForSingle/offer/function.js

@@ -70,21 +70,6 @@ function addDay(addTiemVal){
         "                            <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" +
-        "                        <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='12: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" +
-        "                        <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='14: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" +
-        "                        <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='17: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" +
@@ -680,11 +665,32 @@ function closeSvg(obj){
 addDate = function(obj){
     //游玩渲染
     var uuid = guid();
-    $(obj).before("<div class=\"date_content_div\">\n" +
-        "<input type=\"text\" data-locale=\"shijian\" class=\"layui-input date_hours_content_input date_hours_content_val"+ uuid +"\" placeholder=\""+ paramReturn("时间", parent.type) +"\">\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>")
+    var timeVal = $(obj).parent().find(".date_hours_content_input").last().val();
+    if(timeVal == "08:00"){
+        $(obj).before("<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='12:00'>\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>")
+    } else if(timeVal == "12:00"){
+        $(obj).before("<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='14:00'>\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>")
+    } else if(timeVal == "14:00"){
+        $(obj).before("<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='17:00'>\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>")
+    } else {
+        $(obj).before("<div class=\"date_content_div\">\n" +
+            "<input type=\"text\" data-locale=\"shijian\" class=\"layui-input date_hours_content_input date_hours_content_val"+ uuid +"\" placeholder=\""+ paramReturn("时间", parent.type) +"\">\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>")
+    }
     addUrl(uuid);
 }
 delteDate = function (obj) {

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

@@ -8,7 +8,6 @@ function load(){
         headers: {"token": localStorage.getItem("token")},
         dataType: "json",
         success: (data) => {
-            console.log(data)
             if(data.msg == "200"){
                 $(".name_div_val").find("div").html(data.data.name);
                 $(".buy_account").html("充值人：    " + data.data.name);
@@ -22,12 +21,14 @@ function load(){
                 $(".bottom_content div").remove();
                 $.each(data.payments.data, (index, item) => {
                     var totalFee = item.total_fee;//付款金额
-                    var refund_fee = item.refund_fee == undefined ? 0 : item.refund_fee;//退款金额
-                    var percentageFee = data.system.percentage_fee;//平台手续费，付款金额 - （付款金额 * 平台手续费） - 退款金额 = 实际收入
+                    var refundFee = item.refund_fee == undefined ? 0 : item.refund_fee;//退款金额
+                    var percentageFee = data.system.percentage_fee;
+                    //平台手续费，付款金额 - 退款金额 - （付款金额 * 平台手续费） = 实际收入
+                    var income = (totalFee - refundFee) == 0 ? (totalFee - refundFee) : (totalFee - refundFee - (totalFee * percentageFee))
                     $(".bottom_content").append("<div class=\"content_div_font\" uuid=\""+ item.uuid +"\">\n" +
                         "                    <div class=\"date_detail\">"+ item.jdrq +"</div>\n" +
                         "                    <div class=\"content_detail\">"+ item.offer_name +"</div>\n" +
-                        "                    <div class=\"amount_detail\">￥"+ (totalFee - (totalFee * percentageFee) - refund_fee) +"</div>\n" +
+                        "                    <div class=\"amount_detail\">￥"+ income.toFixed(2) +"</div>\n" +
                         "                </div>");
                 });
             }

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

@@ -66,21 +66,6 @@ function addDay(addTiemVal){
         "                            <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" +
-        "                        <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='12: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" +
-        "                        <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='14: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" +
-        "                        <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='17: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" +
@@ -657,11 +642,32 @@ function closeSvg(obj){
 addDate = function(obj){
     //游玩渲染
     var uuid = guid();
-    $(obj).before("<div class=\"date_content_div\">\n" +
-        "<input type=\"text\" data-locale=\"shijian\" class=\"layui-input date_hours_content_input date_hours_content_val"+ uuid +"\" placeholder=\""+ paramReturn("时间", parent.type) +"\">\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>")
+    var timeVal = $(obj).parent().find(".date_hours_content_input").last().val();
+    if(timeVal == "08:00"){
+        $(obj).before("<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='12:00'>\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>")
+    } else if(timeVal == "12:00"){
+        $(obj).before("<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='14:00'>\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>")
+    } else if(timeVal == "14:00"){
+        $(obj).before("<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='17:00'>\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>")
+    } else {
+        $(obj).before("<div class=\"date_content_div\">\n" +
+            "<input type=\"text\" data-locale=\"shijian\" class=\"layui-input date_hours_content_input date_hours_content_val"+ uuid +"\" placeholder=\""+ paramReturn("时间", parent.type) +"\">\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>")
+    }
     addUrl(uuid);
 }
 delteDate = function (obj) {

src/main/resources/templates/demandForSingle/offer.html

@@ -95,21 +95,6 @@
                             <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>
-                        <div class="date_content_div">
-                            <input type="text" data-locale="shijian" class="layui-input date_hours_content_input" value="12: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>
-                        <div class="date_content_div">
-                            <input type="text" data-locale="shijian" class="layui-input date_hours_content_input" value="14: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>
-                        <div class="date_content_div">
-                            <input type="text" data-locale="shijian" class="layui-input date_hours_content_input" value="17: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>
                 </div>

src/main/resources/templates/release/index.html

@@ -118,21 +118,6 @@
                             <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>
-                        <div class="date_content_div">
-                            <input type="text" data-locale="shijian" class="layui-input date_hours_content_input" value="12: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>
-                        <div class="date_content_div">
-                            <input type="text" data-locale="shijian" class="layui-input date_hours_content_input" value="14: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>
-                        <div class="date_content_div">
-                            <input type="text" data-locale="shijian" class="layui-input date_hours_content_input" value="17: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>
                 </div>