wjx 2 лет назад
Родитель
Сommit
2cda7ce48d
4 измененных файлов с 92 добавлено и 8 удалено
  1. 0 2
      .gitignore
  2. 52 0
      config/proxy.ts
  3. 36 6
      src/components/FileBoxAD/components/imgModal/index.tsx
  4. 4 0
      src/services/api.ts

+ 0 - 2
.gitignore

@@ -10,8 +10,6 @@ _roadhog-api-doc
 /dist
 /dist1
 /.vscode
-/config/proxy.ts
-/src/services/api.ts
 # misc
 .DS_Store
 npm-debug.log*

+ 52 - 0
config/proxy.ts

@@ -0,0 +1,52 @@
+/**
+ * 在生产环境 代理是无法生效的,所以这里没有生产环境的配置
+ * The agent cannot take effect in the production environment
+ * so there is no configuration of the production environment
+ * For details, please see
+ * https://pro.ant.design/docs/deploy
+ */
+
+
+ export default {
+  dev: {
+    '/api/': {
+      target: 'http://47.97.38.17/api',
+      changeOrigin: true,
+      pathRewrite: { '/api': '' },
+    },
+    '/wapi/': {
+      target: 'http://api.zanxiangnet.com',//服务器
+      changeOrigin: true,
+      pathRewrite: { '^/wapi/': '' },
+    },
+    '/wxapi/':{//小程序
+      target: 'http://report.zanxiangwl.com',//服务器
+      changeOrigin: true,
+      pathRewrite: { '^/wxapi/': '' },
+    },
+    '/dapi/': {
+      target: 'http://data.zanxiangnet.com',//数据平台
+      changeOrigin: true,
+      pathRewrite: { '^/dapi/': '' },
+    },
+    // '/dapi/': {
+    //   target: 'http://data.zanxiangnet.com:8009/',//数据平台
+    //   changeOrigin: true,
+    //   pathRewrite: { '^/dapi/': '' },
+    // },
+  },
+  test: {
+    '/api/': {
+      target: 'https://preview.pro.ant.design',
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+  },
+  pre: {
+    '/api/': {
+      target: 'your pre url',
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+  },
+}

+ 36 - 6
src/components/FileBoxAD/components/imgModal/index.tsx

@@ -1,8 +1,9 @@
 import React, { useCallback, useState } from 'react'
-import { Form, Input, Modal } from 'antd'
+import { Form, Input, InputNumber, Modal, Upload } from 'antd'
 import FormItem from '@/components/Formitem'
 import { FormConfig } from '@/components/Formitem/type'
 import { useModel } from 'umi'
+import { RcFile } from 'antd/lib/upload'
 
 
 /**新建非图文素材 */
@@ -10,6 +11,8 @@ let ImgModal = React.memo((props: { isAll?: boolean }) => {
 
     /*****========STA=========*****/
     const { isAll } = props
+    const [queryForm, setQueryForm] = useState<{ title: string, sort: number, file: any }>({ title: '', sort: 0, file: null })
+    const [fileList, setFileList] = useState<any>([])
     const [fromsubmit, setFromsubmit] = useState<() => Promise<any>>()//存放from提交事件
     const callback = useCallback((fnc: () => Promise<any>) => { setFromsubmit(fnc) }, [])//回调获取from提交事件
     const { state, typeEnum, fileOk, offEditFile } = useModel(isAll ? 'useLaunchAdq.useBdMedia' : 'useLaunchAdq.useBdMediaPup')
@@ -31,6 +34,7 @@ let ImgModal = React.memo((props: { isAll?: boolean }) => {
         onCancel={() => {
             offEditFile();
         }}
+        width={450}
         destroyOnClose
         maskClosable={false}
     >
@@ -45,16 +49,42 @@ let ImgModal = React.memo((props: { isAll?: boolean }) => {
             name="basic"
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 20 }}
-            initialValues={{ remember: true }}
-            onFinish={onFinish}
-            onFinishFailed={onFinishFailed}
             autoComplete="off"
         >
             <Form.Item
                 label="图片名称"
-                name="fileName"
             >
-                <Input />
+                <Input value={queryForm.title} onChange={(e) => setQueryForm({ ...queryForm, title: e.target.value })} placeholder="请输入图片名称" />
+            </Form.Item>
+            <Form.Item
+                label="排序"
+                tooltip="数值越大越靠前"
+            >
+                <InputNumber value={queryForm.sort} onChange={(e) => setQueryForm({ ...queryForm, sort: e })} placeholder="请输入排序" />
+            </Form.Item>
+            <Form.Item
+                label={'上传' + typeEnum[mediaType as string]}
+            >
+                {/* {
+                    fileList?.length < 1 && <Upload
+                        listType="picture-card"
+                        accept='image/gif,image/jpeg,image/png,image/jpg'
+                        beforeUpload={function (file: RcFile) {
+                            fileChanage(file)
+                            return false
+                        }}
+                        fileList={fileList}
+                        onChange={(newFileList: any) => {
+                            setFileList([...newFileList.fileList])
+                        }}
+                        onPreview={(file: any) => {
+                            // setPreviewVisible(true)
+                            setFileUrl(file.thumbUrl)
+                        }}
+                    >
+                        {fileList?.length < 1 && '普通上传'}
+                    </Upload>
+                } */}
             </Form.Item>
         </Form>
     </Modal>

+ 4 - 0
src/services/api.ts

@@ -0,0 +1,4 @@
+export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'https://test.api.zanxiangnet.com'
+export let dataApi: any = process.env.NODE_ENV === 'development' ? 'dapi' : `http://data.zanxiangnet.com`
+export let wxApi: any = process.env.NODE_ENV === 'development' ? 'wxapi' : `https://report.zanxiangwl.com`
+export let launchApi: any = `http://192.168.7.175:8018`