Merge remote-tracking branch 'origin/master'

src/views/supermarket/shopSpu/form.vue

@@ -33,11 +33,18 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :span="24" class="mb20">
+						<el-col :span="12" class="mb20">
 							<el-form-item label="商品封面图" prop="picUrl" required>
 								<upload-img v-model:imageUrl="form.picUrl"></upload-img>
 							</el-form-item>
 						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="商品状态" prop="status" required>
+								<el-radio-group v-model="form.status">
+									<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }}</el-radio>
+								</el-radio-group>
+							</el-form-item>
+						</el-col>
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品详情" prop="description">
 								<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
@@ -192,7 +199,7 @@ const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-const { supermarket_nature, spu_status } = useDict("supermarket_nature", "spu_status")
+const { supermarket_nature, status } = useDict("supermarket_nature", "status")
 // 提交表单数据
 const form = reactive({
 	id: "",
@@ -204,7 +211,7 @@ const form = reactive({
 	picUrl: "",
 	sliderPicUrls: "",
 	sort: 0,
-	status: "",
+	status: "0",
 	stock: 0,
 	giveIntegral: "",
 	merchantRelationId: "",