Merge branch 'feature/3月迭代-菜单' into dev

src/views/card/form.vue

@@ -373,8 +373,8 @@
         </div>
         <div class="fz12 gray " v-else>* 仅支持选择账号管辖门店范围内的门店；</div>
         <!-- :readonly="isEdit"  -->
-        <!-- <vue-gic-store-card class="pt10" :readonly="isInfo" v-bind="storeParams" v-show="storeMode" ref="storeCard" :uuid.sync="uuid"></vue-gic-store-card> -->
-        <dm-store-selector v-if="isAdd ? storeMode : storeMode && !isAdd && uuid" :readonly="isInfo" v-bind="storeParams" ref="storeCard" :uuid.sync="uuid"></dm-store-selector>
+        <vue-gic-store-card class="pt10" :readonly="isInfo" v-bind="storeParams" v-show="storeMode" ref="storeCard" :uuid.sync="uuid"></vue-gic-store-card>
+        <!-- <dm-store-selector v-if="isAdd ? storeMode : storeMode && !isAdd && uuid" :readonly="isInfo" v-bind="storeParams" ref="storeCard" :uuid.sync="uuid"></dm-store-selector> -->
         <el-alert v-show="storeMode && form.cardApplyChannel.indexOf('WMmicroMall') !== -1" title="选择的门店必须保持与微盟侧门店一致，请确认选择无误" type="warning" show-icon :closable="false" class="mt20 width80"></el-alert>
       </el-form-item>