提交

config/routes.js

@@ -242,12 +242,6 @@ export default [
     ],
   },
 
-  {
-    path: '/shop',
-    icon: 'SettingOutlined',
-    name: '门店管理',
-    component: './shop',
-  },
   {
     name: '小程序管理',
     icon: 'BankFilled',
@@ -291,6 +285,13 @@ export default [
     icon: 'BankFilled',
     path: '/shopmanage',
     routes: [
+
+      {
+        path: '/shopmanage/shop',
+        icon: 'SettingOutlined',
+        name: '门店管理',
+        component: './shopmanage/shop',
+      },
       {
         name: '员工管理',
         icon: 'smile',

src/pages/applet/appidmanager/appid/index.jsx

@@ -38,7 +38,7 @@ const PayTemplate = () => {
             setCurrentRow(record);
             setDrawerVisible(true);
           }} >
-          编辑
+          更新
         </a>,
         <Popconfirm
           title="确定要删除吗？"
@@ -49,7 +49,7 @@ const PayTemplate = () => {
                 message.success('删除成功');
                 actionRef.current.reload();
               } else {
-                message.error(re.errors ||'删除失败');
+                message.error('删除失败');
               }
             });
           }}
@@ -75,7 +75,10 @@ const PayTemplate = () => {
           return <Button
             type="primary"
             key="primary"
-            onClick={() => {setDrawerVisible(true) }} >
+            onClick={() => {
+              form.resetFields();
+              setDrawerVisible(true) 
+              }} >
             <PlusOutlined /> 新建
           </Button>
         }}
@@ -115,7 +118,7 @@ const PayTemplate = () => {
                   setDrawerVisible(false);
                   actionRef.current.reload();
                 } else {
-                  message.error(re.errors ||'修改失败');
+                  message.error(re.errors||'修改失败');
                 }
               });
             } else {
@@ -125,7 +128,7 @@ const PayTemplate = () => {
                   setDrawerVisible(false);
                   actionRef.current.reload();
                 } else {
-                  message.error(re.errors ||'添加失败');
+                  message.error(re.errors||'添加失败');
                 }
               });
 

src/pages/applet/appidmanager/appid/service.js

