Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/components/Select/SelectHardSpu.vue

@@ -16,9 +16,9 @@
 		<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
 			<div class="flex items-center">
 				<div class="color-primary">{{ v.name }}</div>
-				<div class="flex items-center justify-center ml5">
+				<div v-if="v.categoryName" class="flex items-center justify-center ml5">
 					<div class="flex items-center justify-center ml5">
-						<el-tag size="small"> {{ v.merchantName }} </el-tag>
+						<el-tag size="small"> {{ v.categoryName }} </el-tag>
 					</div>
 				</div>
 			</div>