111

Application/Home/View/GoodManage/index.html

@@ -136,7 +136,14 @@
                 <div class="num fl ellipsis boxsiz">库存：
                     <span>{{item.stock}}</span>
                 </div>
-                <div class="price fl ellipsis boxsiz bold">￥{{item.price}}</div>
+                <div class="price fl ellipsis boxsiz bold">
+                    {{#  if(item.currency == 1){ }}
+                    ￥
+                    {{#  } else { }}
+                    $
+                    {{#  } }}
+                    {{item.price}}
+                </div>
                 {{# if(item['audit_status'] == 1){ }}
                     {{# if(item['status'] == 1){ }}
                     <div class="data_status fl  boxsiz zs">
@@ -156,9 +163,9 @@
             </div>
             {{# if(item['status'] == 1){ }}
                 {{# if(item['audit_status'] == 1){ }}
-                <a class="xj xj_status fr">下架</a>
+                <a class="xj xj_status fr xj_btn">下架</a>
                 {{# } else { }}
-                <a class="xj xj_status fr disabled">下架</a>
+                <a class="xj xj_status fr disabled xj_btn">下架</a>
                 {{# } }}
             {{# } else { }}
 

Application/Home/View/Index/search.html

@@ -64,7 +64,14 @@
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                 </div>
                 <div class="item_middle  clr">
-                    <div class="fl price">￥{{item.price}}</div>
+                    <div class="fl price">
+                        {{#  if(item.currency == 1){ }}
+                    ￥
+                    {{#  } else { }}
+                    $
+                    {{#  } }}
+                    {{item.price}}
+                    </div>
                     <div class="fr time">{{layui.util.toDateString(item.update_time * 1000,'yyyy-MM-dd HH:mm')}}</div>
                 </div>
                 <div class="item_bottom">

Application/Home/View/QuotePrice/inquiry.html

@@ -103,9 +103,9 @@
                 <a class="icon iconfont iconjuxing2 fr"></a>
                 {{#  if(item['status'] == 1){ }}
                 {{#  if(item['audit_status'] == 1){ }}
-                <a class="xj xj_status fr">下架</a>
+                <a class="xj xj_status fr xj_btn">下架</a>
                 {{#  } else { }}
-                <a class="xj xj_status fr disabled">下架</a>
+                <a class="xj xj_status fr disabled xj_btn">下架</a>
                 {{#  } }}
                 {{#  } else { }}
                 {{#  if(item['audit_status'] == 1){ }}

Application/Home/View/Search/index.html

@@ -68,7 +68,14 @@
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                 </div>
                 <div class="item_middle  clr">
-                    <div class="fl price">￥{{item.price}}</div>
+                    <div class="fl price">
+                        {{#  if(item.currency == 1){ }}
+                        ￥
+                        {{#  } else { }}
+                        $
+                        {{#  } }}
+                        {{item.price}}
+                    </div>
                     <div class="fr time">{{layui.util.toDateString(item.update_time * 1000)}}</div>
                 </div>
                 <div class="item_bottom">

dist/js/chat/index.js

@@ -576,7 +576,10 @@ $(function () {
                         params, true));
                     var contentHeight = $('#' + userId).find('.notice_item_content')
                         .height();
-                    $('#' + userId).find('.notice_list').scrollTop(contentHeight);
+                        setTimeout(function(){
+                            $('#' + userId).find('.notice_list').scrollTop(contentHeight);
+                        },200)
+                  
                 },
                 fail: function () {
                     console.log("Send Cmd failed");
@@ -622,7 +625,10 @@ $(function () {
                     }, false));
                     var contentHeight = $('#' + userId).find('.notice_item_content')
                         .height();
-                    $('#' + userId).find('.notice_list').scrollTop(contentHeight);
+                    // $('#' + userId).find('.notice_list').scrollTop(contentHeight);
+                    setTimeout(function(){
+                        $('#' + userId).find('.notice_list').scrollTop(contentHeight);
+                    },200)
                     $('#img_upload').val('');
                 },
                 fail: function () {
@@ -693,7 +699,11 @@ $(function () {
                     }
                 } else {
                     var contentHeight = $('#' + id).find('.notice_item_content').height();
-                    $('#' + id).find('.notice_list').scrollTop(contentHeight);
+                    // $('#' + id).find('.notice_list').scrollTop(contentHeight);
+                    setTimeout(function(){
+                        $('#' + id).find('.notice_list').scrollTop(contentHeight);
+                    },200)
+                    
                     if (newMember) {
                         return
                     }
@@ -778,7 +788,10 @@ $(function () {
             $('#' + id).find('.notice_item_content').prepend(chatCon);
             var contentHeight = $('#' + id).find('.notice_item_content')
                 .height();
-            $('#' + id).find('.notice_list').scrollTop(contentHeight);
+            
+            setTimeout(function(){
+                $('#' + id).find('.notice_list').scrollTop(contentHeight);
+            },200)
 
         },
     };

dist/js/goodmanage/index.js

@@ -158,7 +158,7 @@
       
       
       //下架
-      $('#listData').on('click', '.xj', function (e) {
+      $('#listData').on('click', '.xj_btn', function (e) {
         
         e.stopPropagation();
         

dist/js/quoteprice/inquiry.js

@@ -173,7 +173,7 @@ $(function () {
 
             });
             //下架
-            $('.inquiry_data').on('click', '.xj', function (e) {
+            $('.inquiry_data').on('click', '.xj_btn', function (e) {
                 e.stopPropagation();
                 var userId = $(this).parent('.data_item').attr('userid');
                 if ($(this).hasClass('disabled')) {