Merge branch 'master' of http://119.23.72.7/shiyu/icsales

# Conflicts:
#	dist/js/global/global.min.js
css

Application/Home/View/RobOrder/index.html

@@ -40,8 +40,7 @@
     <script type="text/html" id="zqTpl">
     <script type="text/html" id="zqTpl">
         <div class="my_xj_list clr ">
         <div class="my_xj_list clr ">
             {{#  layui.each(d, function(index, item){ }}
             {{#  layui.each(d, function(index, item){ }}
-            <div class="my_xj_item fl boxsiz" style="cursor:pointer" userid="{{item.inquiry_items_id}}"
-                offerid="{{item.offer_id}}">
+            <div class="my_xj_item fl boxsiz" style="cursor:pointer" userid="{{item.inquiry_items_id}}">
                 <div class="item_top clr">
                 <div class="item_top clr">
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                 </div>
                 </div>

Application/Home/View/Search/index.html

@@ -98,7 +98,7 @@
     <script type="text/html" id="xjhtml">
     <script type="text/html" id="xjhtml">
         <div class="my_xj_list clr ">
         <div class="my_xj_list clr ">
             {{#  layui.each(d, function(index, item){ }}
             {{#  layui.each(d, function(index, item){ }}
-            <div class="my_xj_item fl boxsiz">
+            <div class="my_xj_item fl boxsiz xj_item" style="cursor:pointer" userid="{{item.inquiry_items_id}}">
                 <div class="item_top clr">
                 <div class="item_top clr">
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                 </div>
                 </div>

dist/css/chat.css

@@ -88,6 +88,7 @@
 }
 }
 .chat_content .content .content_div .notice_right .edit_img {
 .chat_content .content .content_div .notice_right .edit_img {
   cursor: pointer;
   cursor: pointer;
+  max-width: 100%;
 }
 }
 .chat_content .content .content_div .notice_right .chat_item {
 .chat_content .content .content_div .notice_right .chat_item {
   display: none;
   display: none;

dist/css/chat.less

@@ -108,6 +108,7 @@
 
 
                 .edit_img {
                 .edit_img {
                     cursor: pointer;
                     cursor: pointer;
+                    max-width: 100%;
                 }
                 }
 
 
                 .chat_item {
                 .chat_item {

dist/js/search/index.js

@@ -86,7 +86,11 @@ $(function () {
                     time = new Date(Util.getDay(-7));
                     time = new Date(Util.getDay(-7));
                     self.getData(spOrXj, 1,time.getTime() / 1000)
                     self.getData(spOrXj, 1,time.getTime() / 1000)
                 }
                 }
-            })
+            });
+            $('.goods_data_list').on('click','.xj_item',function(){
+                var userid = $(this).attr('userid');
+                window.location.href = "/quotedetail?id=" + userid
+            });
         }
         }
     };
     };
     search.init();
     search.init();