Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: d56a5b90a7944c70db606f48b90da8bfea6d1730
+  newTag: 678623bfc4825eb043c204df40fe47809ec2d024

src/api/interface/customManageType.ts

@@ -194,6 +194,7 @@ export type editUserApplyTagDetails = InterFunction<
     licenseImg: string;
     remark: string;
     attachmentList?: { userApplyTagId: number; url: string; type: number }[];
+    brandLogo: string;
   }
 >;
 // 后台-编辑服务商信息

src/api/interface/goodsType.ts

@@ -140,6 +140,7 @@ type goodsItemType = {
     url: string;
   }[];
   shelfStatus: number;
+  recommend: number;
   tradeName: string;
   priceStock: {
     channelPrice: number;
@@ -162,7 +163,7 @@ export type addMallGoodsType = InterFunction<goodsItemType, any>;
 export type editMallGoodsType = InterFunction<goodsItemType & { id: number }, any>;
 //商品-列表（新）
 export type listPageGoodsInfoType = InterItemFunction<
-  { categoryPrimaryId?: number; tradeName?: string; shelfStatus?: number },
+  { categoryPrimaryId?: number; tradeName?: string; shelfStatus?: number; recommend?: number },
   (goodsItemType & { id: number })[]
 >;
 //商城-详情（新）

src/pages/customManage/customIdentity/comp/addEditModal/index.tsx

@@ -42,9 +42,13 @@ const AddEditModal: FC<propType> = (props) => {
   const [fileList, setFileList] = useState<
     { id: number; uid: number; url: string; name: string }[]
   >([]);
+  // 品牌logo文件
+  const [logoFileList, setLogoFileList] = useState<any>([]);
   // 关闭弹窗
   const handleCancel = () => {
     form.resetFields();
+    setLogoFileList([]);
+    setFileList([]);
     closed();
   };
   // 获取审批详情
@@ -68,6 +72,14 @@ const AddEditModal: FC<propType> = (props) => {
           url: v.url,
         })) || [];
       setFileList(fileList);
+      setLogoFileList([
+        {
+          id: Math.random(),
+          uid: Math.random().toString(),
+          name: 'brandLogo',
+          url: res.result.brandLogo,
+        },
+      ]);
     }
   };
   // 获取加盟列表
@@ -95,6 +107,11 @@ const AddEditModal: FC<propType> = (props) => {
       })),
     );
   };
+  // 品牌logo更换
+  const brandLogoChange = (value: any) => {
+    setLogoFileList(value);
+    form.setFieldValue('brandLogo', value[0].url);
+  };
 
   // 确认事件
   const handleOk = () => {
@@ -130,7 +147,6 @@ const AddEditModal: FC<propType> = (props) => {
     getCooperationList().then();
     if (!data) return;
     getApplyTagDetails().then();
-    // console.log('data --->', data);
   }, [open]);
   return (
     <>
@@ -189,6 +205,16 @@ const AddEditModal: FC<propType> = (props) => {
           >
             <Rate allowClear />
           </Form.Item>
+          <Form.Item label='品牌logo' name='brandLogo'>
+            <Uploader
+              fileUpload
+              listType='picture-card'
+              defaultFileList={logoFileList}
+              onChange={brandLogoChange}
+            >
+              <UploadOutlined />
+            </Uploader>
+          </Form.Item>
           <Form.Item label='营业执照'>
             <Image src={detail?.licenseImg} width={50} height={50} />
           </Form.Item>
@@ -226,7 +252,7 @@ const AddEditModal: FC<propType> = (props) => {
         </Form>
       </Modal>
       <SelectMapModal
-        title={'选择位置'}
+        title='选择位置'
         open={openAddress}
         closed={() => {
           setOpenAddress(false);

src/pages/customManage/customList/index.tsx

@@ -106,12 +106,6 @@ function CustomListView() {
   // 表格结构
   const columns: ColumnsType<TableType[0]> = [
     {
-      title: '用户UID',
-      dataIndex: 'id',
-      align: 'center',
-      width: '100px',
-    },
-    {
       title: '用户名称',
       dataIndex: 'userName',
       align: 'center',

src/pages/mallManage/mallGoods/goodsAddOrEditOrDetail/components/baseInfo/index.tsx

@@ -8,6 +8,7 @@ import { categoryListRespType } from '~/api/interface/categoryManage';
 import { CategoryManageAPI } from '~/api';
 import deletePng from '~/assets/image/delete.png';
 import './index.scss';
+import { useSelector } from 'react-redux';
 
 //分类返回类型
 type categoryType = InterDataType<categoryListRespType>['list'];
@@ -44,6 +45,7 @@ export type baseInfoType = {
 };
 
 const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
+  const { userInfo } = useSelector((state: any) => state.UserInfo);
   const [baseInfoForm] = Form.useForm<baseInfoType>();
   const [labelShow, setLabelShow] = useState<boolean>(false);
   //分类列表
@@ -139,7 +141,7 @@ const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
         labelCol={{ span: 2 }}
         wrapperCol={{ span: 8 }}
         form={baseInfoForm}
-        initialValues={{ labelShow: 0, shelfStatus: 1, priceShow: 1 }}
+        initialValues={{ labelShow: 0, shelfStatus: 1, priceShow: 1, recommend: 0 }}
       >
         <Form.Item
           label='商品名称'
@@ -224,6 +226,16 @@ const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
             <Select.Option value={0}>下架</Select.Option>
           </Select>
         </Form.Item>
+        {userInfo.roleInfo.superAdmin ? (
+          <Form.Item label='商品推荐' name='recommend'>
+            <Radio.Group>
+              <Radio value={1}>是</Radio>
+              <Radio value={0}>否</Radio>
+            </Radio.Group>
+          </Form.Item>
+        ) : (
+          ''
+        )}
         <Form.Item label='显示价格' name='priceShow'>
           <Radio.Group>
             <Radio value={1}>显示</Radio>

src/pages/mallManage/mallGoods/goodsAddOrEditOrDetail/index.tsx

@@ -159,6 +159,7 @@ const GoodsAddOrEditOrDetail = () => {
         labelShow: result.labelShow,
         goodsLabel: result.goodsLabel || undefined,
         priceShow: result.priceShow,
+        recommend: result.recommend,
       });
       baseInfoRef.current.setLabelShow(!!result.labelShow);
       baseInfoRef.current.mediaData.setMainFileList(mainImgList);

src/pages/mallManage/mallGoods/goodsList/index.tsx

@@ -59,6 +59,22 @@ const GoodsList = () => {
       type: 'select',
       options: [],
     },
+    {
+      label: '推荐',
+      placeholder: '请选择推荐状态',
+      name: 'recommend',
+      type: 'select',
+      options: [
+        {
+          name: '是',
+          id: 1,
+        },
+        {
+          name: '否',
+          id: 0,
+        },
+      ],
+    },
   ]);
   const tableColumns: ColumnsType<goodsType[0]> = [
     {
@@ -81,6 +97,12 @@ const GoodsList = () => {
       align: 'center',
       render: (_text: string, record: goodsType[0]) => getCategoryStr(record),
     },
+    {
+      title: '是否推荐',
+      align: 'center',
+      dataIndex: 'recommend',
+      render: (text: string) => (text ? '是' : '否'),
+    },
     { title: '创建时间', align: 'center', dataIndex: 'createTime' },
     {
       title: '状态',