zhs vor 3 Jahren
Ursprung
Commit
1102ad6a7e

+ 4 - 0
src/main/java/com/supplier/model/PrivateOrder.java

@@ -119,4 +119,8 @@ public class PrivateOrder implements Serializable {
      * 用户头像
      */
     private String headpir;
+    /**
+     * 用户名称
+     */
+    private String orderName;
 }

+ 3 - 3
src/main/resources/config/mapping/privateOrderMapper.xml

@@ -5,7 +5,7 @@
     <!-- 查询私人订制 -->
     <select id="getPrivateOrder" resultType="PrivateOrder">
         SELECT
-            top ${limit} b.*,${orderType} as orderType,e.headpir
+            top ${limit} b.*,${orderType} as orderType,e.headpir,e.name as orderName
         FROM
             bus_private_ordering AS b
             JOIN ( SELECT code,demand_uuid FROM bus_private_ordering_type WHERE code = #{code} and order_type = #{orderType}) as c on b.uuid = c.demand_uuid
@@ -37,7 +37,7 @@
     <!-- 查询私人订制 -->
     <select id="getPrivateOrderTwo" resultType="PrivateOrder">
         SELECT
-            top ${limit} b.*,c.order_type as orderType,e.headpir
+            top ${limit} b.*,c.order_type as orderType,e.headpir,e.name as orderName
         FROM
             bus_private_ordering AS b
             JOIN ( SELECT code,demand_uuid,order_type FROM bus_private_ordering_type WHERE code = #{code} and (order_type = '2' or order_type = '3' or order_type = '4' or order_type = '5' or order_type = '12')) as c on b.uuid = c.demand_uuid
@@ -69,7 +69,7 @@
     <!-- 查询私人订制特殊 -->
     <select id="getPrivateOrderZeor" resultType="PrivateOrder">
         SELECT
-            top ${limit} b.*,${orderType} as orderType,e.headpir
+            top ${limit} b.*,${orderType} as orderType,e.headpir,e.name as orderName
         FROM
             bus_private_ordering AS b
             JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE code = #{code} AND order_type != 0 ) ) AS c ON b.uuid = c.uuid

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

@@ -277,6 +277,7 @@
     resize: none;
     border: unset;
     font-size: 16px;
+    min-height: 120px;
 }
 .editor-assets[data-v-400c2eb9] {
     margin-top: 24px;

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

@@ -358,6 +358,7 @@ function addUrl(uuid){
             }
             ,done: function(res){
                 $(this.item[0]).parent().next().append("<video src="+ res.data +" controls=\"\" onclick='clickVideo(this)' data-v-400c2eb9=\"\"></video>");
+                $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
                 layer.closeAll("loading");
             }
             ,error: function(){
@@ -391,6 +392,7 @@ function addUrl(uuid){
                     "                                              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>");
+                $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
                 layer.closeAll("loading");
             }
             ,error: function(){
@@ -636,6 +638,7 @@ function elementDrawing(data){
         }
     })
     addUrl(uuid);
+    $(".play_content_div").find("textarea").css("min-height", "0");
 }
 //查询订制
 function getData(){

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

@@ -20,6 +20,7 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         }
         ,done: function(res){
             $(this.item[0]).parent().next().append("<video src="+ res.data +" onclick='clickVideo(this)' controls=\"\" data-v-400c2eb9=\"\"></video>");
+            $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
             layer.closeAll("loading");
         }
         ,error: function(){
@@ -53,6 +54,7 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
                 "                                              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>");
+            $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
             layer.closeAll("loading");
         }
         ,error: function(){

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

@@ -360,6 +360,7 @@ function addUrl(uuid){
             }
             ,done: function(res){
                 $(this.item[0]).parent().next().append("<video src="+ res.data +" controls=\"\" onclick='clickVideo(this)' data-v-400c2eb9=\"\"></video>");
+                $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
                 layer.closeAll("loading")
             }
             ,error: function(){
@@ -393,6 +394,7 @@ function addUrl(uuid){
                     "                                              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>");
+                $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
                 layer.closeAll("loading");
             }
             ,error: function(){
@@ -440,7 +442,6 @@ function elementDrawing(data){
     var uuid = guid();
     //时间渲染
     var day = null;
-    console.log(data)
     $.each(data.data[0].releaseDay, (index, item) => {
         if(day != item.dayNum){
             //左侧时间轴
@@ -637,6 +638,7 @@ function elementDrawing(data){
     $.each($(".content_add_div"), (index, item) => {
         observer.observe(item);
     });
+    $(".play_content_div").find("textarea").css("min-height", "0");
 }
 //查询订制
 function getData(){

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

@@ -19,6 +19,7 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         }
         ,done: function(res){
             $(this.item[0]).parent().next().append("<video src="+ res.data +" onclick='clickVideo(this)' controls=\"\" data-v-400c2eb9=\"\"></video>");
+            $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
             layer.closeAll("loading");
         }
         ,error: function(){
@@ -56,6 +57,7 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
                 "                                              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>");
+            $(this.item[0]).parent().parent().parent().find("textarea").css("min-height", "0");
             layer.closeAll("loading");
         }
         ,error: function(){