@@ -1,28 +1,29 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 export function page(data) {
-    return request(`/storemanagement/api/appid/getappidpage`, {
+    return request(getStoremanagement()+`/api/appid/getappidpage`, {
         method: 'post',
         data: data,
     });
 }
 
 export function add(data) {
-    return request(`/storemanagement/api/appid/add`, {
+    return request(getStoremanagement()+`/api/appid/add`, {
         method: 'post',
         data: data,
     });
 }
 
 export function del(data) {
-    return request(`/storemanagement/api/appid/delete`, {
+    return request(getStoremanagement()+`/api/appid/delete`, {
         method: 'post',
         data: data,
     });
 }
 
 export function update(data) {
-    return request(`/storemanagement/api/appid/update`, {
+    return request(getStoremanagement()+`/api/appid/update`, {
         method: 'post',
         data: data,
     });

src/pages/applet/appidmanager/payment/index.jsx

@@ -1,19 +1,7 @@
 import React, { useState, useRef } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
 import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
-import {
-  Drawer,
-  Row,
-  Col,
-  Modal,
-  Form,
-  Input,
-  Button,
-  InputNumber,
-  TreeSelect,
-  Popconfirm,
-  message,
-} from 'antd';
+import { Drawer, Row, Col, Modal, Form, Input, Button, InputNumber, TreeSelect, Popconfirm, message } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import Field from '@ant-design/pro-field';
 import { CopyOutlined } from '@ant-design/icons';
@@ -29,12 +17,13 @@ const PayTemplate = () => {
 
   //请求详情
   const requestPayTemplate = async (fields) => {
+
     var data = {
       name: fields.name,
-      id: fields.id,
+      id: fields.id
     };
     var list = [];
-    fields.payTemplateOutDtoInfo.forEach((element) => {
+    fields.payTemplateOutDtoInfo.forEach(element => {
       if (element.payType == 1) {
         data.wxappId = element.appId;
         data.wxid = element.id;
@@ -52,10 +41,12 @@ const PayTemplate = () => {
         data.zfbprivateKey = element.privateKey;
         data.zfbpubLicKey = element.pubLicKey;
       }
+
     });
     return data;
   };
 
+
   const columns = [
     {
       title: '主键',
@@ -81,53 +72,53 @@ const PayTemplate = () => {
             var data = await requestPayTemplate(record);
             setCurrentRow(data);
             setDrawerVisible(true);
-          }}
-        >
-          编辑
+          }} >
+          更新
         </a>,
         <Popconfirm
           title="确定要删除此配置吗？"
-          onConfirm={() => {
+          onConfirm={() =>{
             var input = [record.id];
             deletepaytemplate(input).then((re) => {
               if (re.data) {
                 message.success('删除成功');
                 actionRef.current.reload();
               } else {
-                message.error('删除失败');
+                message.error(re.errors||'删除失败');
               }
             });
           }}
           okText="确定"
           cancelText="取消"
         >
-          <a key={record.id}>删除</a>
-        </Popconfirm>,
+          <a key={record.id} >
+            删除
+          </a>
+        </Popconfirm>
+
+
       ],
     },
   ];
   const intl = useIntl();
   return (
-    <PageContainer
-      header={{
-        title: '',
-        breadcrumb: {},
-      }}
-    >
+    <PageContainer header={{
+      title: '',
+      breadcrumb: {},
+    }}>
       <ProTable
         toolBarRender={() => {
-          return (
-            <Button
-              type="primary"
-              key="primary1"
-              onClick={() => {
-                setCurrentRow({});
-                setDrawerVisible(true);
-              }}
-            >
-              <PlusOutlined /> 新建
-            </Button>
-          );
+          return <Button
+            type="primary"
+            key="primary1"
+            onClick={() => {
+              setCurrentRow({});
+              setDrawerVisible(true);
+
+            }}
+          >
+            <PlusOutlined /> 新建
+          </Button>
         }}
         headerTitle="支付配置"
         actionRef={actionRef}
@@ -178,7 +169,7 @@ const PayTemplate = () => {
                   setDrawerVisible(false);
                   actionRef.current.reload();
                 } else {
-                  message.error('修改失败');
+                  message.error(re.errors||'修改失败');
                 }
               });
             } else {
@@ -188,9 +179,10 @@ const PayTemplate = () => {
                   setDrawerVisible(false);
                   actionRef.current.reload();
                 } else {
-                  message.error('添加失败');
+                  message.error(re.errors||'添加失败');
                 }
               });
+
             }
           }}
         >
@@ -201,7 +193,7 @@ const PayTemplate = () => {
             <Input placeholder="请输入名称" />
           </Form.Item>
           <Row>
-            <Col span={11}>
+            <Col span={11} >
               <h3>微信</h3>
               <Form.Item name="wxid" hidden={true}>
                 <Input />
@@ -209,41 +201,21 @@ const PayTemplate = () => {
               <Form.Item name="wxappId" label="AppId" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入appId" />
               </Form.Item>
-              <Form.Item
-                name="wxpId"
-                tooltip="微信的MCHid"
-                label="MchId"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="wxpId" tooltip="微信的MCHid" label="MchId" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入MchId" />
               </Form.Item>
-              <Form.Item
-                name="wxKey"
-                tooltip="微信的aAppKey"
-                label="AppKey"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="wxKey" tooltip="微信的aAppKey" label="AppKey" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入AppKey" />
               </Form.Item>
-              <Form.Item
-                name="wxpubLicKey"
-                tooltip="证书 "
-                label="证书"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="wxpubLicKey" tooltip="证书 " label="证书" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入证书" />
               </Form.Item>
-              <Form.Item
-                name="wxprivateKey"
-                tooltip="密码"
-                label="密码"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="wxprivateKey" tooltip="密码" label="密码" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入密码" />
               </Form.Item>
             </Col>
-            <Col span={2}></Col>
-            <Col span={11}>
+            <Col span={2} ></Col>
+            <Col span={11} >
               <h3>支付宝</h3>
               <Form.Item name="zfbid" hidden={true}>
                 <Input />
@@ -251,36 +223,16 @@ const PayTemplate = () => {
               <Form.Item name="zfbappId" label="AppId" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入appId" />
               </Form.Item>
-              <Form.Item
-                name="zfbpId"
-                tooltip="支付宝的Pid"
-                label="PId"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="zfbpId" tooltip="支付宝的Pid" label="PId" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入PId" />
               </Form.Item>
-              <Form.Item
-                name="zfbKey"
-                tooltip="支付宝的pk"
-                label="PK"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="zfbKey" tooltip="支付宝的pk" label="PK" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入PK" />
               </Form.Item>
-              <Form.Item
-                name="zfbpubLicKey"
-                tooltip="公钥 "
-                label="公钥"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="zfbpubLicKey" tooltip="公钥 " label="公钥" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入公钥" />
               </Form.Item>
-              <Form.Item
-                name="zfbprivateKey"
-                tooltip="私钥"
-                label="私钥"
-                rules={[{ required: true, max: 3000 }]}
-              >
+              <Form.Item name="zfbprivateKey" tooltip="私钥" label="私钥" rules={[{ required: true, max: 3000 }]}>
                 <Input placeholder="请输入私钥" />
               </Form.Item>
             </Col>

src/pages/applet/appidmanager/payment/service.js

@@ -1,28 +1,29 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 export function getPayTemplatePageList(data) {
-    return request(`/storemanagement/api/paytemplate/getPayTemplatePageList`, {
+    return request(getStoremanagement()+`/api/paytemplate/getPayTemplatePageList`, {
         method: 'post',
         data: data,
     });
 }
 
 export function add(data) {
-    return request(`/storemanagement/api/paytemplate/add`, {
+    return request(getStoremanagement()+`/api/paytemplate/add`, {
         method: 'post',
         data: data,
     });
 }
 
 export function deletepaytemplate(data) {
-    return request(`/storemanagement/api/paytemplate/delete`, {
+    return request(getStoremanagement()+`/api/paytemplate/delete`, {
         method: 'post',
         data: data,
     });
 }
 
 export function update(data) {
-    return request(`/storemanagement/api/paytemplate/update`, {
+    return request(getStoremanagement()+`/api/paytemplate/update`, {
         method: 'post',
         data: data,
     });

src/pages/applet/basicconfiguration/index.jsx

@@ -1,7 +1,7 @@
 import { PlusOutlined } from '@ant-design/icons';
 import ProTable from '@ant-design/pro-table';
 import { PageContainer } from '@ant-design/pro-layout';
-import { Button, Card, Image, Select, message, Modal, Input, Upload, Popconfirm, Table,Space  } from 'antd';
+import { Button, Card, Image, Select, message, Modal, Input, Upload, Popconfirm } from 'antd';
 import React, { useRef, useState } from 'react';
 import appletAPI from "../service";
 import { useEffect } from 'react';
@@ -20,6 +20,7 @@ const getBase64 = (file) =>
 const Material = () => {
     const actionRef = useRef();
     const [selectedStore, setSelectedStore] = useState('');
+    const [selectedPage, setSelectedPage] = useState('');
     const [storeList, setStoreList] = useState([]);
     const [isModalVisible, setIsModalVisible] = useState(false);
     const [currentImage, setCurrentImage] = useState({
@@ -42,10 +43,6 @@ const Material = () => {
     const [pageSize, setPageSize] = useState(10);
     const [total, setTotal] = useState(0);
 
-    const [dataList, setdataList] = useState([]);
-    const [loading, setLoading] = useState(false);
-
-
     const handleCancel = () => setPreviewVisible(false);
     const handlePreview = async (file) => {
         if (!file.url && !file.preview) {
@@ -89,25 +86,20 @@ const Material = () => {
             title: '操作',
             valueType: 'option',
             key: 'option',
-            fixed: 'right',
-            width: 200,
-            render: (_, record) =>
-            (
-                <Space size="middle">
-                    <a onClick={() => onEditMaterial(record)}>
-                        编辑
-                    </a>
-                    <Popconfirm
-                        title="确定要删除此素材吗？"
-                        onConfirm={() => onDeleteMaterial(record)}
-                        okText="确定"
-                        cancelText="取消"
-                    >
-                        <a href="#">删除</a>
-                    </Popconfirm>
-                </Space>
-            )
-        }
+            render: (_, record) => [
+                <a onClick={() => onEditMaterial(record)}>
+                    更新
+                </a>,
+                <Popconfirm
+                    title="确定要删除此素材吗？"
+                    onConfirm={() => onDeleteMaterial(record)}
+                    okText="确定"
+                    cancelText="取消"
+                >
+                    <a href="#">删除</a>
+                </Popconfirm>
+            ]
+        },
     ];
 
     const uploadButton = (
@@ -130,7 +122,7 @@ const Material = () => {
         const response = await appletAPI.GetAllStore();
         if (response.statusCode === 200) {
             setStoreList(response.data);
-            setSelectedStore(response.data[0].id);
+            setSelectedStore(response.data[0]?.id);
         } else {
             message.error(response.msg || '获取店铺列表失败');
         }
@@ -218,20 +210,18 @@ const Material = () => {
             if (response.statusCode === 200) {
                 message.success('更新成功');
                 setIsModalVisible(false);
-                //actionRef.current.reload();
-                await GetList();
+                actionRef.current.reload();
             } else {
-                message.error(response.errors || '更新失败')
+                message.error(response.errors||'更新失败')
             }
         } else {
             const response = await appletAPI.AddMinimaterial(jsonData);
             if (response.statusCode === 200) {
                 message.success('添加成功');
                 setIsModalVisible(false);
-                //actionRef.current.reload();
-                await GetList();
+                actionRef.current.reload();
             } else {
-                message.error(response.errors || '添加失败')
+                message.error(response.errors||'添加失败')
             }
         }
     }
@@ -275,8 +265,7 @@ const Material = () => {
     const onDeleteMaterial = async (record) => {
         const response = await appletAPI.DeleteMiniMaterial(record.id);
         if (response.statusCode === 200) {
-            // actionRef.current.reload();
-            await GetList();
+            actionRef.current.reload();
             message.success('删除成功');
         } else {
             message.error(response.errors || '删除失败');
@@ -294,6 +283,7 @@ const Material = () => {
         });
         if (response.statusCode === 200) {
             setMiniPageList(response.data.items);
+            setSelectedPage(response?.data?.items[0]?.id);
         } else {
             message.error(response.errors || '获取页面列表失败')
         }
@@ -310,47 +300,33 @@ const Material = () => {
         });
     }
 
-
-    const GetList = async () => {
-        setLoading(true);
-        if (!selectedStore) return;
-        const jsonData = {
-            "current": currentPage,
-            "pageSize": pageSize,
-            "storeId": selectedStore
-        }
-        const response = await appletAPI.MinimaterialListByStore(jsonData);
-        const pageList = [];
-        response.data.forEach(item => {
-            pageList.push(...item.list);
-        });
-        setLoading(false);
-        setdataList(pageList);
-    }
-
     useEffect(() => {
         onFetchStoreList();
-        GetList();
     }, []);
 
     useEffect(() => {
         if (!selectedStore) return;
         onFetchMiniPageList();
-        //actionRef.current.reload();
-        GetList();
+        if(!selectedPage) return;
+        actionRef.current.reload();
     }, [selectedStore]);
 
+    useEffect(() => {
+    actionRef.current.reload();
+    }, [selectedPage]);
+
     return <PageContainer header={{
         title: '',
         breadcrumb: {},
     }}>
         <Card style={{ marginBottom: '10px' }}>
-            <div className={styles.table_search_item}>
+            <div className={styles.table_search_item} style={{float:"left"}}>
                 <div>
                     当前门店：
                 </div>
                 <Select style={{ width: 300 }} value={selectedStore} onChange={(value) => {
                     setSelectedStore(value);
+                    setSelectedPage(miniPageList[0]?.id);
                 }}>
                     {
                         storeList.map(item => {
@@ -359,22 +335,24 @@ const Material = () => {
                     }
                 </Select>
             </div>
+           <div style={{float:"left"}}>&nbsp;&nbsp;&nbsp;&nbsp;</div>
+            <div className={styles.table_search_item} style={{float:"left"}}>
+                <div>
+                    所属页面：
+                </div>
+                <Select style={{ width: 300 }} value={selectedPage} onChange={(value) => {
+                    setSelectedPage(value);
+                    actionRef.current.reload();
+                }}>
+                    {
+                        miniPageList.map(item => {
+                            return <Option value={item.id} key={item.id}>{item.pageName}</Option>
+                        })
+                    }
+                </Select>
+            </div>
         </Card>
-        <div>
-            <Button key="button" style={{ float: "right",marginRight:"50px",marginTop:"10px",marginBottom:"7px" }} icon={<PlusOutlined />} type="primary" onClick={() => { setIsModalVisible(true); onBeforeCreate() }}>
-                新建
-            </Button>
-        </div>
-               
-        <Table
-            scroll={{
-                x: 1300,
-            }}
-            loading={loading}
-            columns={columns} 
-            dataSource={dataList} />
-
-        {/* <ProTable
+        <ProTable
             search={false}
             columns={columns}
             actionRef={actionRef}
@@ -382,22 +360,26 @@ const Material = () => {
             editable={{
                 type: 'multiple',
             }}
-            request={async () => {
+            pagination={{
+                pageSize: 10,
+              }}
+            request={async (params) => {
                 if (!selectedStore) return;
                 const jsonData = {
-                    "current": currentPage,
-                    "pageSize": pageSize,
-                    "storeId": selectedStore
+                    "current": params.current,
+                    "pageSize": params.pageSize,
+                    "storeId": selectedStore,
+                    "pageId":selectedPage
                 }
                 const response = await appletAPI.MinimaterialListByStore(jsonData);
                 const pageList = [];
-                response.data.forEach(item => {
+                response.data.items.forEach(item => {
                     pageList.push(...item.list);
                 });
                 return {
                     data: pageList,
                     success: true,
-                    total: pageList.length,
+                    total: response.data.totalCount,
                 }
             }}
             columnsState={{
@@ -419,49 +401,52 @@ const Material = () => {
                     新建
                 </Button>
             ]}
-        /> */}
-        <Modal title="编辑素材" visible={isModalVisible} footer={null} onOk={onAddPageMaterial} onCancel={() => setIsModalVisible(false)} bodyStyle={{ padding: '32px 40px 1px 48px', height: '465px' }}>
+        />
+        <Modal
+            title="编辑素材"
+            maskClosable={false}
+            visible={isModalVisible} footer={null} onOk={onAddPageMaterial} onCancel={() => setIsModalVisible(false)} bodyStyle={{ padding: '32px 40px 1px 48px', height: '465px' }}>
             <div className={styles.edit_image_card}>
                 <div className={styles.edit_image_item}>
                     <div className={styles.edit_image_prev}>
-                        素材名称：
+                        所属页面：
                     </div>
                     <div className={styles.edit_image_suffix}>
-                        <Input placeholder='请输入素材名称' value={currentImage.materialName} onChange={value => {
+                        <Select placeholder="请选择所在页面" style={{ width: '100%' }} value={currentImage.pageId} onChange={(value) => {
                             const tempImg = JSON.parse(JSON.stringify(currentImage));
-                            tempImg.materialName = value.target.value;
+                            tempImg.pageId = value;
                             setCurrentImage(tempImg);
-                        }}></Input>
+                        }}>
+                            {
+                                miniPageList.map(item => {
+                                    return <Option value={item.id} key={item.id}>{item.pageName}</Option>
+                                })
+                            }
+                        </Select>
                     </div>
                 </div>
                 <div className={styles.edit_image_item}>
                     <div className={styles.edit_image_prev}>
-                        素材编码：
+                        素材名称：
                     </div>
                     <div className={styles.edit_image_suffix}>
-                        <Input placeholder='请输入素材编码' value={currentImage.materialCode} onChange={value => {
+                        <Input placeholder='请输入素材名称' value={currentImage.materialName} onChange={value => {
                             const tempImg = JSON.parse(JSON.stringify(currentImage));
-                            tempImg.materialCode = value.target.value;
+                            tempImg.materialName = value.target.value;
                             setCurrentImage(tempImg);
                         }}></Input>
                     </div>
                 </div>
                 <div className={styles.edit_image_item}>
                     <div className={styles.edit_image_prev}>
-                        所属页面：
+                        素材编码：
                     </div>
                     <div className={styles.edit_image_suffix}>
-                        <Select placeholder="请选择所在页面" style={{ width: '100%' }} value={currentImage.pageId} onChange={(value) => {
+                        <Input placeholder='请输入素材编码' value={currentImage.materialCode} onChange={value => {
                             const tempImg = JSON.parse(JSON.stringify(currentImage));
-                            tempImg.pageId = value;
+                            tempImg.materialCode = value.target.value;
                             setCurrentImage(tempImg);
-                        }}>
-                            {
-                                miniPageList.map(item => {
-                                    return <Option value={item.id} key={item.id}>{item.pageName}</Option>
-                                })
-                            }
-                        </Select>
+                        }}></Input>
                     </div>
                 </div>
                 <div className={styles.edit_image_item}>

src/pages/applet/paytemplate/index.jsx

@@ -50,7 +50,7 @@ const pageManage = () => {
                     pageForm.setFieldsValue(record);
                     setIsModalVisible(true);
                 }}>
-                    编辑
+                    更新
                 </a>,
                 <Popconfirm
                     title="确定要删除此页面吗？"
@@ -115,7 +115,7 @@ const pageManage = () => {
         const response = await appletAPI.GetAllStore();
         if (response.statusCode==200) {
             setStoreList(response.data);
-            setSelectedStore(response.data[0].id);
+            setSelectedStore(response.data[0]?.id);
         } else {
             message.error(response.msg || '获取店铺列表失败');
         }
@@ -186,7 +186,10 @@ const pageManage = () => {
                 </Button>
             ]}
         />
-        <Modal title="编辑页面" footer={false} visible={isModalVisible} onOk={() => setIsModalVisible(false)} onCancel={() => setIsModalVisible(false)} bodyStyle={{ padding: '32px 40px 1px 48px' }}>
+        <Modal 
+        title="编辑页面" 
+        maskClosable={false}
+        footer={false} visible={isModalVisible} onOk={() => setIsModalVisible(false)} onCancel={() => setIsModalVisible(false)} bodyStyle={{ padding: '32px 40px 1px 48px' }}>
             <Form
                 name="basic"
                 form={pageForm}
@@ -199,25 +202,30 @@ const pageManage = () => {
                     <Input />
                 </Form.Item>
                 <Form.Item
-                    label="页面名称"
-                    name="pageName"
+                    label="归属场景"
+                    name="storeId"
                     rules={[
                         {
                             required: true,
-                            message: '请输入页面名称！',
+                            message: '请选择门店！',
                         },
                     ]}
                 >
-                    <Input />
+                    <Select allowClear placeholder="请选择门店" style={{ width: '100%' }}>
+                        {
+                            storeList.map(item => {
+                                return <Option value={item.id} key={item.id}>{item.name}</Option>
+                            })
+                        }
+                    </Select>
                 </Form.Item>
-
                 <Form.Item
-                    label="页面路径"
-                    name="pageRoute"
+                    label="页面名称"
+                    name="pageName"
                     rules={[
                         {
                             required: true,
-                            message: '请输入页面路径！',
+                            message: '请输入页面名称！',
                         },
                     ]}
                 >
@@ -225,22 +233,16 @@ const pageManage = () => {
                 </Form.Item>
 
                 <Form.Item
-                    label="归属场景"
-                    name="storeId"
+                    label="页面路径"
+                    name="pageRoute"
                     rules={[
                         {
                             required: true,
-                            message: '请选择门店！',
+                            message: '请输入页面路径！',
                         },
                     ]}
                 >
-                    <Select allowClear placeholder="请选择门店" style={{ width: '100%' }}>
-                        {
-                            storeList.map(item => {
-                                return <Option value={item.id} key={item.id}>{item.name}</Option>
-                            })
-                        }
-                    </Select>
+                    <Input />
                 </Form.Item>
 
                 <Form.Item>

src/pages/applet/service.js

@@ -1,13 +1,14 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 export default {
 	GetAllStore() {
-		return request('/storemanagement/api/shop/alllist', {
+		return request(getStoremanagement()+'/api/shop/alllist', {
 			method: 'GET'
 		});
 	},
 	GetCosRequestURL(data) {
-		return request(`/storemanagement/api/SysService/GetPresignUploadUrl`, {
+		return request(getStoremanagement()+`/api/SysService/GetPresignUploadUrl`, {
 			method: 'POST',
 			data: data,
 		});
@@ -16,7 +17,7 @@ export default {
 	//-----------------------页面管理 start---------------------
 	//分页查询
 	MiniPageList(params) {
-		return request('/storemanagement/api/AppletService/page', {
+		return request(getStoremanagement()+'/api/AppletService/page', {
 			method: 'POST',
 			data: {
 				...params
@@ -30,7 +31,7 @@ export default {
 		 * @returns 
 		 */
 	MiniPageAdd(params) {
-		return request('/storemanagement/api/AppletService/add', {
+		return request(getStoremanagement()+'/api/AppletService/add', {
 			method: 'POST',
 			data: {
 				...params
@@ -43,7 +44,7 @@ export default {
 		 * @param {*} params 
 		 */
 	MiniPageUpdate(params) {
-		return request('/storemanagement/api/AppletService/update', {
+		return request(getStoremanagement()+'/api/AppletService/update', {
 			method: 'POST',
 			data: {
 				...params
@@ -57,7 +58,7 @@ export default {
 		 * @returns 
 		 */
 	MiniPageDelete(id) {
-		return request('/storemanagement/api/AppletService/del', {
+		return request(getStoremanagement()+'/api/AppletService/del', {
 			method: 'POST',
 			data: {
 				id
@@ -76,7 +77,7 @@ export default {
 		 * 根据店铺id查询素材
 		 */
 	MinimaterialListByStore(params) {
-		return request(`/storemanagement/api/AppletService/MiniStoreMaterial`, {
+		return request(getStoremanagement()+`/api/AppletService/MiniStoreMaterial`, {
 			method: 'POST',
 			data: params,
 		});
@@ -88,7 +89,7 @@ export default {
 		 * @returns 
 		 */
 	AddMinimaterial(params) {
-		return request(`/storemanagement/api/AppletService/MaterialAdd`, {
+		return request(getStoremanagement()+`/api/AppletService/MaterialAdd`, {
 			method: 'POST',
 			data: params,
 		});
@@ -99,34 +100,26 @@ export default {
 	 * @param {*} params 
 	 */
 	UpdateMiniMaterial(params) {
-		return request(`/storemanagement/api/AppletService/MaterialUpdate`, {
+		return request(getStoremanagement()+`/api/AppletService/MaterialUpdate`, {
 			method: 'POST',
 			data: params,
 		});
 	},
 
-
-	//-----------------------素材管理 end---------------------
-
-
-	/**
+		/**
 	 * 删除素材
 	 */
-	DeleteMiniMaterial(id) {
-		return request(`/storemanagement/api/AppletService/MaterialDel`, {
-			method: 'POST',
-			data: {
-				id
-			},
-		});
-	},
-
-
-
-
-
+		DeleteMiniMaterial(id) {
+			return request(getStoremanagement()+`/api/AppletService/MaterialDel`, {
+				method: 'POST',
+				data: {
+					id
+				},
+			});
+		},
 
 
+	//-----------------------素材管理 end---------------------
 
 
 }

src/pages/groupMeal/member/memberInfo/service.js

@@ -0,0 +1,62 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+
+
+//获取会员信息
+export function GetMemberPageQuery(data) {
+  return request(getStoremanagement()+`​/api/MemberInfoService/GetMemberPageQuery`, {
+    method: 'post',
+    data: data,
+  });
+}
+
+//添加会员
+export function CreateMemberInfo(data) {
+  return request(getStoremanagement()+`/api/MemberInfoService/AddMember`, {
+    method: 'post',
+    data: data,
+  });
+}
+
+//修改会员信息
+export function UpdateMemberInfo(data) {
+  return request(getStoremanagement()+`/api/MemberInfoService/UpdateMemberInfo`, {
+    method: 'post',
+    data: data,
+  });
+}
+
+//修改会员状态
+export function UpdateMemberStatus(data) {
+  return request(getStoremanagement()+`/api/MemberInfoService/UpdateMemberStatus`, {
+    method: 'post',
+    data: data,
+  });
+}
+
+//获取会员
+export function GetPlatformMemberList(data) {
+  return request(getStoremanagement()+`/api/MemberInfoService/GetPlatformMemberList?memberId=${data}`, {
+    method: 'get',
+  });
+}
+
+//获取会员标签  和绑定详情
+export function GetMemberTagAndInfo(memberinfoid, platformtype) {
+  return request(
+    getStoremanagement()+`/api/MemberInfoService/GetMemberTagAndInfo?memberInfoId=${memberinfoid}&PlatformType=${platformtype}`,
+    {
+      method: 'get',
+    },
+  );
+}
+
+//修改会员标签
+export function UpdateMemberTag(data) {
+  return request(getStoremanagement()+`/api/MemberInfoService/UpdateMemberTag`, {
+    method: 'post',
+    data: data,
+  });
+}
+

src/pages/groupMeal/member/membertag/services.js

@@ -0,0 +1,48 @@
+// @ts-ignore
+
+/* eslint-disable */
+import { defaultActionRender } from '@ant-design/pro-utils/lib/useEditableArray';
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+  /** 获取会员标签信息  sdsa GET /kitchen/api/rule */
+  memberTagList(data) {
+    return request(getStoremanagement()+`/api/MemberTagService/MemberTagQueryDto`, {
+      method: 'POST',
+      data: data,
+      // params: { ...params },
+      // ...(options || {}),
+    });
+  },
+  /** 新建会员标签信息 POST /kitchen/api/rule */
+  addMemberTag(data) {
+    // http://localhost:7002
+    return request(getStoremanagement()+`/api/MemberTagService/AddMemberTag`, {
+      method: 'POST',
+      // type:'json',
+      data: data,
+      // ...(options || {}),
+    });
+  },
+
+  /** 修改会员标签信息 POST /kitchen/api/rule */
+  updateMemberTag(data) {
+    // http://localhost:7002
+    return request(getStoremanagement()+`/api/MemberTagService/UpdateMemberTag`, {
+      method: 'post',
+      // type:'json',
+      data: data,
+      // ...(options || {}),
+    });
+  },
+
+  /** 删除会员标签信息 POST /kitchen/api/rule */
+  removeMemberTag(data) {
+    return request(getStoremanagement()+`/api/MemberTagService/DelMemberTag?Id=` + data, {
+      method: 'DELETE',
+      // ...(options || {}),
+    });
+  },
+
+};

src/pages/groupMeal/oneCard/ReportStatistics/dayConsumption/service.js

@@ -0,0 +1,12 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+    //获取部门分页
+    GetData(data) {
+        return request(getStoremanagement()+'/api/Reservation/GetDayConsumeInfo', {
+            method: 'POST',
+            data
+        });
+    }
+}

src/pages/groupMeal/oneCard/ReportStatistics/monthSummary/service.js

@@ -0,0 +1,12 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+    //获取部门分页
+    GetData(data) {
+        return request(getStoremanagement()+'/api/Reservation/GetTimeIntervalConsumeInfo', {
+            method: 'POST',
+            data
+        });
+    }
+}

src/pages/groupMeal/oneCard/ReportStatistics/monthTimeSlot/service.js

@@ -0,0 +1,13 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+
+export default {
+    //获取部门分页
+    GetData(data) {
+        return request(getStoremanagement()+'/api/Reservation/GetConsumeInfo', {
+            method: 'POST',
+            data
+        });
+    }
+}

src/pages/groupMeal/oneCard/ReportStatistics/reservation/service.js

@@ -0,0 +1,96 @@
+import { request } from 'umi';
+import { getStoremanagement } from '@/global_data';
+
+export default {
+   /**
+      * 获取部门分页
+      */
+   GetDeparent(data) {
+    return request(getStoremanagement()+'/api/MemberInfoService/GetMemberTag', {
+        method: 'POST',
+        data
+    });
+},
+
+  //获取预定商品
+  GetReservationGoods(data) {
+    return request(getStoremanagement()+'/api/Reservation/GetReservationGoods', {
+        method: 'POST',
+        data
+    });
+},
+
+//预定部门汇总
+GetReservationOrg(data) {
+    return request(getStoremanagement()+'/api/Reservation/GetReservationOrg', {
+        method: 'POST',
+        data
+    });
+},
+
+//获取预定人员
+GetReservationUser(data) {
+    return request(getStoremanagement()+'/api/Reservation/GetReservationUser', {
+        method: 'POST',
+        data
+    });
+},
+
+ //获取预定商品
+ GetReservationGoodsDetailed(data) {
+    return request(getStoremanagement()+'/api/Reservation/GetReservationGoodsDetailed', {
+        method: 'POST',
+        data
+    });
+},
+
+//获取预定商品Excel
+GetReservationGoodsExcel(data) {
+    return request(getStoremanagement()+'/api/Reservation/GetReservationGoodsExcel', {
+        method: 'POST',
+        responseType: 'blob',
+        data
+    });
+},
+
+ /**
+     * 获取预定人员Excel
+     * @param {*} data
+     */
+ GetReservationOrgExcel(data) {
+    return request('/groupmeal/api/Reservation/GetReservationOrgExcel', {
+        method: 'POST',
+        responseType: 'blob',
+        data
+    });
+},
+
+ /**
+     * 获取预定人员Excel
+     * @param {*} data
+     */
+ GetReservationUserExcel(data) {
+    return request('/groupmeal/api/Reservation/GetReservationUserExcel', {
+        method: 'POST',
+        responseType: 'blob',
+        data
+    });
+},
+
+
+ /**
+     * 获取预定人员Excel
+     * @param {*} data
+     */
+ GetReservationGoodsDetailedExcel(data) {
+    return request('/groupmeal/api/Reservation/GetReservationGoodsDetailedExcel', {
+        method: 'POST',
+        responseType: 'blob',
+        data
+    });
+},
+
+
+
+   
+}

src/pages/groupMeal/oneCard/gate/service.js

@@ -0,0 +1,105 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+
+  //获取所有门店
+  GetAllStore() {
+    return request(getStoremanagement()+'/api/shop/alllist', {
+      method: 'GET',
+    });
+  },
+
+
+  //根据门店ID查询 档口分页列表
+  GetGateListByStorePage(StoreId, Current, PageSize, TenantId = '') {
+    return request(getStoremanagement()+`/api/GateInfo/gatelist?StoreId=${StoreId}&Current=${Current}&PageSize=${PageSize}`, {
+      method: 'GET',
+      headers: {
+        TenantId: TenantId
+      }
+    });
+  },
+
+  /** 档口管理：Start */
+  // 新增档口
+  AddGate(data) {
+    return request(getStoremanagement()+`/api/GateInfo/add`, {
+      method: 'POST',
+      data
+    });
+  },
+
+  //更新档口信息
+  UpdateGateInfo(data, TenantId = '') {
+    return request(getStoremanagement()+`/api/GateInfo/Update`, {
+      method: 'POST',
+      data,
+      headers: {
+        TenantId: TenantId
+      }
+    });
+  },
+
+  //获取字典数据数据（设备屏幕显示）
+  GetDicList(TypeCode) {
+    return request(getDataBaseUrl()+`/api/dictdata/getdiclist?typeCode=`+TypeCode, {
+      method: 'Get',
+    });
+  },
+
+  //添加屏幕显示
+  AddGateSetUp(data) {
+    return request(getStoremanagement()+`/api/GateInfo/AddGateSetUp`, {
+      method: 'POST',
+      data
+    });
+  },
+
+  //添加屏幕显示
+  GetGateSetUp(data) {
+    return request(getStoremanagement()+`/api/GateInfo/GetGateSetUp`, {
+      method: 'POST',
+      data
+    });
+  },
+
+  //删除档口
+  Del(data) {
+    return request(getStoremanagement()+`/api/GateInfo/del?id=` + data, {
+      method: 'POST',
+    });
+  },
+
+  GetGoodsByMenuIdPage(params) {
+    return request(getDataBaseUrl()+'/api/FoodMenu/GetGoodsByMenuIdPage', {
+      method: 'get',
+      data: {
+        ...params,
+      },
+    });
+  },
+
+  GetGoodsList() {
+    return request(getDataBaseUrl()+'/api/goods/getgoodslist', {
+      method: 'get',
+    });
+  },
+
+  //设置屏幕显示菜品
+  AddGateFood(data) {
+    return request(getStoremanagement()+`/api/GateInfo/AddGateFood`, {
+      method: 'POST',
+      data
+    });
+  },
+
+   //获取设置屏幕显示菜品
+   GetGateFoodList(data) {
+    return request(getStoremanagement()+`/api/GateInfo/GetGateFoodList?gateId=`+data, {
+      method: 'get',
+      data
+    });
+  },
+
+}

src/pages/groupMeal/oneCard/machine/service.js

@@ -0,0 +1,62 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+  //获取所有门店
+  GetAllStore() {
+    return request(getStoremanagement()+'/api/shop/alllist', {
+      method: 'GET',
+    });
+  },
+
+ //根据门店ID查询 档口列表
+ GetGateListByStoreList(StoreId) {
+  return request(getStoremanagement()+`/api/GateInfo/gatealllist?StoreId=${StoreId}`, {
+    method: 'GET'
+  });
+},
+
+ /** 刷卡机管理：Start */
+  //  新增刷卡机
+  PayCardAdd(data) {
+    return request(getStoremanagement()+`/api/PayCard/add`, {
+      method: 'POST',
+      data
+    });
+  },
+
+  //刷卡机状态更改
+  PayCardEnable(data) {
+    return request(getStoremanagement()+`/PayCard/enable`, {
+      method: 'POST',
+      data
+    });
+  },
+
+  //根据档口信息查询刷卡机列表
+  PayCardByGateId(GateId, Current, PageSize) {
+    return request(getStoremanagement()+`/api/PayCard/gateList?GateId=${GateId}&Current=${Current}&PageSize=${PageSize}`, {
+      method: 'GET'
+    });
+  },
+
+  //更新刷卡机信息
+  UpdatePayCardInfo(data) {
+    return request(getStoremanagement()+`/api/PayCard/update`, {
+      method: 'POST',
+      data
+    });
+  },
+
+  //删除刷卡机
+  DelPayCard(data) {
+    return request(getStoremanagement()+`/api/PayCard/del?id=`+data, {
+      method: 'POST',
+    });
+  },
+  /** 刷卡机管理：End */
+
+
+  
+
+}

src/pages/groupMeal/oneCard/memberAccount/service.js

@@ -0,0 +1,52 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+  //获取会员账户列表
+  GetMemberAccountPageList(data) {
+    return request(getStoremanagement()+`/api/MemberInfoService/GetMemberAccountPageList`, {
+      method: 'POST',
+      data: data,
+    });
+  },
+
+  //查询会员账户/卡号消费记录
+  GetMemberAccountCardConsRecord(data) {
+    return request(getStoremanagement()+'/api/StoredValueCard/GetMemberAccountAmountPage', {
+      method: 'POST',
+      data,
+    });
+  },
+
+  //获取会员信息
+  GetMemberPageQuery(data) {
+    return request(getStoremanagement()+`​/api/StoredValueCard/GetMemberPageQuery`, {
+      method: 'post',
+      data: data,
+    });
+  },
+
+  //添加会员
+  CreateMemberInfo(data) {
+    return request(getStoremanagement()+`/api/StoredValueCard/AddMember`, {
+      method: 'post',
+      data: data,
+    });
+  },
+
+  //获取会员标签  和绑定详情
+  GetMemberTagAndInfo(memberinfoid, platformtype) {
+    return request(getStoremanagement()+`/api/StoredValueCard/GetMemberTagAndInfo?memberInfoId=${memberinfoid}&PlatformType=${platformtype}`,
+      {
+        method: 'get',
+      },
+    );
+  },
+
+  //获取会员
+  GetPlatformMemberList(data) {
+    return request(getStoremanagement()+`/api/StoredValueCard/GetPlatformMemberList?memberId=${data}`, {
+      method: 'get',
+    });
+  },
+};

src/pages/groupMeal/oneCard/storedValueCard/service.js

@@ -0,0 +1,44 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+  //获取会员储值卡列表
+  GetMemberCardPageList(data) {
+    return request(getStoremanagement()+`/api/StoredValueCard/GetMmenberCardPage`, {
+      method: 'POST',
+      data: data,
+    });
+  },
+
+  //添加会员储值卡
+  AddMemberCard(data) {
+    return request(getStoremanagement()+`/api/StoredValueCard/AddMmenberCard`, {
+      method: 'POST',
+      data: data,
+    });
+  },
+
+  //修改会员卡状态
+  UpdateMemberCardState(data) {
+    return request(getStoremanagement()+`/api/StoredValueCard/UpdateMmenberCardState`, {
+      method: 'PUT',
+      data: data,
+    });
+  },
+
+  //获取会员分页
+  GetMemberListByPage(data) {
+    return request(getStoremanagement()+'/api/MemberInfoService/GetMemberPageQuery', {
+      method: 'POST',
+      data,
+    });
+  },
+
+  //绑定会员
+  OnBindMember(data) {
+    return request(getStoremanagement()+'/api/StoredValueCard/MemberBindingCards', {
+      method: 'POST',
+      data,
+    });
+  },
+};

src/pages/groupMeal/shop/service.js

@@ -0,0 +1,52 @@
+import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
+export default {
+
+  Page(data) {
+    return request(getStoremanagement()+`/api/shop/page`, {
+      method: 'Post',
+      data: data,
+    });
+  },
+
+  Add(data) {
+    return request(getStoremanagement()+`/api/shop`, {
+      method: 'Post',
+      data: data,
+    });
+  },
+
+  Update(data) {
+    return request(getStoremanagement()+`/api/shop`, {
+      method: 'PUT',
+      data: data,
+    });
+  },
+
+  Del(data) {
+    return request(getStoremanagement()+`//api/shop/del/`+data, {
+      method: 'Post',
+    });
+  },
+
+  //获取组织列表
+  GetOrgList(data) {
+    return request(getDataBaseUrl()+`/api/organize/getorglist`, {
+      method: 'Post',
+      data: data,
+    });
+  },
+
+   //获取组织树
+   GetOrgtree() {
+    return request(getDataBaseUrl()+`/api/organize/tree`, {
+      method: 'get',
+    });
+  },
+  
+
+
+ 
+
+};

src/pages/order/orderflow/service.js

@@ -2,11 +2,12 @@
 
 /* eslint-disable */
 import { request } from 'umi';
-import { getStoremanagement,getStoremanagementorder } from '@/global_data';
+import { getStoremanagementorder,getStoremanagement } from '@/global_data';
 
 export default {
   /** 获取订单流水信息*/
   orderList(data) {
+    data.isreport = true;
     return request(getStoremanagementorder()+`/api/Order/PostDetail`, {
       method: 'Post',
       data: data,
@@ -24,7 +25,7 @@ export default {
   });
 },
 
-GetFlowExport(data) {
+GetOrderDetails(data) {
   return request(getStoremanagementorder()+`/api/Order/GetFlowExport`, {
     method: 'Post',
     data: data
@@ -92,14 +93,14 @@ GetFlowExport(data) {
       // ...(options || {}),
     });
   },
-  GetOrderDetails(data) {
-    return request(`/kitchen/api/Order/GetOrderDetails`, {
-      method: 'Post',
-      params: data,
-      // params: { ...params },
-      // ...(options || {}),
-    });
-  },
+  // GetOrderDetails(data) {
+  //   return request(`/kitchen/api/Order/GetOrderDetails`, {
+  //     method: 'Post',
+  //     params: data,
+  //     // params: { ...params },
+  //     // ...(options || {}),
+  //   });
+  // },
 
 
  // 打印小票

src/pages/order/thirdAuthorize/index.jsx

@@ -43,6 +43,7 @@ const Manage = () => {
             title: '归属场景',
             dataIndex: 'storeId',
             ellipsis: true,
+            hideInSearch: true,
             render: (_, record) => {
                 const find = shopList.find(item => item.id === record.storeId);
                 if (find) {

src/pages/order/thirdAuthorize/service.js

@@ -2,7 +2,7 @@
 
 /* eslint-disable */
 import { request } from 'umi';
-import { getStoremanagement,getStoremanagementorder } from '@/global_data';
+import { getStoremanagementorder,getStoremanagement } from '@/global_data';
 
 export default {
 

src/pages/order/thirdOrder/service.js

@@ -2,7 +2,7 @@
 
 /* eslint-disable */
 import { request } from 'umi';
-import { getStoremanagement,getStoremanagementorder } from '@/global_data';
+import { getStoremanagementorder,getStoremanagement } from '@/global_data';
 
 export default {
 
@@ -21,6 +21,9 @@ export default {
   },
 
 
+
+
+
   /** 获取订单流水信息*/
   orderList(data) {
     data.isreport = true;
@@ -36,7 +39,7 @@ export default {
    * 查询店铺信息(设备信息)
    */
  srdList(data) {
-  return request(getStoremanagement()+'/storemanagement/api/shop/alllist', {
+  return request(getStoremanagementorder()+'/api/shop/alllist', {
     method: 'GET'
   });
 },
@@ -51,83 +54,6 @@ GetFlowExport(data) {
   });
 },
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  /**
-   * 查询店铺分类(设备类型)信息
-   */
-  srdTypeList(data) {
-    return request(`/kitchen/api/storetype/list`, {
-      method: 'Post',
-      data: data,
-      // params: { ...params },
-      // ...(options || {}),
-    });
-  },
- 
-
-  /**
-   * 查询商品信息
-   */
-  goodsList(data) {
-    return request(`/kitchen/api/goodes/list`, {
-      method: 'Post',
-      data: data,
-      // params: { ...params },
-      // ...(options || {}),
-    });
-  },
-  /**
-   * 查询商品类型
-   */
-  goodsTypeList(data) {
-    return request(`/kitchen/api/goodstype/list`, {
-      method: 'Post',
-      data: data,
-      // params: { ...params },
-      // ...(options || {}),
-    });
-  },
-  StartRefund(data) {
-    return request(`/kitchen/api/refund/StartOrderRefund`, {
-      method: 'Post',
-      params: data,
-      // params: { ...params },
-      // ...(options || {}),
-    });
-  },
-  GetOrderDetails(data) {
-    return request(`/kitchen/api/Order/GetOrderDetails`, {
-      method: 'Post',
-      params: data,
-      // params: { ...params },
-      // ...(options || {}),
-    });
-  },
-
-
- // 打印小票
-  printsmallticket(data) {
-    return request(`/kitchen/api/printer/print-small-ticket`, {
-      method: 'Post',
-      data: data,
-      // params: { ...params },
-      // ...(options || {}),
-    });
-  },
 };
 
 

src/pages/push/batchingpush/components/PushFrom.jsx

@@ -53,6 +53,7 @@ const PushFrom = (props) => {
  ]
   return (
     <Modal
+    maskClosable={false}
       title={'下发数据'}
       width={1040}
       visible={props.createModalVisible}

src/pages/push/batchingpush/index.jsx

@@ -1,5 +1,5 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, message, Input, Drawer, Popconfirm,Typography } from 'antd';
+import { Button, message, Input, Drawer, Popconfirm, Typography } from 'antd';
 import React, { useState, useRef, useEffect } from 'react';
 import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
@@ -7,9 +7,9 @@ import ProDescriptions from '@ant-design/pro-descriptions';
 import PushFrom from './components/PushFrom';
 
 import {
-    GetDevicePushRecodePage,
-    DevicePushRecodeAdd,
-    DevicePushRecodeDelete
+  GetDevicePushRecodePage,
+  DevicePushRecodeAdd,
+  DevicePushRecodeDelete
 } from './services';
 
 
@@ -23,10 +23,11 @@ const goodspush = () => {
   const [currentRow, setCurrentRow] = useState();
   const [selectedRowsState, setSelectedRows] = useState([]);
   const { Paragraph } = Typography;
+
   /** 国际化修改 */
   useEffect(() => {
-   
-    
+
+
   }, []);
 
   /**
@@ -34,7 +35,7 @@ const goodspush = () => {
    *
    * @param selectedRows
    */
-   
+
   const handleRemove = async (selectedRows) => {
     const hide = message.loading('正在删除');
     if (!selectedRows) return true;
@@ -76,17 +77,17 @@ const goodspush = () => {
       ellipsis: true,
     },
 
-    {
-      title: '下发数据',
-      dataIndex: 'type',
-      ellipsis: true,
-      valueEnum: {
-        2: {
-          text: '物料',
-        },
-       
-      },
-    },
+    // {
+    //   title: '下发数据',
+    //   dataIndex: 'type',
+    //   ellipsis: true,
+    //   valueEnum: {
+    //     2: {
+    //       text: '物料',
+    //     },
+
+    //   },
+    // },
     {
       title: '下发时间',
       dataIndex: 'createAt',
@@ -106,40 +107,40 @@ const goodspush = () => {
         >
           下发详情
         </a>,
-        <Popconfirm
-          type="primary"
-          key="primary"
-          title="确认删除吗？"
-          okText="是"
-          cancelText="否"
-          onConfirm={async () => {
-            await DeleteGoodsType(record.id).then((r) => {
-              if (r.succeeded) {
-                message.success('删除成功');
-                actionRef.current.reload();
-              } else {
-                message.error(r.errors);
-              }
-            });
-          }}
-          onCancel={() => {}}
-        >
-          <a href="#">删除</a>
-        </Popconfirm>,
+        // <Popconfirm
+        //   type="primary"
+        //   key="primary"
+        //   title="确认删除吗？"
+        //   okText="是"
+        //   cancelText="否"
+        //   onConfirm={async () => {
+        //     await DeleteGoodsType(record.id).then((r) => {
+        //       if (r.succeeded) {
+        //         message.success('删除成功');
+        //         actionRef.current.reload();
+        //       } else {
+        //         message.error(r.errors);
+        //       }
+        //     });
+        //   }}
+        //   onCancel={() => { }}
+        // >
+        //   <a href="#">删除</a>
+        // </Popconfirm>,
       ],
     },
   ];
-const HandleOk= async(values)=>{
-  await DevicePushRecodeAdd(values).then((res)=>{
-    if(res.data){
-      message.success('操作成功');
-      handleModalVisible(false);
-      actionRef.current.reload();
-    }else{
-      message.error(res.errors);
-    }
-  })
-}
+  const HandleOk = async (values) => {
+    await DevicePushRecodeAdd(values).then((res) => {
+      if (res.data) {
+        message.success('操作成功');
+        handleModalVisible(false);
+        actionRef.current.reload();
+      } else {
+        message.error(res.errors);
+      }
+    })
+  }
   return (
     <PageContainer host header={{
       title: '',
@@ -167,7 +168,7 @@ const HandleOk= async(values)=>{
         request={async (params) => {
           var goodsData = [];
           var total = 0;
-          params.type=2
+          params.type = 2
           await GetDevicePushRecodePage(params).then((r) => {
             goodsData = r.data.data;
             total = r.data.total;
@@ -219,7 +220,7 @@ const HandleOk= async(values)=>{
 
       <PushFrom
         onFinish={async (value) => {
-         
+
         }}
         onCancel={() => {
           handleModalVisible(false);
@@ -243,18 +244,18 @@ const HandleOk= async(values)=>{
           <ProDescriptions
             column={1}
             title="下发详情"
-         
+
           >
-              <ProDescriptions.Item label="下发设备" valueType="text">
+            <ProDescriptions.Item label="下发设备" valueType="text">
               {currentRow?.deviceName}
-          </ProDescriptions.Item>
-          <ProDescriptions.Item label="topic" valueType="text" >
-          <Paragraph copyable>{currentRow?.topic}</Paragraph>
-          </ProDescriptions.Item>
-          <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据" valueType="jsonCode" >
+            </ProDescriptions.Item>
+            <ProDescriptions.Item label="topic" valueType="text" >
+              <Paragraph copyable>{currentRow?.topic}</Paragraph>
+            </ProDescriptions.Item>
+            <ProDescriptions.Item contentStyle={{ maxWidth: '85%' }} label="下发数据" valueType="jsonCode" >
               {currentRow?.dataResore}
-          </ProDescriptions.Item>
-            </ProDescriptions>
+            </ProDescriptions.Item>
+          </ProDescriptions>
         )}
       </Drawer>
     </PageContainer>

src/pages/push/batchingpush/services.js

@@ -1,39 +1,39 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
 export async function GetDevicePushRecodePage(data) {
-    return request(`/storemanagement/api/devicepushrecode/page`, {
+    return request(getStoremanagement()+`/api/devicepushrecode/page`, {
       method: 'POST',
       data: data,
     });
   }
   export async function DevicePushRecodeAdd(data) {
-      return request(`/storemanagement/api/devicepushrecode/add`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/add`, {
         method: 'POST',
         data: data,
       });
     }
     export async function DevicePushRecodeUpdate(data) {
-      return request(`/storemanagement/api/devicepushrecode/update`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/update`, {
         method: 'POST',
         data: data,
       });
     }
     export async function DevicePushRecodeDelete(data) {
-      return request(`/storemanagement/api/devicepushrecode/delete`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/delete`, {
         method: 'POST',
         data: data,
       });
     } 
     export async function GetDeviceList() {
-      return request(`/saasbase/api/device/list`, {
+      return request(getDataBaseUrl()+`/api/device/list`, {
         method: 'GET',
       });
     }
 
     export async function GetBatchingPage(data) {
-        return request(`/saasbase/api/batching/getpage`, {
+        return request(getDataBaseUrl()+`/api/batching/getpage`, {
           method: 'Post',
           data: data,
-          // params: { ...params },
-          // ...(options || {}),
         });
       }

src/pages/push/goodspush/components/PushFrom.jsx

@@ -1,5 +1,5 @@
-import React, { useState, useEffect,useRef } from 'react';
-import { Modal, Row, Col, Checkbox, Select,message,Switch} from 'antd';
+import React, { useState, useEffect, useRef } from 'react';
+import { Modal, Row, Col, Checkbox, Select, message, Switch } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import {
   GetDeviceList,
@@ -9,7 +9,7 @@ import {
 const PushFrom = (props) => {
   const [deviceData, setdeviceData] = useState([]);
   const [selectedRowsState, setSelectedRows] = useState([]);
-  const [dataSource,setdataSource]= useState([]);
+  const [dataSource, setdataSource] = useState([]);
   const [treeData, setTreeData] = useState();
   const [DeviceIds, setDeviceIds] = useState();
   const [DeviceInfo, setDeviceInfo] = useState([]);
@@ -17,66 +17,67 @@ const PushFrom = (props) => {
   const actionRef = useRef();
   useEffect(() => {
     console.log(props.values)
-    GetDeviceList().then((r)=>{
+    GetDeviceList().then((r) => {
       setDeviceInfo(r.data)
-        var data=r.data.map(x=>{
-            return {value:x.id,label:x.name}
-        })
-        setdeviceData(data)
+      var data = r.data.map(x => {
+        return { value: x.id, label: x.name }
+      })
+      setdeviceData(data)
     })
     GetGoodsTypeTree().then((r) => {
-        setTreeData(r.data);
-      });
-      var params={current:1,pageSize:10}
-      GetGoodsData(params)
-  },[props.values])
-  const GetGoodsData=(params)=>{
+      setTreeData(r.data);
+    });
+    var params = { current: 1, pageSize: 10 }
+    GetGoodsData(params)
+  }, [props.values])
+  const GetGoodsData = (params) => {
     GetGoodsPage(params).then((r) => {
-        setdataSource(r.data.data);
-        //console.log(goodsData)
-        //total = r.data.total;
-      });
+      setdataSource(r.data.data);
+      //console.log(goodsData)
+      //total = r.data.total;
+    });
   }
- const handleChange=(value)=>{
+  const handleChange = (value) => {
     setDeviceIds(value)
-    var params={current:1,pageSize:10,deviceId:value}
+    var params = { current: 1, pageSize: 10, deviceId: value }
     GetGoodsData(params)
- }
- const onChange=(checked)=>{
-  if(!DeviceIds){
-    message.error('请先选择设备');
-  }else{
-    setisGlogy(checked)
- 
   }
-  
- }
- const columns=[
+  const onChange = (checked) => {
+    if (!DeviceIds) {
+      message.error('请先选择设备');
+    } else {
+      setisGlogy(checked)
+
+    }
+
+  }
+  const columns = [
     {
-        title: '编码',
-        dataIndex: 'code',
-        valueType: 'textarea',
-        hideInTable: true,
-        hideInSearch: true,
-      },
-      {
-        title: '名称',
-        dataIndex: 'name',
-        valueType: 'textarea',
-      },
-      {
-        title: '商品类型',
-        dataIndex: 'goodsTypeName',
-        valueType: 'treeSelect',
-        fieldProps: {
-          showSearch:true,
-          allowClear:true,
-          options: treeData
-        },
+      title: '编码',
+      dataIndex: 'code',
+      valueType: 'textarea',
+      hideInTable: true,
+      hideInSearch: true,
+    },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      valueType: 'textarea',
+    },
+    {
+      title: '商品类型',
+      dataIndex: 'goodsTypeName',
+      valueType: 'treeSelect',
+      fieldProps: {
+        showSearch: true,
+        allowClear: true,
+        options: treeData
       },
- ]
+    },
+  ]
   return (
     <Modal
+      maskClosable={false}
       title={'下发数据'}
       width={1040}
       visible={props.createModalVisible}
@@ -84,16 +85,16 @@ const PushFrom = (props) => {
       okText="确定"
       cancelText="取消"
       onOk={() => {
-        if(!DeviceIds){
+        if (!DeviceIds) {
           message.error('请选择设备');
-        }else{
-          var de=DeviceInfo.find(x=>x.id==DeviceIds);
-          var data={goodsinfo:[]};
+        } else {
+          var de = DeviceInfo.find(x => x.id == DeviceIds);
+          var data = { goodsinfo: [] };
           // if(isGlogy){
           //   data.goodstechnology=[]
           // }
-          selectedRowsState.map(x=>{
-            var pa={id:x.id,code:x.code,goodsTypeId:x.goodsTypeId,goodsTypeName:x.goodsTypeName,goodsUintId:x.goodsUintId,imgUrl:x.imgUrl,isAttrubute:x.isAttrubute,name:x.name,price:x.price,design:x.design,remark:x.remark}
+          selectedRowsState.map(x => {
+            var pa = { id: x.id, code: x.code, goodsTypeId: x.goodsTypeId, goodsTypeName: x.goodsTypeName, goodsUintId: x.goodsUintId, imgUrl: x.imgUrl, isAttrubute: x.isAttrubute, name: x.name, price: x.price, design: x.design, remark: x.remark }
             data.goodsinfo.push(pa);
             // if(isGlogy){
             //   //data.goodstechnology=[]
@@ -102,7 +103,7 @@ const PushFrom = (props) => {
             //   }
             // }
           })
-          var parm={deviceId:de.id,deviceName:de.name,deviceAutoKey:de.autoKey,type:1,data:data}
+          var parm = { deviceId: de.id, deviceName: de.name, deviceAutoKey: de.autoKey, type: 1, data: data }
           props.HandleOk(parm)
           console.log(de)
         }
@@ -112,48 +113,48 @@ const PushFrom = (props) => {
       }}
       destroyOnClose
     >
-      <Row gutter={26} style={{marginBottom:20}}>
-    <Col lg={24} md={24} sm={24}>
-        选择设备：
-        <Select
-        
-        allowClear
-        style={{width: '60%'}}
-        placeholder="请选择要下发设备"
-        onChange={handleChange}
-        options={deviceData}
-        />
-    </Col>
-   
-</Row>
-{/* <Row style={{marginBottom:20}}>
+      <Row gutter={26} style={{ marginBottom: 20 }}>
+        <Col lg={24} md={24} sm={24}>
+          选择设备：
+          <Select
+
+            allowClear
+            style={{ width: '60%' }}
+            placeholder="请选择要下发设备"
+            onChange={handleChange}
+            options={deviceData}
+          />
+        </Col>
+
+      </Row>
+      {/* <Row style={{marginBottom:20}}>
   <Col lg={24} md={24} sm={24}>
     是否包含工艺：
     <Switch checkedChildren="是" unCheckedChildren="否" checked={isGlogy} value={isGlogy} onChange={onChange} />
   </Col>  
 </Row> */}
-<Row gutter={26}>
-    <Col span={24}>
-        选择数据：
-        <ProTable
-          headerTitle=""
-          actionRef={actionRef}
-          rowKey="id"
-          pagination={{ defaultPageSize: 10 }}
-          search={{
-            labelWidth: 120,
-          }}
-          dataSource={dataSource}
-          columns={columns}
-          rowSelection={{
-            onChange: (_, selectedRows) => {
-              setSelectedRows(selectedRows);
-            },
-          }}
-        >
+      <Row gutter={26}>
+        <Col span={24}>
+          选择数据：
+          <ProTable
+            headerTitle=""
+            actionRef={actionRef}
+            rowKey="id"
+            pagination={{ defaultPageSize: 10 }}
+            search={{
+              labelWidth: 120,
+            }}
+            dataSource={dataSource}
+            columns={columns}
+            rowSelection={{
+              onChange: (_, selectedRows) => {
+                setSelectedRows(selectedRows);
+              },
+            }}
+          >
           </ProTable>
-    </Col>
-</Row>
+        </Col>
+      </Row>
     </Modal>
   );
 };

src/pages/push/goodspush/index.jsx

@@ -1,5 +1,5 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, message, Input, Drawer, Popconfirm,Typography} from 'antd';
+import { Button, message, Input, Drawer, Popconfirm,Typography } from 'antd';
 import React, { useState, useRef, useEffect } from 'react';
 import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
@@ -76,17 +76,17 @@ const goodspush = () => {
       ellipsis: true,
     },
 
-    {
-      title: '下发数据',
-      dataIndex: 'type',
-      ellipsis: true,
-      valueEnum: {
-        1: {
-          text: '商品',
-        },
+    // {
+    //   title: '下发数据',
+    //   dataIndex: 'type',
+    //   ellipsis: true,
+    //   valueEnum: {
+    //     1: {
+    //       text: '商品',
+    //     },
         
-      },
-    },
+    //   },
+    // },
     {
       title: '下发时间',
       dataIndex: 'createAt',
@@ -106,26 +106,26 @@ const goodspush = () => {
         >
           下发详情
         </a>,
-        <Popconfirm
-          type="primary"
-          key="primary"
-          title="确认删除吗？"
-          okText="是"
-          cancelText="否"
-          onConfirm={async () => {
-            await DeleteGoodsType(record.id).then((r) => {
-              if (r.succeeded) {
-                message.success('删除成功');
-                actionRef.current.reload();
-              } else {
-                message.error(r.errors);
-              }
-            });
-          }}
-          onCancel={() => {}}
-        >
-          <a href="#">删除</a>
-        </Popconfirm>,
+        // <Popconfirm
+        //   type="primary"
+        //   key="primary"
+        //   title="确认删除吗？"
+        //   okText="是"
+        //   cancelText="否"
+        //   onConfirm={async () => {
+        //     await DeleteGoodsType(record.id).then((r) => {
+        //       if (r.succeeded) {
+        //         message.success('删除成功');
+        //         actionRef.current.reload();
+        //       } else {
+        //         message.error(r.errors);
+        //       }
+        //     });
+        //   }}
+        //   onCancel={() => {}}
+        // >
+        //   <a href="#">删除</a>
+        // </Popconfirm>,
       ],
     },
   ];
@@ -248,7 +248,7 @@ const HandleOk= async(values)=>{
               <ProDescriptions.Item label="下发设备" valueType="text">
               {currentRow?.deviceName}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="topic" valueType="text" >
+          <ProDescriptions.Item label="topic" valueType="text">
           <Paragraph copyable>{currentRow?.topic}</Paragraph>
           </ProDescriptions.Item>
           <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据" valueType="jsonCode" >

src/pages/push/goodspush/services.js

@@ -1,24 +1,26 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
 export async function GetDevicePushRecodePage(data) {
-    return request(`/storemanagement/api/devicepushrecode/page`, {
+    return request(getStoremanagement()+`/api/devicepushrecode/page`, {
       method: 'POST',
       data: data,
     });
   }
   export async function DevicePushRecodeAdd(data) {
-      return request(`/storemanagement/api/devicepushrecode/add`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/add`, {
         method: 'POST',
         data: data,
       });
     }
     export async function DevicePushRecodeUpdate(data) {
-      return request(`/storemanagement/api/devicepushrecode/update`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/update`, {
         method: 'POST',
         data: data,
       });
     }
     export async function DevicePushRecodeDelete(data) {
-      return request(`/storemanagement/api/devicepushrecode/delete`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/delete`, {
         method: 'POST',
         data: data,
       });
@@ -29,7 +31,7 @@ export async function GetDevicePushRecodePage(data) {
       });
     }
     export async function GetGoodsTypeTree(params) {
-        return request('​/saasbase/api​/goodstype/tree', {
+        return request(getDataBaseUrl()+'​/api​/goodstype/tree', {
           method: 'GET',
           data: {
             ...params,
@@ -37,7 +39,7 @@ export async function GetDevicePushRecodePage(data) {
         });
       }
     export async function GetGoodsPage(data) {
-        return request(`/saasbase/api/goods/page`, {
+        return request(getDataBaseUrl()+`/api/goods/page`, {
           method: 'Post',
           data: data,
           // params: { ...params },

src/pages/push/technologypush/components/PushFrom.jsx

@@ -1,5 +1,5 @@
-import React, { useState, useEffect,useRef } from 'react';
-import { Modal, Row, Col, Checkbox, Select,message,Switch} from 'antd';
+import React, { useState, useEffect, useRef } from 'react';
+import { Modal, Row, Col, Checkbox, Select, message, Switch } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import {
   GetDeviceList,
@@ -9,7 +9,7 @@ import {
 const PushFrom = (props) => {
   const [deviceData, setdeviceData] = useState([]);
   const [selectedRowsState, setSelectedRows] = useState([]);
-  const [dataSource,setdataSource]= useState([]);
+  const [dataSource, setdataSource] = useState([]);
   const [treeData, setTreeData] = useState();
   const [DeviceIds, setDeviceIds] = useState();
   const [DeviceInfo, setDeviceInfo] = useState([]);
@@ -17,66 +17,67 @@ const PushFrom = (props) => {
   const actionRef = useRef();
   useEffect(() => {
     console.log(props.values)
-    GetDeviceList().then((r)=>{
+    GetDeviceList().then((r) => {
       setDeviceInfo(r.data)
-        var data=r.data.map(x=>{
-            return {value:x.id,label:x.name}
-        })
-        setdeviceData(data)
+      var data = r.data.map(x => {
+        return { value: x.id, label: x.name }
+      })
+      setdeviceData(data)
     })
     GetGoodsTypeTree().then((r) => {
-        setTreeData(r.data);
-      });
-      var params={current:1,pageSize:10}
-      GetGoodsData(params)
-  },[props.values])
-  const GetGoodsData=(params)=>{
+      setTreeData(r.data);
+    });
+    var params = { current: 1, pageSize: 10 }
+    GetGoodsData(params)
+  }, [props.values])
+  const GetGoodsData = (params) => {
     GetGoodsPage(params).then((r) => {
-        setdataSource(r.data.data);
-        //console.log(goodsData)
-        //total = r.data.total;
-      });
+      setdataSource(r.data.data);
+      //console.log(goodsData)
+      //total = r.data.total;
+    });
   }
- const handleChange=(value)=>{
+  const handleChange = (value) => {
     setDeviceIds(value)
-    var params={current:1,pageSize:10,deviceId:value}
+    var params = { current: 1, pageSize: 10, deviceId: value }
     GetGoodsData(params)
- }
- const onChange=(checked)=>{
-  if(!DeviceIds){
-    message.error('请先选择设备');
-  }else{
-    setisGlogy(checked)
- 
   }
-  
- }
- const columns=[
+  const onChange = (checked) => {
+    if (!DeviceIds) {
+      message.error('请先选择设备');
+    } else {
+      setisGlogy(checked)
+
+    }
+
+  }
+  const columns = [
     {
-        title: '编码',
-        dataIndex: 'code',
-        valueType: 'textarea',
-        hideInTable: true,
-        hideInSearch: true,
-      },
-      {
-        title: '名称',
-        dataIndex: 'name',
-        valueType: 'textarea',
-      },
-      {
-        title: '商品类型',
-        dataIndex: 'goodsTypeName',
-        valueType: 'treeSelect',
-        fieldProps: {
-          showSearch:true,
-          allowClear:true,
-          options: treeData
-        },
+      title: '编码',
+      dataIndex: 'code',
+      valueType: 'textarea',
+      hideInTable: true,
+      hideInSearch: true,
+    },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      valueType: 'textarea',
+    },
+    {
+      title: '商品类型',
+      dataIndex: 'goodsTypeName',
+      valueType: 'treeSelect',
+      fieldProps: {
+        showSearch: true,
+        allowClear: true,
+        options: treeData
       },
- ]
+    },
+  ]
   return (
     <Modal
+      maskClosable={false}
       title={'下发数据'}
       width={1040}
       visible={props.createModalVisible}
@@ -84,32 +85,32 @@ const PushFrom = (props) => {
       okText="确定"
       cancelText="取消"
       onOk={() => {
-        if(!DeviceIds){
+        if (!DeviceIds) {
           message.error('请选择设备');
-        }else{
-          var de=DeviceInfo.find(x=>x.id==DeviceIds);
-          var data={goodstechnology:[]};
+        } else {
+          var de = DeviceInfo.find(x => x.id == DeviceIds);
+          var data = { goodstechnology: [] };
           // if(isGlogy){
           //   data.goodstechnology=[]
           // }
-          selectedRowsState.map(x=>{
+          selectedRowsState.map(x => {
             // var pa={id:x.id,code:x.code,goodsTypeId:x.goodsTypeId,goodsTypeName:x.goodsTypeName,goodsUintId:x.goodsUintId,imgUrl:x.imgUrl,isAttrubute:x.isAttrubute,name:x.name,price:x.price,design:x.design,remark:x.remark}
             // data.goodsinfo.push(pa);
             // if(isGlogy){
             //   //data.goodstechnology=[]
-              if(x.goodstechnology.length>0){
-                data.goodstechnology.push(x.goodstechnology)
-              }
+            if (x.goodstechnology.length > 0) {
+              data.goodstechnology.push(x.goodstechnology)
+            }
             // }
           })
-          if(data.goodstechnology.length==0){
+          if (data.goodstechnology.length == 0) {
             message.error('选择的商品还没有工艺');
-          }else{
-            var parm={deviceId:de.id,deviceName:de.name,deviceAutoKey:de.autoKey,type:4,data:data}
+          } else {
+            var parm = { deviceId: de.id, deviceName: de.name, deviceAutoKey: de.autoKey, type: 4, data: data }
             props.HandleOk(parm)
             console.log(de)
           }
-         
+
         }
       }}
       onCancel={() => {
@@ -117,48 +118,48 @@ const PushFrom = (props) => {
       }}
       destroyOnClose
     >
-      <Row gutter={26} style={{marginBottom:20}}>
-    <Col lg={24} md={24} sm={24}>
-        选择设备：
-        <Select
-        
-        allowClear
-        style={{width: '60%'}}
-        placeholder="请选择要下发设备"
-        onChange={handleChange}
-        options={deviceData}
-        />
-    </Col>
-   
-</Row>
-{/* <Row style={{marginBottom:20}}>
+      <Row gutter={26} style={{ marginBottom: 20 }}>
+        <Col lg={24} md={24} sm={24}>
+          选择设备：
+          <Select
+
+            allowClear
+            style={{ width: '60%' }}
+            placeholder="请选择要下发设备"
+            onChange={handleChange}
+            options={deviceData}
+          />
+        </Col>
+
+      </Row>
+      {/* <Row style={{marginBottom:20}}>
   <Col lg={24} md={24} sm={24}>
     是否包含工艺：
     <Switch checkedChildren="是" unCheckedChildren="否" checked={isGlogy} value={isGlogy} onChange={onChange} />
   </Col>  
 </Row> */}
-<Row gutter={26}>
-    <Col span={24}>
-        选择数据：
-        <ProTable
-          headerTitle=""
-          actionRef={actionRef}
-          rowKey="id"
-          pagination={{ defaultPageSize: 10 }}
-          search={{
-            labelWidth: 120,
-          }}
-          dataSource={dataSource}
-          columns={columns}
-          rowSelection={{
-            onChange: (_, selectedRows) => {
-              setSelectedRows(selectedRows);
-            },
-          }}
-        >
+      <Row gutter={26}>
+        <Col span={24}>
+          选择数据：
+          <ProTable
+            headerTitle=""
+            actionRef={actionRef}
+            rowKey="id"
+            pagination={{ defaultPageSize: 10 }}
+            search={{
+              labelWidth: 120,
+            }}
+            dataSource={dataSource}
+            columns={columns}
+            rowSelection={{
+              onChange: (_, selectedRows) => {
+                setSelectedRows(selectedRows);
+              },
+            }}
+          >
           </ProTable>
-    </Col>
-</Row>
+        </Col>
+      </Row>
     </Modal>
   );
 };

src/pages/push/technologypush/index.jsx

@@ -1,12 +1,11 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, message, Input, Drawer, Popconfirm,Typography} from 'antd';
+import { Button, message, Input, Drawer, Popconfirm,Typography } from 'antd';
 import React, { useState, useRef, useEffect } from 'react';
 import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import ProDescriptions from '@ant-design/pro-descriptions';
 import PushFrom from './components/PushFrom';
 
-
 import {
     GetDevicePushRecodePage,
     DevicePushRecodeAdd,
@@ -23,7 +22,6 @@ const goodspush = () => {
   const actionRef = useRef();
   const [currentRow, setCurrentRow] = useState();
   const [selectedRowsState, setSelectedRows] = useState([]);
-
   const { Paragraph } = Typography;
   /** 国际化修改 */
   useEffect(() => {
@@ -78,16 +76,16 @@ const goodspush = () => {
       ellipsis: true,
     },
 
-    {
-      title: '下发数据',
-      dataIndex: 'type',
-      ellipsis: true,
-      valueEnum: {
-        4: {
-            text: '工艺',
-        },
-      },
-    },
+    // {
+    //   title: '下发数据',
+    //   dataIndex: 'type',
+    //   ellipsis: true,
+    //   valueEnum: {
+    //     4: {
+    //         text: '工艺',
+    //     },
+    //   },
+    // },
     {
       title: '下发时间',
       dataIndex: 'createAt',
@@ -107,26 +105,26 @@ const goodspush = () => {
         >
           下发详情
         </a>,
-        <Popconfirm
-          type="primary"
-          key="primary"
-          title="确认删除吗？"
-          okText="是"
-          cancelText="否"
-          onConfirm={async () => {
-            await DeleteGoodsType(record.id).then((r) => {
-              if (r.succeeded) {
-                message.success('删除成功');
-                actionRef.current.reload();
-              } else {
-                message.error(r.errors);
-              }
-            });
-          }}
-          onCancel={() => {}}
-        >
-          <a href="#">删除</a>
-        </Popconfirm>,
+        // <Popconfirm
+        //   type="primary"
+        //   key="primary"
+        //   title="确认删除吗？"
+        //   okText="是"
+        //   cancelText="否"
+        //   onConfirm={async () => {
+        //     await DeleteGoodsType(record.id).then((r) => {
+        //       if (r.succeeded) {
+        //         message.success('删除成功');
+        //         actionRef.current.reload();
+        //       } else {
+        //         message.error(r.errors);
+        //       }
+        //     });
+        //   }}
+        //   onCancel={() => {}}
+        // >
+        //   <a href="#">删除</a>
+        // </Popconfirm>,
       ],
     },
   ];
@@ -249,7 +247,7 @@ const HandleOk= async(values)=>{
               <ProDescriptions.Item label="下发设备" valueType="text">
               {currentRow?.deviceName}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="topic" valueType="text" >
+          <ProDescriptions.Item label="topic" valueType="text">
           <Paragraph copyable>{currentRow?.topic}</Paragraph>
           </ProDescriptions.Item>
           <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据" valueType="jsonCode" >

src/pages/push/technologypush/services.js

@@ -1,35 +1,37 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
 export async function GetDevicePushRecodePage(data) {
-    return request(`/storemanagement/api/devicepushrecode/page`, {
+    return request(getStoremanagement()+`/api/devicepushrecode/page`, {
       method: 'POST',
       data: data,
     });
   }
   export async function DevicePushRecodeAdd(data) {
-      return request(`/storemanagement/api/devicepushrecode/add`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/add`, {
         method: 'POST',
         data: data,
       });
     }
     export async function DevicePushRecodeUpdate(data) {
-      return request(`/storemanagement/api/devicepushrecode/update`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/update`, {
         method: 'POST',
         data: data,
       });
     }
     export async function DevicePushRecodeDelete(data) {
-      return request(`/storemanagement/api/devicepushrecode/delete`, {
+      return request(getStoremanagement()+`/api/devicepushrecode/delete`, {
         method: 'POST',
         data: data,
       });
     } 
     export async function GetDeviceList() {
-      return request(`/saasbase/api/device/list`, {
+      return request(getDataBaseUrl()+`/api/device/list`, {
         method: 'GET',
       });
     }
     export async function GetGoodsTypeTree(params) {
-        return request('​/saasbase/api​/goodstype/tree', {
+        return request(getDataBaseUrl()+'​/api​/goodstype/tree', {
           method: 'GET',
           data: {
             ...params,
@@ -37,7 +39,7 @@ export async function GetDevicePushRecodePage(data) {
         });
       }
     export async function GetGoodsPage(data) {
-        return request(`/saasbase/api/goods/page`, {
+        return request(getDataBaseUrl()+`/api/goods/page`, {
           method: 'Post',
           data: data,
           // params: { ...params },

src/pages/shopmanage/Printer/service.js

@@ -1,8 +1,9 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 
 export async function GetStoreInfos() {
-  return request('/storemanagement/api/shop/alllist', {
+  return request(getStoremanagement()+'/api/shop/alllist', {
     method: 'GET'
   });
 }
@@ -10,7 +11,7 @@ export async function GetStoreInfos() {
 
 //添加设备
 export async function AddPrinter(data) {
-  return request(`/storemanagement/api/Printer/AddPrinter`, {
+  return request(getStoremanagement()+`/api/Printer/AddPrinter`, {
     method: 'Post',
     data: data,
   });
@@ -19,7 +20,7 @@ export async function AddPrinter(data) {
 
 //获取
 export  function GetPrinter(data) {
-  return request(`/storemanagement/api/Printer/GetPrinterList?storeId=`+data, {
+  return request(getStoremanagement()+`/api/Printer/GetPrinterList?storeId=`+data, {
     method: 'get',
     data: data,
   });
@@ -28,7 +29,7 @@ export  function GetPrinter(data) {
 
 //修改设备
 export async function UpdatePrinter(data) {
-  return request(`/storemanagement/api/Printer/UpdatePrinter`, {
+  return request(getStoremanagement()+`/api/Printer/UpdatePrinter`, {
     method: 'post',
     data: data,
   });
@@ -36,14 +37,14 @@ export async function UpdatePrinter(data) {
 
 //设置主机
 export async function SetPrinterHost(storeid,id ) {
-  return request(`/storemanagement/api/Printer/SetPrinterHost?storeId=${storeid}&id=${id}`, {
+  return request(getStoremanagement()+`/api/Printer/SetPrinterHost?storeId=${storeid}&id=${id}`, {
     method: 'post',
   });
 }
 
 //删除
 export async function DelPrinter(data) {
-  return request(`/storemanagement/api/Printer/DelPrinter`, {
+  return request(getStoremanagement()+`/api/Printer/DelPrinter`, {
     method: 'post',
     data: data,
   });
@@ -51,7 +52,7 @@ export async function DelPrinter(data) {
 
   //获取模板
   export async function GetPrinterTemplater(data) {
-    return request(`/storemanagement/api/Printer/GetPrinterTemplater`, {
+    return request(getStoremanagement()+`/api/Printer/GetPrinterTemplater`, {
       method: 'get',
       data: data,
     });
@@ -59,7 +60,7 @@ export async function DelPrinter(data) {
   
   //获取店铺菜单
   export async function GetStoreFoodMenu(data) {
-    return request(`/storemanagement/api/Printer/GetStoreFoodMenu?storeId=`+data, {
+    return request(getStoremanagement()+`/api/Printer/GetStoreFoodMenu?storeId=`+data, {
       method: 'get',
       data: data,
     });

src/pages/shopmanage/foodMenuInfo/services.js

@@ -1,4 +1,5 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 /** 设备菜谱列表  */
 export async function GetFoodMenuInfoPage(data) {

src/pages/shopmanage/printerTemplate/index.jsx

@@ -37,12 +37,15 @@ const printerTemplateInfo = () => {
   const GetForm = (value) => {
     return (<ProForm
       onFinish={async (values) => {
+        debugger
         var result = !isAdd ? await UpdatePrinterTemplater(values) : await AddprinterTemplater(values);
         if (result.data) {
           GetStoreTemplaterList();
           message.success('成功');
+          SetIsAdd(false);
         } else {
           message.success('失败');
+          SetIsAdd(false);
         }
       }}
       labelCol={{ span: 4 }}
@@ -55,7 +58,7 @@ const printerTemplateInfo = () => {
         explain: value.explain,
         isShowPrintTime: value.isShowPrintTime,
         isShowNumber: value.isShowNumber,
-        Footer: value.Footer,
+        Footer: value.footer,
         type:value.type
       }}
       autoFocusFirstInput>

src/pages/shopmanage/printerTemplate/service.js

@@ -1,16 +1,17 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 
   //获取模板
 export async function GetPrinterTemplater(data) {
-  return request(`/storemanagement/api/Printer/GetPrinterTemplater`, {
+  return request(getStoremanagement()+`/api/Printer/GetPrinterTemplater`, {
     method: 'get',
     data: data,
   });
 }
   //新增
   export async function  AddprinterTemplater(data) {
-    return request(`/storemanagement/api/Printer/AddPrinterTemplate`, {
+    return request(getStoremanagement()+`/api/Printer/AddPrinterTemplate`, {
       method: 'post',
       data: data,
     });
@@ -18,7 +19,7 @@ export async function GetPrinterTemplater(data) {
 
    //修改
    export async function  UpdatePrinterTemplater(data) {
-    return request(`/storemanagement/api/Printer/UpdatePrinterTemplate`, {
+    return request(getStoremanagement()+`/api/Printer/UpdatePrinterTemplate`, {
       method: 'put',
       data: data,
     });
@@ -26,7 +27,7 @@ export async function GetPrinterTemplater(data) {
 
   //删除模板
 export async function DelPrinterTemplater(data) {
-  return request(`/storemanagement/api/Printer/DelPrinterTemplater`, {
+  return request(getStoremanagement()+`/api/Printer/DelPrinterTemplater`, {
     method: 'DELETE',
     data: data,
   });

src/pages/shop/service.js → src/pages/shopmanage/shop/service.js

@@ -1,37 +1,38 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 export default {
 
   Page(data) {
-    return request(`/storemanagement/api/shop/page`, {
+    return request(getStoremanagement()+`/api/shop/page`, {
       method: 'Post',
       data: data,
     });
   },
 
   Add(data) {
-    return request(`/storemanagement/api/shop`, {
+    return request(getStoremanagement()+`/api/shop`, {
       method: 'Post',
       data: data,
     });
   },
 
   Update(data) {
-    return request(`/storemanagement/api/shop`, {
+    return request(getStoremanagement()+`/api/shop`, {
       method: 'PUT',
       data: data,
     });
   },
 
   Del(data) {
-    return request(`/storemanagement/api/shop/del/`+data, {
+    return request(getStoremanagement()+`/api/shop/del/`+data, {
       method: 'Post',
     });
   },
 
   //获取组织列表
   GetOrgList(data) {
-    return request(`/saasbase/api/organize/getorglist`, {
+    return request(getDataBaseUrl()+`/api/organize/getorglist`, {
       method: 'Post',
       data: data,
     });
@@ -39,7 +40,7 @@ export default {
 
    //获取组织树
    GetOrgtree() {
-    return request(`/saasbase/api/organize/tree`, {
+    return request(getDataBaseUrl()+`/api/organize/tree`, {
       method: 'get',
     });
   },

src/pages/shopmanage/storeAddGoodsInfo/services.js

@@ -1,7 +1,8 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 export async function getGoods() {
-  return request(`/saasbase/api/goods/getgoodslist`, {
+  return request(getDataBaseUrl()+`/api/goods/getgoodslist`, {
     method: 'get',
   });
 }
@@ -9,7 +10,7 @@ export async function getGoods() {
 
   /**   */
   export async function AddAsync(data) {
-    return request(`/storemanagement/api/FoodMenu/PlusAddGoods`, {
+    return request(getStoremanagement()+`/api/FoodMenu/PlusAddGoods`, {
      method: 'POST',
      data: data,
    });
@@ -17,7 +18,7 @@ export async function getGoods() {
 
 /**   */
 export async function GetPageAsync(data) {
-  return request(`/storemanagement/api/FoodMenu/GetAddGoodsPageAsync`, {
+  return request(getStoremanagement()+`/api/FoodMenu/GetAddGoodsPageAsync`, {
    method: 'POST',
    data: data,
  });
@@ -25,7 +26,7 @@ export async function GetPageAsync(data) {
 
   /** 批量删除  */
   export async function DelAsync(data) {
-    return request(`​/storemanagement/api/FoodMenu/BatchDelPlusAddGoodsAsync?Ids=`+data, {
+    return request(getStoremanagement()+`​/api/FoodMenu/BatchDelPlusAddGoodsAsync?Ids=`+data, {
      method: 'POST',
      data: data,
    });

src/pages/shopmanage/storeAdvertisement/components/CreateForm.jsx

@@ -4,6 +4,7 @@ import { UploadOutlined, PlusOutlined } from '@ant-design/icons';
 import { openHtml } from '../service';
 import { request } from 'umi';
 import { cos } from 'cos-js-sdk-v5'
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 const CreateForm = (props) => {
 
@@ -48,6 +49,7 @@ const CreateForm = (props) => {
     imageList = props.values.imageUrl;
   }
 
+  
   //上传文件
   const uploadProps = {
     beforeUpload: (file) => {
@@ -90,7 +92,7 @@ const CreateForm = (props) => {
       }
     },
     name: 'file',
-    action:`/storemanage/api/Upload/FormImg?storeId=${typeof (currentSelect) == "undefined" ? props.values.storeId : currentSelect}`,
+    action:getStoremanagement()+`/api/Upload/FormImg?storeId=${typeof (currentSelect) == "undefined" ? props.values.storeId : currentSelect}`,
     headers: {
       authorization: 'authorization-text',
     },
@@ -105,6 +107,7 @@ const CreateForm = (props) => {
       if (info.file.status === 'done') {
         if (!info.file.response.isSuccess) {
           //上传失败错误提示
+          debugger
           message.error(info.file.response.msg);
         }
         else {
@@ -243,7 +246,7 @@ const CreateForm = (props) => {
         >
           {({ getFieldValue }) =>
             getFieldValue('uploadType') == '1' ? (
-              <Form.Item name="netWorkUrl" label="网络路径" >
+              <Form.Item name="netWorkUrl" label="网络路径" rules={[{ required: true }]} >
                 <Input placeholder="网络路径" />
               </Form.Item>
             ) : (

src/pages/shopmanage/storeAdvertisement/index.jsx

@@ -234,7 +234,7 @@ const PlanManage = () => {
                 okText="确定"
                 cancelText="取消"
                 >
-                <a href="#"> {record.status == 0 ? '停用' : '启用'}</a>
+                {/* <a href="#"> {record.status == 0 ? '停用' : '启用'}</a> */}
                 </Popconfirm>,
                  <Popconfirm
                  key="delete"

src/pages/shopmanage/storeAdvertisement/service.js

@@ -3,10 +3,11 @@
 /* eslint-disable */
 import { request } from 'umi';
 
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 /** 获取店铺  */
 export async function GetStoreInfoPageAsync() {
-  return request('/storemanagement/api/shop/alllist', {
+  return request(getStoremanagement()+'/api/shop/alllist', {
     method: 'GET'
   });
 }
@@ -15,7 +16,7 @@ export async function GetStoreInfoPageAsync() {
 
 /** 获取广告列表  post /kitchen/api/rule */
 export async function getAdvertisementList(data) {
-  return request(`/storemanagement/api/StoreAdvertisement/GetStoreAdvertisementPage`, {
+  return request(getStoremanagement()+`/api/StoreAdvertisement/GetStoreAdvertisementPage`, {
     method: 'Post',
     data: data,
   });
@@ -27,7 +28,7 @@ export async function getAdvertisementList(data) {
 
 export async function addAdvertisement(data) {
   // http://localhost:5000
-  return request('/storemanagement/api/StoreAdvertisement/AddStoreAdvertisement', {
+  return request(getStoremanagement()+'/api/StoreAdvertisement/AddStoreAdvertisement', {
     method: 'POST',
     // type:'json',
     data: data,
@@ -38,7 +39,7 @@ export async function addAdvertisement(data) {
 /** 修改广告 PUT /kitchen/api/rule */
 
 export async function updateAdvertisement(data) {
-  return request('/storemanagement/api/StoreAdvertisement/UpdateStoreAdvertisement', {
+  return request(getStoremanagement()+'/api/StoreAdvertisement/UpdateStoreAdvertisement', {
     method: 'PUT',
     data: data,
   });
@@ -47,7 +48,7 @@ export async function updateAdvertisement(data) {
 /** 批量删除广告 DELETE /kitchen/api/rule */
 
 export async function removeAdvertisement(data) {
-  return request(`/storemanagement/api/StoreAdvertisement/DelStoreAdvertisement`, {
+  return request(getStoremanagement()+`/api/StoreAdvertisement/DelStoreAdvertisement`, {
     method: 'DELETE',
     data: data,
     // ...(options || {}),
@@ -57,7 +58,7 @@ export async function removeAdvertisement(data) {
 
 /** 停用/启用  */
 export async function updateAdvertisementStatus(data) {
-  return request(`/storemanagement/api/StoreAdvertisement/UpdateStoreAdvertisementStatus`, {
+  return request(getStoremanagement()+`/api/StoreAdvertisement/UpdateStoreAdvertisementStatus`, {
     method: 'POST',
     data: data,
     // params: { ...params },
@@ -67,7 +68,7 @@ export async function updateAdvertisementStatus(data) {
 
 /** 预览  */
 export async function openHtml(data) {
-  return request(`/storemanagement/api/StoreAdvertisement/QueryStoreAdvertisementURL`, {
+  return request(getStoremanagement()+`/api/StoreAdvertisement/QueryStoreAdvertisementURL`, {
     method: 'POST',
     data: data,
     // params: { ...params },
@@ -75,3 +76,13 @@ export async function openHtml(data) {
   });
 }
 
+
+export async function GetCosRequestURL(data) {
+  return request(getStoremanagement()+`/api/SysService/GetPresignUploadUrl`, {
+    method: 'POST',
+    data: data,
+  });
+}
+
+
+

src/pages/shopmanage/storeDesktopNumber/services.js

@@ -1,8 +1,9 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 /** 获取店铺  */
 export async function GetStoreInfoPageAsync() {
-  return request('/storemanagement/api/shop/alllist', {
+  return request(getStoremanagement()+'/api/shop/alllist', {
     method: 'GET'
   });
 }
@@ -16,7 +17,7 @@ export async function GetStoreInfoPageAsync() {
 
 /** 查询  */
 export async function Page(data) {
-     return request(`/storemanagement/api/StoreDesktopNumber/Page`, {
+     return request(getStoremanagement()+`/api/StoreDesktopNumber/Page`, {
       method: 'POST',
       data: data,
     });
@@ -24,13 +25,13 @@ export async function Page(data) {
 
   /** 新增  */
 export async function Add(data) {
-  return request(`/storemanagement/api/StoreDesktopNumber/Add`, {
+  return request(getStoremanagement()+`/api/StoreDesktopNumber/Add`, {
    method: 'POST',
    data: data,
  });
 }
 export async function Update(data) {
-  return request(`/storemanagement/api/StoreDesktopNumber/UpdateStoreDesktopNumber`, {
+  return request(getStoremanagement()+`/api/StoreDesktopNumber/UpdateStoreDesktopNumber`, {
    method: 'put',
    data: data,
  });
@@ -40,7 +41,7 @@ export async function Update(data) {
 
 /** 删除桌码  */
 export async function DeleteDesktopNumber(data) {
-  return request(`​/storemanagement/api/StoreDesktopNumber/Delete`, {
+  return request(getStoremanagement()+`​/api/StoreDesktopNumber/Delete`, {
     method: 'DELETE',
     data: data,
   });

src/pages/shopmanage/storeGoodsInfo/index.jsx

@@ -1,9 +1,9 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { Tabs, message, Button } from 'antd';
+import { Tabs, message, Button,Popconfirm } from 'antd';
 const { TabPane } = Tabs;
 import React, { useState, useRef, useEffect } from 'react';
 import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
-import { GetShopFoodMenuPage, GetStoreInfoPage,AddFoodMenu,UpdateFoodMenu } from "./services"
+import { GetShopFoodMenuPage, GetStoreInfoPage,AddFoodMenu,UpdateFoodMenu,DelShopFoodMenu } from "./services"
 import ProTable from '@ant-design/pro-table';
 import CreateForm from './components/CreateForm';
 import LogForm from './components/Logs';
@@ -105,6 +105,26 @@ const storeGoodsInfo = (props) => {
 				>
 					菜谱商品
 				</a>,
+				 <Popconfirm
+				 key="delete"
+				 title={`确定要删除吗？`}
+				 onConfirm={ () => {
+				     DelShopFoodMenu(record.id).then((re) => {
+						if(re.statusCode==200){
+							message.success('删除成功');
+						}else{
+							message.error(re.errors || '删除失败');
+						}
+						
+					  });
+					  
+					  actionRef.current.reload();
+				 }}
+				 okText="确定"
+				 cancelText="取消"
+			   >
+				 <a href="#">删除</a>
+			   </Popconfirm>,
 			],
 		},
 	];

src/pages/shopmanage/storeGoodsInfo/services.js

@@ -1,15 +1,16 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
 
 /** 获取店铺  */
 export async function GetStoreInfoPage() {
-  return request('/storemanagement/api/shop/alllist', {
+  return request(getStoremanagement()+'/api/shop/alllist', {
     method: 'GET'
   });
 }
 
 /** 根据门店ID获取菜谱列表  */
 export async function GetShopFoodMenuPage(data) {
-  return request(`/storemanagement/api/FoodMenu/GetShopFoodMenuPage`, {
+  return request(getStoremanagement()+`/api/FoodMenu/GetShopFoodMenuPage`, {
     method: 'POST',
     data: data,
   });
@@ -17,16 +18,24 @@ export async function GetShopFoodMenuPage(data) {
 
 //添加菜谱
 export async function AddFoodMenu(data) {
-  return request(`/storemanagement/api/FoodMenu/AddUpdateFoodMenu`, {
+  return request(getStoremanagement()+`/api/FoodMenu/AddUpdateFoodMenu`, {
     method: 'POST',
     data: data,
   });
 }
 
+//删除菜谱
+export async function DelShopFoodMenu(data) {
+  return request(getStoremanagement()+`/api/FoodMenu/DelShopFoodMenu?id=`+data, {
+    method: 'POST',
+  });
+}
+
+
 
 /** 修改菜谱  */
 export async function UpdateFoodMenu(data) {
-  return request(`/storemanagement/api/FoodMenu/AddUpdateFoodMenu`, {
+  return request(getStoremanagement()+`/api/FoodMenu/AddUpdateFoodMenu`, {
     method: 'POST',
     data: data,
   });
@@ -39,7 +48,7 @@ export async function UpdateFoodMenu(data) {
  * @returns 
  */
 export async function GetAllGoodsMenuPage(params) {
-  return request('/storemanagement/api/FoodMenu/GetGoodsByMenuIdPage', {
+  return request(getStoremanagement()+'/api/FoodMenu/GetGoodsByMenuIdPage', {
     method: 'POST',
     data: {
       ...params,
@@ -54,7 +63,7 @@ export async function GetAllGoodsMenuPage(params) {
  * @returns 
  */
 export async function GetPage_v2(params) {
-  return request('/storemanagement/api/FoodMenu/GetFoodMenuGoodsPage_V2', {
+  return request(getStoremanagement()+'/api/FoodMenu/GetFoodMenuGoodsPage_V2', {
     method: 'POST',
     data: {
       ...params,
@@ -70,7 +79,7 @@ export async function GetPage_v2(params) {
  * @returns 
  */
 export async function EditFoodMenuGoods(params) {
-  return request('/storemanagement/api/FoodMenu/EditFoodMenuGoods', {
+  return request(getStoremanagement()+'/api/FoodMenu/EditFoodMenuGoods', {
     method: 'POST',
     data: params,
   });
@@ -78,7 +87,7 @@ export async function EditFoodMenuGoods(params) {
 
 /** 获取店铺上架商品  */
 export async function GetStoreGoods(data) {
-  return request(`​​/storemanagement/api/FoodMenu/GetStoreGoods`, {
+  return request(getStoremanagement()+`​​/api/FoodMenu/GetStoreGoods`, {
     method: 'POST',
     data: data,
     // params: { ...params },
@@ -89,7 +98,7 @@ export async function GetStoreGoods(data) {
 
 /** 修改  */
 export async function UpdateStoreGoods(data) {
-  return request(`/storemanagement/api/FoodMenu/UpdateStoreGood`, {
+  return request(getStoremanagement()+`/api/FoodMenu/UpdateStoreGood`, {
     method: 'put',
     data: data,
     // params: { ...params },
@@ -99,14 +108,14 @@ export async function UpdateStoreGoods(data) {
 
 /**商品估清 */
 export async function stopgoods(data) {
-  return request(`/storemanagement/api/FoodMenu/SetStopGoods`, {
+  return request(getStoremanagement()+`/api/FoodMenu/SetStopGoods`, {
     method: 'POST',
     data: data,
   });
 }
 /** 启用停用  */
 export async function UpdateStoreGoodsStatusAsync(data) {
-  return request(`/storemanagement/api/FoodMenu/UpdateStoreGood`, {
+  return request(getStoremanagement()+`/api/FoodMenu/UpdateStoreGood`, {
     method: 'put',
     data: data,
   });
@@ -114,7 +123,7 @@ export async function UpdateStoreGoodsStatusAsync(data) {
 
 /** 商品绑定设备  */
 export async function AddGoodDevice(data) {
-  return request(`/storemanagement/api/FoodMenu/AddGoodDeviceAsync`, {
+  return request(getStoremanagement()+`/api/FoodMenu/AddGoodDeviceAsync`, {
     method: 'POST',
     data: data,
   });
@@ -122,7 +131,7 @@ export async function AddGoodDevice(data) {
 
 /** 获取设备列表  */
 export async function GetDeviceInfoPage(data) {
-  return request(`/saasbase/api/device/list`, {
+  return request(getDataBaseUrl()+`/api/device/list`, {
     method: 'get',
     data: data,
   });
@@ -130,7 +139,7 @@ export async function GetDeviceInfoPage(data) {
 
 /** 查询商品绑定的所有设备  */
 export async function GetGoodDevice(goodsId, storeId) {
-  return request(`/storemanagement/api/FoodMenu/GetGoodDeviceAsync?foodId=${goodsId}&storeId=${storeId}`, {
+  return request(getStoremanagement()+`/api/FoodMenu/GetGoodDeviceAsync?foodId=${goodsId}&storeId=${storeId}`, {
     method: 'GET',
   });
 }

src/pages/shopmanage/storeStaff/services.js

@@ -1,14 +1,16 @@
 import { request } from 'umi';
+import { getDataBaseUrl,getStoremanagement } from '@/global_data';
+
 
 export async function GetAllStore() {
-  return request('/storemanagement/api/shop/alllist', {
+  return request(getStoremanagement()+'/api/shop/alllist', {
     method: 'GET'
   });
 }
 
 /** 获取  */
 export async function Getstorestaffpage(data) {
-     return request(`/storemanagement/api/StoreStaff/GetStoreStaffPage`, {
+     return request(getStoremanagement()+`/api/StoreStaff/GetStoreStaffPage`, {
       method: 'POST',
       data: data,
     });
@@ -16,7 +18,7 @@ export async function Getstorestaffpage(data) {
 
   /** 新增  */
 export async function Addstorestaff(data) {
-    return request(`/storemanagement/api/StoreStaff/AddStoreStaff`, {
+    return request(getStoremanagement()+`/api/StoreStaff/AddStoreStaff`, {
      method: 'POST',
      data: data,
    });
@@ -24,7 +26,7 @@ export async function Addstorestaff(data) {
 
    /** 修改  */
 export async function Updatestorestaff(data) {
-    return request(`/storemanagement/api/StoreStaff/UpdateStoreStaff`, {
+    return request(getStoremanagement()+`/api/StoreStaff/UpdateStoreStaff`, {
      method: 'put',
      data: data,
      // params: { ...params },
@@ -35,7 +37,7 @@ export async function Updatestorestaff(data) {
 
    /** 删除  */
 export async function Delstorestaff(data) {
-    return request(`​/storemanagement/api/StoreStaff/DelStoreStaff`, {
+    return request(getStoremanagement()+`​/api/StoreStaff/DelStoreStaff`, {
      method: 'DELETE',
      data: data,
      // params: { ...params },
@@ -47,7 +49,7 @@ export async function Delstorestaff(data) {
 
     /** 修改  */
 export async function UpdatestorestaffPwd(data) {
-  return request(`/storemanagement/api/StoreStaff/UpdateStoreStaffPwd`, {
+  return request(getStoremanagement()+`/api/StoreStaff/UpdateStoreStaffPwd`, {
    method: 'put',
    data: data,
    // params: { ...params },