zhs 3 anos atrás
pai
commit
998a22ff67

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

@@ -5,7 +5,7 @@
     <!-- 供应商发布路线 -->
     <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)
-        values(#{code},#{origin},#{destination},#{startTime},#{endTime},0,#{titleImg},#{offerName},#{priceAll},#{peopleNum},#{uuid},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),#{titleDayName})
+        values(#{code},#{origin},#{destination},#{startTime},#{endTime},0,#{titleImg},#{offerName},#{priceAll},#{peopleNum},#{uuid},GETDATE(),GETDATE(),#{titleDayName})
     </insert>
     <!-- 查询路线发布 -->
     <select id="getRelease" parameterType="SupplierRoute" resultType="SupplierRoute">
@@ -76,7 +76,7 @@
                 <if test="peopleNum != null and peopleNum != ''">
                     people_num = #{peopleNum},
                 </if>
-                update_date = format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),
+                update_date = SYSDATETIME(),
             </trim>
             where uuid = #{uuid}
         </set>

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

@@ -5,7 +5,7 @@
     <!-- 新增路线 -->
     <insert id="addRelease" parameterType="SupplierRelease">
         insert into bus_supplier_release(code,uuid,demand_uuid,jdrq,update_date,price_all,title_img,offer_name,price_detail,contract_file,price_detail_text,other,score,order_no)
-        values (#{code},#{uuid},#{demandUuid},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{priceAll},#{titleImg},#{offerName},#{priceDetail},#{contractFile},#{priceDetailText},#{other},#{score},#{orderNo})
+        values (#{code},#{uuid},#{demandUuid},GETDATE(),GETDATE(),#{priceAll},#{titleImg},#{offerName},#{priceDetail},#{contractFile},#{priceDetailText},#{other},#{score},#{orderNo})
     </insert>
     <!-- 新增每天内容 -->
     <insert id="addReleaseDay" parameterType="SupplierReleaseDay">
@@ -77,7 +77,7 @@
                 <if test="other != null and other != ''">
                     other = #{other},
                 </if>
-                update_date = format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),
+                update_date = SYSDATETIME(),
             </trim>
         </set>
         where uuid = #{uuid}

+ 1 - 1
src/main/resources/config/mapping/TemplateMapper.xml

@@ -5,7 +5,7 @@
     <!-- 新增路线 -->
     <insert id="addRelease" parameterType="SupplierRelease">
         insert into bus_supplier_release_template(code,uuid,jdrq,update_date,price_all,title_img,offer_name,travel_time)
-        values (#{code},#{uuid},format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),format(GETDATE(),'yyyy-MM-dd hh:mm:ss'),#{priceAll},#{titleImg},#{offerName},#{travelTime})
+        values (#{code},#{uuid},GETDATE(),GETDATE(),#{priceAll},#{titleImg},#{offerName},#{travelTime})
     </insert>
     <!-- 新增每天内容 -->
     <insert id="addReleaseDay" parameterType="SupplierReleaseDay">

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

@@ -384,7 +384,6 @@ cite img{
     margin-right: 6px;
 }
 .chat__room-info-title svg {
-    display: none;
     width: 20px;
     color: #999;
     cursor: pointer;

+ 4 - 3
src/main/resources/static/js/huanxin.js

@@ -30,13 +30,14 @@ conn.listen({
                     userMap.nickname = itemVal.nickname;
                     userMap.avatarurl = itemVal.avatarurl;
                 });
+                console.log(message)
                 $(".left_el_scrollbar").append("<div id='"+ message.from +"' name='"+ userMap.nickname +"' onclick='clickMessage(this)' class=\"chat__room-session-item\"><img\n" +
                     "                                        src=\""+ userMap.avatarurl +"\"\n" +
                     "                                        alt=\""+ userMap.nickname +"头像\"><span class=\"chat__room-session-item-unread\"\n" +
                     "                                                                style=\"display: none;\">0</span>\n" +
                     "                                    <div class=\"chat__room-user\"><p class=\"chat__room-user-title\"><span\n" +
-                    "                                            title=\""+ userMap.nickname +"\">"+ userMap.nickname +"</span><span>"+ format(message.time).split("|")[1] +"</span></p>\n" +
-                    "                                        <p title=\""+ message.msg  +"\">"+ message.msg +"</p></div>\n" +
+                    "                                            title=\""+ userMap.nickname +"\">"+ userMap.nickname +"</span><span>"+ format(parseInt(message.time)).split("|")[1] +"</span></p>\n" +
+                    "                                        <p title=\""+ message.data  +"\">"+ message.data +"</p></div>\n" +
                     "                                </div>");
             })
         }
@@ -93,7 +94,7 @@ conn.listen({
                     "                                        alt=\""+ userMap.nickname +"头像\"><span class=\"chat__room-session-item-unread\"\n" +
                     "                                                                style=\"display: none;\">0</span>\n" +
                     "                                    <div class=\"chat__room-user\"><p class=\"chat__room-user-title\"><span\n" +
-                    "                                            title=\""+ userMap.nickname +"\">"+ userMap.nickname +"</span><span>"+ format(message.time).split("|")[1] +"</span></p>\n" +
+                    "                                            title=\""+ userMap.nickname +"\">"+ userMap.nickname +"</span><span>"+ format(parseInt(message.time)).split("|")[1] +"</span></p>\n" +
                     "                                        <p title=\"[图片]\">[图片]</p></div>\n" +
                     "                                </div>");
             })

+ 5 - 0
src/main/resources/static/js/indexHome/index.js

@@ -75,6 +75,11 @@ layui.use(["layer", "form", "upload"], function(){
     $(".chat__room-info-control").on("click", (e) => {
         $("#uploadImg").click();
     });
+    //关闭聊天框
+    $(".chat__room-info-title svg").on("click", (e) => {
+        layer.closeAll();
+    });
+
 
     const input = document.querySelector("#uploadImg");
     input.addEventListener('change',function(){