zhs 3 年之前
父節點
當前提交
98028feb70

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

@@ -27,7 +27,7 @@
                     and CONVERT (datetime, start_time) <![CDATA[ >= ]]> #{startTime} and CONVERT(datetime, end_time) <![CDATA[ <= ]]> #{endTime}
                 </if>
                 <if test="destination != null and destination !=''">
-                    and destination = #{destination}
+                    and destination like concat('%', #{destination}, '%')
                 </if>
                 <if test="code != null and code !=''">
                     and code = #{code}
@@ -45,7 +45,7 @@
                 and CONVERT (datetime, start_time) <![CDATA[ >= ]]> #{startTime} and CONVERT(datetime, end_time) <![CDATA[ <= ]]> #{endTime}
             </if>
             <if test="destination != null and destination !=''">
-                and destination = #{destination}
+                and destination like concat('%', #{destination}, '%')
             </if>
             <if test="code != null and code !=''">
                 and code = #{code}

+ 3 - 3
src/main/resources/static/css/demandForSingle/offer.css

@@ -58,7 +58,7 @@
     float: left;
     width: 188px;
     height: 100%;
-    padding-top: 60px;
+    padding-top: 10px;
     padding-bottom: 60px;
     position: sticky;
     top: 50px;
@@ -122,7 +122,7 @@
     width: calc(100% - 188px - 6px);
     height: calc(100% - 60px - 80px);
     border-left: 1px solid #e3e4e5;
-    margin-top: 60px;
+    margin-top: 10px;
     overflow-y: auto;
     overflow-x: hidden;
 }
@@ -575,7 +575,7 @@
 .name_private_offer input{
     float: left;
     width: 954px;
-    height: 48px;
+    height: 34px;
     border: 1px solid #e3e4e5;
     border-radius: 10px;
     font-size: 16px;

+ 4 - 3
src/main/resources/static/css/indexHome/index.css

@@ -40,15 +40,16 @@ body,html{
     position: relative;
 }
 .message_num{
-    width: 20px;
-    height: 20px;
+    width: 16px;
+    height: 16px;
     background: #ffad1a;
     border-radius: 50%;
     position: absolute;
     right: -9px;
     top: -11px;
     text-align: center;
-    line-height: 20px;
+    line-height: 16px;
+    font-size: 12px;
     color: #fff;
     display: none;
 }

+ 1 - 1
src/main/resources/static/js/indexHome/function.js

@@ -28,7 +28,7 @@ function iframeClick(obj){
     //点击名称
     var thisClickName = $(obj).find("cite").attr("name");
     //点击名称防止翻译无效
-    var thisName = $(obj).find("cite").text();
+    var thisName = $(obj).find("cite").attr("name");
     //路径上参数
     var idVal = $(obj).attr("idVal");
     //翻译字段

+ 2 - 2
src/main/resources/static/js/personal/function.js

@@ -604,9 +604,9 @@ function withdrawal(){
             headers: {"token": localStorage.getItem("token")},
             dataType: "text",
             success: (data) => {
-                if(data == "提现余额不足" || data == "未找到该用户" || data == "提现失败请联系途丫管理员"){
+                if(data.msg =="500"){
                     layer.closeAll();
-                    parent.layer.msg(data, {icon: 3});
+                    parent.layer.msg(data.errMsg, {icon: 3});
                 } else {
                     layer.closeAll();
                     parent.layer.msg(data, {icon: 1});

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

@@ -67,7 +67,7 @@
                 <!-- 消息数量 -->
                 <div class="message_num">0</div>
                 <!-- 消息图片 -->
-                <img src="/images/indeHome/message.png" style="width: 35px;"/>
+                <img src="/images/indeHome/message.png"/>
             </div>
         </div>
         <!-- 左侧菜单 -->
@@ -91,7 +91,7 @@
                                     <a lay-id="HotDestination" lay-url="HotDestination" locale="daihuida" idVal="0" onClick="iframeClick(this)">
                                         <cite name="待回答">
                                             <span data-locale="daihuida">待回答</span>
-                                            <div class="message_num" style="top: 11px;left: 128px;">0</div>
+                                            <div class="message_num" style="top: 13px;left: 128px;">0</div>
                                         </cite>
                                     </a>
                                 </dd>