Browse Source

合并冲突

zyh
Gao xiaosong 4 years ago
parent
commit
507d3ac3de
  1. 2
      pages/shop/GoodsCon/index.vue

2
pages/shop/GoodsCon/index.vue

@ -49,7 +49,7 @@
</view> </view>
<!-- 门店信息 --> <!-- 门店信息 -->
<view class="store-info"> <view class="store-info" v-if="systemStore">
<view class="title acea-row row-between-wrapper"> <view class="title acea-row row-between-wrapper">
<view>门店信息</view> <view>门店信息</view>
<text @click="goStoreList()" class="praise"> <text @click="goStoreList()" class="praise">

Loading…
Cancel
Save