|
|
@@ -4,20 +4,14 @@
|
|
|
<view class="shore_business">
|
|
|
<view class="store_message">店铺业务<view class="shu_line"></view></view>
|
|
|
<view class="message_list">
|
|
|
-<<<<<<< HEAD
|
|
|
<navigator class="message_list_item clear" hover-class="none" url="../my_serve/my_serve">
|
|
|
-=======
|
|
|
<navigator class="message_list_item clear" hover-class="none" url="">
|
|
|
->>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
|
|
|
<view class="photo_lf">服务项目</view>
|
|
|
<view class="photo_middle">服务内容、价格明细</view>
|
|
|
<view class="photo_rg">{{allData.serviceItem}}<text class="iconfont more"></text></view>
|
|
|
</navigator>
|
|
|
-<<<<<<< HEAD
|
|
|
<navigator v-if="allData.paramType != 3" class="message_list_item clear" hover-class="none" url="../add_message/add_message">
|
|
|
-=======
|
|
|
<navigator v-if="allData.paramType != 3" class="message_list_item clear" hover-class="none" url="">
|
|
|
->>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
|
|
|
<view class="photo_lf">业务范围</view>
|
|
|
<view class="photo_rg"><view class="main_add">{{allData.pMainBusiness}}</view><text class="iconfont more"></text></view>
|
|
|
</navigator>
|
|
|
@@ -25,11 +19,8 @@
|
|
|
<view class="photo_lf">业务范围</view>
|
|
|
<view class="photo_rg"><view class="main_add">{{allData.pMainBusiness}}</view><text class="iconfont more"></text></view>
|
|
|
</navigator>
|
|
|
-<<<<<<< HEAD
|
|
|
<navigator class="message_list_item clear" hover-class="none" :url="'../introduce/introduce?name='+ allData.name">
|
|
|
-=======
|
|
|
<navigator class="message_list_item clear" hover-class="none" url="">
|
|
|
->>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
|
|
|
<view class="photo_lf">公司介绍</view>
|
|
|
<view class="photo_rg"><text class="iconfont more"></text></view>
|
|
|
</navigator>
|
Your Name