Merge branch 'liuin' into uat

src/pages/home/home-page.vue

@@ -53,7 +53,7 @@
             <div slot="content" class="item-content">
               <div class="top">{{ list.product_name }}</div>
               <img src="@/assets/homePage/hot.png" class="hot">
-              <div class="center"><span class="firsts">经销商</span> <span class="seconds">{{ list.bp_name }}</span></div>
+              <div class="center"><span class="firsts">{{ !list.office_id&&!list.agent_id?"-":(list.agent_id?'经销商':'办事处') }}</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?"-":(list.agent_id?list.agent_name:list.office_name) }}</span></div>
               <div class="center"><span class="firsts">产品型号</span> <span class="seconds">{{ list.product_code }}</span></div>
               <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n === list.city_id_n?list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n + list.district_id_n }}</span></div>
             </div>