合并冲突

4 years ago · 507d3ac3de
1 changed files with 1 additions and 1 deletions
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@ -49,7 +49,7 @@
      </view>
      <!-- 门店信息 -->
-      <view class="store-info">
+      <view class="store-info" v-if="systemStore">
        <view class="title acea-row row-between-wrapper">
          <view>门店信息</view>
          <text @click="goStoreList()" class="praise">