From 4f89c1edfe107a5db03b9556c6d1a8ad7c015b4e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 8 Apr 2023 22:49:51 +0800
Subject: [PATCH] =?UTF-8?q?REVIEW=20=E5=95=86=E5=93=81=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1e0f613449ed0073caf8a9dc55bd8eb37bf6f115)
---
 src/api/mall/product/brand.ts              |  2 +-
 src/views/mall/product/brand/BrandForm.vue | 15 +++++++++++++--
 src/views/mall/product/brand/index.vue     |  2 +-
 src/views/mp/components/wx-msg/main.vue    |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/api/mall/product/brand.ts b/src/api/mall/product/brand.ts
index f5f6e218..dc8acc2a 100644
--- a/src/api/mall/product/brand.ts
+++ b/src/api/mall/product/brand.ts
@@ -51,6 +51,6 @@ export const getBrand = (id: number) => {
 }
 
 // 获得商品品牌列表
-export const getBrandList = (params: any) => {
+export const getBrandParam = (params: PageParam) => {
   return request.get({ url: '/product/brand/page', params })
 }
diff --git a/src/views/mall/product/brand/BrandForm.vue b/src/views/mall/product/brand/BrandForm.vue
index 38e9de52..d7910707 100644
--- a/src/views/mall/product/brand/BrandForm.vue
+++ b/src/views/mall/product/brand/BrandForm.vue
@@ -12,11 +12,21 @@
       </el-form-item>
       <el-form-item label="品牌图片" prop="picUrl">
         <UploadImg v-model="formData.picUrl" :limit="1" :is-show-tip="false" />
-        <div style="font-size: 10px">推荐 100x100 图片分辨率</div>
       </el-form-item>
       <el-form-item label="品牌排序" prop="sort">
         <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
       </el-form-item>
+      <el-form-item label="品牌状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="品牌描述">
         <el-input v-model="formData.description" type="textarea" placeholder="请输入品牌描述" />
       </el-form-item>
@@ -27,7 +37,8 @@
     </template>
   </Dialog>
 </template>
-<script setup lang="ts" name="ProductBrand">
+<script setup lang="ts" name="ProductBrandForm">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as ProductBrandApi from '@/api/mall/product/brand'
 const { t } = useI18n() // 国际化
diff --git a/src/views/mall/product/brand/index.vue b/src/views/mall/product/brand/index.vue
index 5d13b517..fab7a2de 100644
--- a/src/views/mall/product/brand/index.vue
+++ b/src/views/mall/product/brand/index.vue
@@ -132,7 +132,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
   loading.value = true
   try {
-    const data = await ProductBrandApi.getBrandList(queryParams)
+    const data = await ProductBrandApi.getBrandParam(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
diff --git a/src/views/mp/components/wx-msg/main.vue b/src/views/mp/components/wx-msg/main.vue
index 52397e12..60c0a5a2 100644
--- a/src/views/mp/components/wx-msg/main.vue
+++ b/src/views/mp/components/wx-msg/main.vue
@@ -139,7 +139,7 @@ import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'
 import WxNews from '@/views/mp/components/wx-news/main.vue'
 import WxLocation from '@/views/mp/components/wx-location/main.vue'
 import WxMusic from '@/views/mp/components/wx-music/main.vue'
-import { getUser } from '@/api/mp/mpuser'
+import { getUser } from '@/api/mp/user'
 import { defineComponent } from 'vue'
 
 const message = useMessage() // 消息弹窗