Merge branch 'sy_xbyh_191113' into development

Application/Home/View/GoodManage/gooddetail.html

@@ -64,7 +64,7 @@
                 <div class="fl">
                     <span class="icon iconfont iconjuxing10"></span>
                     {{#  if(d.company_type==1){ }}
-                    贸易商
+                    经销商
                     {{#  } }}
                     {{#  if(d.company_type==2){ }}
                     代理商

Application/Home/View/Home/index.html

@@ -197,7 +197,7 @@
                 <div class="company fl ellipsis boxsiz"><span class="mark">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商

Application/Home/View/QuotePrice/inquiry.html

@@ -145,7 +145,7 @@
             <div class="company fl ellipsis boxsiz"><span class="mark">
                     {{#  if(item.company_type!==""){ }}
                     {{#  if(item.company_type==1){ }}
-                    贸易商
+                    经销商
                     {{#  } }}
                     {{#  if(item.company_type==2){ }}
                     代理商

Application/Home/View/QuotePrice/inquirydetail.html

@@ -129,7 +129,7 @@
                             <div class="fl">
                                 <span class="icon iconfont iconjuxing10"></span>
                                 {{#  if(item.company_type==1){ }}
-                                贸易商 
+                                经销商 
                                 {{#  } }}
                                 {{#  if(item.company_type==2){ }}
                                 代理商

Application/Home/View/QuotePrice/quote.html

@@ -134,7 +134,7 @@
                 <span class="mark"> 
                 {{#  if(item.company_type){ }}
                     {{#  if(item.company_type==1){ }}
-                    贸易商
+                    经销商
                     {{#  } }}
                     {{#  if(item.company_type==2){ }}
                     代理商

Application/Home/View/RobOrder/index.html

@@ -40,7 +40,7 @@
     <script type="text/html" id="zqTpl">
         <div class="my_xj_list clr ">
             {{#  layui.each(d, function(index, item){ }}
-            <div class="my_xj_item fl boxsiz" style="cursor:pointer" userid="{{item.inquiry_items_id}}">
+            <div class="my_xj_item fl boxsiz" style="cursor:pointer" inquiryid="{{item.inquiry_items_id}}"  userid="{{item.user_id}}">
                 <div class="item_top clr">
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                 </div>
@@ -64,7 +64,7 @@
                     <span class="fl type mystype lineBlock">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商

Application/Home/View/Search/index.html

@@ -43,9 +43,9 @@
                         <!-- <div class="fz condition_content ">
                             <span class="bold">封装：</span>
                             <div class="condition_right_content clr">
-                                <div class="fl">贸易商</div>
-                                <div class="fl">贸易商</div>
-                                <div class="fl">贸易商</div>
+                                <div class="fl">经销商</div>
+                                <div class="fl">经销商</div>
+                                <div class="fl">经销商</div>
                             </div>
                         </div> -->
                     </div>
@@ -87,7 +87,7 @@
                     <span class="fl type mystype lineBlock">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商
@@ -125,7 +125,7 @@
     <script type="text/html" id="xjhtml">
         <div class="my_xj_list clr ">
             {{#  layui.each(d, function(index, item){ }}
-            <div class="my_xj_item fl boxsiz xj_item" style="cursor:pointer" userid="{{item.inquiry_items_id}}">
+            <div class="my_xj_item fl boxsiz xj_item" style="cursor:pointer" inquiryid="{{item.inquiry_items_id}}" userid="{{item.user_id}}">
                 <div class="item_top clr">
                     <div class="fl num ellipsis">{{item.goods_name}}</div>
                 </div>
@@ -146,7 +146,7 @@
                     <span class="fl type mystype lineBlock">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商

Application/Index/View/Index/search.html

@@ -41,9 +41,9 @@
                     <!-- <div class="fz condition_content ">
                         <span class="bold">封装：</span>
                         <div class="condition_right_content clr">
-                            <div class="fl">贸易商</div>
-                            <div class="fl">贸易商</div>
-                            <div class="fl">贸易商</div>
+                            <div class="fl">经销商</div>
+                            <div class="fl">经销商</div>
+                            <div class="fl">经销商</div>
                         </div>
                     </div> -->
                 </div>
@@ -83,7 +83,7 @@
                     <span class="fl type mystype lineBlock">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商
@@ -141,7 +141,7 @@
                     <span class="fl type mystype lineBlock">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商

Application/Search/View/Index/search.html

@@ -41,9 +41,9 @@
                     <!-- <div class="fz condition_content ">
                         <span class="bold">封装：</span>
                         <div class="condition_right_content clr">
-                            <div class="fl">贸易商</div>
-                            <div class="fl">贸易商</div>
-                            <div class="fl">贸易商</div>
+                            <div class="fl">经销商</div>
+                            <div class="fl">经销商</div>
+                            <div class="fl">经销商</div>
                         </div>
                     </div> -->
                 </div>
@@ -83,7 +83,7 @@
                     <span class="fl type mystype lineBlock">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商
@@ -141,7 +141,7 @@
                     <span class="fl type mystype lineBlock">
                         {{#  if(item.company_type!==""){ }}
                         {{#  if(item.company_type==1){ }}
-                        贸易商
+                        经销商
                         {{#  } }}
                         {{#  if(item.company_type==2){ }}
                         代理商

dist/js/roborder/index.js

@@ -58,8 +58,15 @@ $(function () {
                 self.getData(index,1)
             });
             $('.roborder_content').on('click','.my_xj_item',function(){
+                var inquiryid = $(this).attr('inquiryid');
                 var userid = $(this).attr('userid');
-                window.location.href = "/quotedetail?id=" + userid
+                var cookieUserId = Util.getCookie('user_id') || '';
+                if (userid == cookieUserId) {
+                    //自己查看自己的
+                    window.location.href = "/inquirydetail?id=" + inquiryid
+                } else {
+                    window.location.href = "/quotedetail?id=" + inquiryid
+                }
             });
               //编辑
             //   $('.edit_div').click(function () {

dist/js/search/index.js

@@ -129,23 +129,30 @@ $(function () {
                 }
             });
             $('.goods_data_list').on('click', '.xj_item', function () {
+                var inquiryid = $(this).attr('inquiryid');
                 var userid = $(this).attr('userid');
-                window.location.href = "/quotedetail?id=" + userid
+                var cookieUserId = Util.getCookie('user_id') || '';
+                if (userid == cookieUserId) {
+                    //自己查看自己的
+                    window.location.href = "/inquirydetail?id=" + inquiryid
+                } else {
+                    window.location.href = "/quotedetail?id=" + inquiryid
+                }
             });
             $('.goods_data_list').on('click', '.sp_item', function () {
                 var goodid = $(this).attr('goodid');
                 var eleuserid = $(this).attr('userid');
                 var userid = Util.getCookie('user_id') || "";
                 var type;
-                if(userid === eleuserid){
+                if (userid === eleuserid) {
                     type = 1
-                }else{
+                } else {
                     type = 2
                 }
-                window.location.href = "/gooddetail?type="+ type +"&id=" + goodid
+                window.location.href = "/gooddetail?type=" + type + "&id=" + goodid
             });
             $('.goods_data_list').on('click', '.lx_cus', function () {
-                Util.setCookie('customer',  Util.getRequest('key') || "", 1, cookieHostname)
+                Util.setCookie('customer', Util.getRequest('key') || "", 1, cookieHostname)
                 window.location.href = "/chat";
             });
         }