合并冲突

src/views/detail.vue

@@ -675,7 +675,12 @@
                         </div>
                         <el-affix position="top" :offset="0" @change="changeConcatType">
                         </el-affix>
-                        <div class="right-tool-box mg-t-20 dis-f al-item jus-x" style="flex-wrap:wrap;">
+                        <phoneqrcode class="mg-t-20" :type="housing"
+                            :qrcode="housingInfo['data'] && housingInfo['data'].qrcode">
+                        </phoneqrcode>
+                        <groupqrcode></groupqrcode>
+
+                        <!-- <div class="right-tool-box mg-t-20 dis-f al-item jus-x" style="flex-wrap:wrap;">
                             <div class="dis-f jus-x ">
                                 <img src="../assets/img/detail/wxTitle.png" class="wx-title" alt="">
                             </div>
@@ -690,8 +695,8 @@
                                     手机查看该房源
                                 </div>
                             </div>
-                        </div>
-                        <div class="right-tool-box mg-t-20 dis-f al-item jus-x" style="flex-wrap:wrap;">
+                        </div> -->
+                        <!-- <div class="right-tool-box mg-t-20 dis-f al-item jus-x" style="flex-wrap:wrap;">
                             <div class="dis-f jus-x ">
                                 <img src="../assets/img/detail/crowdTitle.png" class="wx-title" alt="">
                             </div>
@@ -707,7 +712,7 @@
                                     <span class="name-text">方同学的小助手</span>
                                 </div>
                             </div>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
             </div>
@@ -980,6 +985,8 @@ import Masonry from 'masonry-layout';
 import transmitBtn from '@/components/public/transmitBtn.vue'
 import biserialItem from '../components/biserialListItem/biserialListItem.vue'
 import backToTop from '@/components/public/backToTop.vue'
+import phoneqrcode from '@/components/public/phoneQRcode.vue';
+import groupqrcode from '@/components/public/group-QRcode.vue';
 
 import store from '@/store';
 
@@ -1158,7 +1165,11 @@ let setNavigation = () => {
                     areaItem: housingInfo['data']['info'].location.substring(0, 1),
                     types: housingInfo['data']['info'].type
                 },
+<<<<<<< HEAD
                 path: `${store.state.routeList['secondaryIndex'].path}`,
+=======
+                path: `${store.state.routeList['secondaryIndex'].path}}/${JSON.stringify({ name: location[housingInfo['data']['info'].location.substring(0, 1)] })}/${JSON.stringify({ type: 'types', data: { name: type[housingInfo['data']['info'].type.substring(0, 3)], id: housingInfo['data']['info'].type } })}`,
+>>>>>>> 2d161e5 (封装组件和修改bug)
                 title: `${location[housingInfo['data']['info'].location]}${type[housingInfo['data']['info'].type]}`
             }
     }else{
@@ -1223,14 +1234,13 @@ let setOperation = () => {
 //获取联系方式
 let concatData = reactive({})
 let getConcatData = () => {
-    showConcat.value = true
-    console.log(concatData['data'])
     if (concatData['data']) return
     api.contactData({
         token: housingInfo['data'].token
     }).then(res => {
         console.log(res)
         if (res.code === 200) {
+            showConcat.value = true
             concatData['data'] = res.data
             let dataCount = 0
             Object.keys(concatData['data']).map(res => {