1
This commit is contained in:
PC-202306242200\Administrator
@@ -85,8 +85,8 @@ export default defineConfig({
|
|||||||
define: {
|
define: {
|
||||||
'process.env': {
|
'process.env': {
|
||||||
// API_URL: "http://guangdongadminapi.zhongshuai2023.com",
|
// API_URL: "http://guangdongadminapi.zhongshuai2023.com",
|
||||||
API_URL: "http://iadminapi.zhongshuai2023.com",
|
// API_URL: "http://iadminapi.zhongshuai2023.com",
|
||||||
// API_URL: "http://192.168.1.63:1002",
|
API_URL: "http://192.168.1.63:1002",
|
||||||
// API_URL: "http://192.168.1.54:1002",
|
// API_URL: "http://192.168.1.54:1002",
|
||||||
WS_URL: "ws://lv.com",
|
WS_URL: "ws://lv.com",
|
||||||
STATIC_URL: "http://lv.com",
|
STATIC_URL: "http://lv.com",
|
||||||
|
|||||||
10
dist/6709.aba45457.async.js
vendored
10
dist/6709.aba45457.async.js
vendored
File diff suppressed because one or more lines are too long
2
dist/index.html
vendored
2
dist/index.html
vendored
@@ -8,6 +8,6 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
<script src="/umi.9848ee1f.js"></script>
|
<script src="/umi.e91c8212.js"></script>
|
||||||
|
|
||||||
</body></html>
|
</body></html>
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[3759],{63937:function(R,g,e){e.r(g);var y=e(90228),r=e.n(y),O=e(87999),u=e.n(O),l=e(72951),m=e(7485),h=e(50959),M=e(52221),f=e(47698),C=e(45321),p=e(50159),I=e(16030),E=e(35384),_=e(75343),a=e(11527),v=function(){var x=(0,h.useRef)(),A=(0,m.useAccess)(),U=[{title:"ID",dataIndex:"id",valueType:"text",search:!1},{title:"\u5546\u54C1\u540D\u79F0",dataIndex:"goodsName",valueType:"text",search:!0},{title:"\u529F\u7387",dataIndex:"itemType",valueType:"text",search:!1,render:function(i,t){return t!=null&&t.itemType?(t==null?void 0:t.itemType)+"KW":"-"}},{title:"\u9500\u552E\u4EF7\u683C",dataIndex:"salePrice",valueType:"text",search:!1},{title:"\u5229\u6DA6",dataIndex:"profit",valueType:"text",search:!1},{title:"\u5E93\u5B58",dataIndex:"stock",valueType:"text",search:!1},{title:"\u9500\u91CF",dataIndex:"sales",valueType:"text",search:!1},{title:"\u5546\u54C1\u4E3B\u56FE",dataIndex:"picture",valueType:"text",search:!1,render:function(i,t){var s=t.picture?JSON.parse(t.picture)[0]:"";return s?(0,a.jsx)(M.Z,{src:s,width:50}):""}},{title:"\u662F\u5426\u4E0A\u67B6",dataIndex:"isUp",valueType:"text",search:!1,render:function(i,t){var s=function(){var j=u()(r()().mark(function P(d){var D,o;return r()().wrap(function(T){for(;;)switch(T.prev=T.next){case 0:return D=JSON.parse(JSON.stringify(t)),D.isUp=d?1:0,T.next=4,(0,l.Ge)(D);case 4:o=T.sent,f.ZP.success(d?"\u4E0A\u67B6\u6210\u529F":"\u4E0B\u67B6\u6210\u529F"),x.current&&x.current.reload();case 7:case"end":return T.stop()}},P)}));return function(d){return j.apply(this,arguments)}}();return(0,a.jsx)(C.Z,{checkedChildren:"\u4E0A\u67B6",value:t.isUp==1,unCheckedChildren:"\u4E0B\u67B6",defaultChecked:!0,onChange:s})}},{title:"\u64CD\u4F5C",dataIndex:"option",width:"220px",valueType:"option",render:function(i,t){return[(0,a.jsx)(p.ZP,{type:"link",size:"small",hidden:!A.hasPerms("/api/goods/update"),onClick:function(){m.history.push("goods/".concat(t.id,"/update"))},children:"\u7F16\u8F91"})]}}];return(0,a.jsx)(I._z,{children:(0,a.jsx)("div",{style:{width:"100%",float:"right"},children:(0,a.jsx)(E.Z,{actionRef:x,rowKey:"id",search:{labelWidth:120,defaultCollapsed:!1},toolBarRender:function(){return[(0,a.jsxs)(p.ZP,{type:"primary",hidden:!A.hasPerms("/api/goods/add"),onClick:u()(r()().mark(function i(){return r()().wrap(function(s){for(;;)switch(s.prev=s.next){case 0:m.history.push("goods/0/create");case 1:case"end":return s.stop()}},i)})),children:[(0,a.jsx)(_.Z,{})," \u65B0\u5EFA"]},"add")]},request:function(){var c=u()(r()().mark(function i(t,s,j){var P,d;return r()().wrap(function(o){for(;;)switch(o.prev=o.next){case 0:return o.next=2,(0,l.k5)(t);case 2:return P=o.sent,d=P.data,o.abrupt("return",{data:(d==null?void 0:d.records)||[],total:d==null?void 0:d.total});case 5:case"end":return o.stop()}},i)}));return function(i,t,s){return c.apply(this,arguments)}}(),columns:U},"goodsList")})})};g.default=v},72951:function(R,g,e){e.d(g,{Ge:function(){return C},VT:function(){return I},Y:function(){return M},k5:function(){return m}});var y=e(90228),r=e.n(y),O=e(87999),u=e.n(O),l=e(7485);function m(_){return h.apply(this,arguments)}function h(){return h=u()(r()().mark(function _(a){return r()().wrap(function(n){for(;;)switch(n.prev=n.next){case 0:return n.abrupt("return",(0,l.request)("/api/goods/page",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:a||{}}));case 1:case"end":return n.stop()}},_)})),h.apply(this,arguments)}function M(_){return f.apply(this,arguments)}function f(){return f=u()(r()().mark(function _(a){return r()().wrap(function(n){for(;;)switch(n.prev=n.next){case 0:return n.abrupt("return",(0,l.request)("/api/goods/add",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:a||{}}));case 1:case"end":return n.stop()}},_)})),f.apply(this,arguments)}function C(_){return p.apply(this,arguments)}function p(){return p=u()(r()().mark(function _(a){return r()().wrap(function(n){for(;;)switch(n.prev=n.next){case 0:return n.abrupt("return",(0,l.request)("/api/goods/update",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:a||{}}));case 1:case"end":return n.stop()}},_)})),p.apply(this,arguments)}function I(_){return E.apply(this,arguments)}function E(){return E=u()(r()().mark(function _(a){return r()().wrap(function(n){for(;;)switch(n.prev=n.next){case 0:return n.abrupt("return",(0,l.request)("/api/goods/detail",{method:"GET",headers:{"Content-Type":"application/json;charset=UTF-8"},params:a}));case 1:case"end":return n.stop()}},_)})),E.apply(this,arguments)}}}]);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[6109],{3599:function(b,T,a){a.r(T);var g=a(48305),r=a.n(g),m=a(50959),i=a(94675),l=a(33917),v=a(92790),u=a(11527);T.default=function(h){var s=h.values,y=h.modalOpenState,d=h.onModalOpenState,O=(0,m.useState)(null),p=r()(O,2),j=p[0],E=p[1],C=(0,m.useState)(null),c=r()(C,2),P=c[0],f=c[1];(0,m.useEffect)(function(){s!=null&&s.id&&(0,v.QN)(s==null?void 0:s.id).then(function(o){var n=o.data;f(n||[])}).catch(function(){})},[s]);var D=[{title:"id",dataIndex:"id",search:!1},{title:"\u6295\u8D44\u4EBA",dataIndex:"shop",search:!1,render:function(n,t){return(0,u.jsxs)(u.Fragment,{children:[(0,u.jsxs)("div",{children:["\u7528\u6237\u540D\uFF1A",t==null?void 0:t.userName]}),(0,u.jsxs)("div",{children:["\u624B\u673A\u53F7\uFF1A",t==null?void 0:t.phone]}),(0,u.jsxs)("div",{children:["\u7B49\u7EA7\uFF1A",t==null?void 0:t.level]})]})}},{title:"\u7C7B\u578B",dataIndex:"typeValue",search:!1},{title:"\u91D1\u989D",dataIndex:"points",search:!1},{title:"\u521B\u5EFA\u65F6\u95F4",dataIndex:"createTime",search:!1}];return(0,u.jsx)(u.Fragment,{children:(0,u.jsx)(i.Z,{width:"800px",title:"\u5206\u7EA2",open:y,onOk:function(){d(!1)},onCancel:function(){d(!1)},children:(0,u.jsx)(u.Fragment,{children:(0,u.jsx)(l.Z,{rowKey:"id",columns:D,dataSource:P,pagination:!1})})})})}},92790:function(b,T,a){a.d(T,{KP:function(){return C},Lp:function(){return O},QN:function(){return y},a5:function(){return j},aT:function(){return v},nr:function(){return D},sb:function(){return P},tX:function(){return h}});var g=a(90228),r=a.n(g),m=a(87999),i=a.n(m),l=a(7485);function v(n){return u.apply(this,arguments)}function u(){return u=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/page",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:t||{}}));case 1:case"end":return e.stop()}},n)})),u.apply(this,arguments)}function h(n){return s.apply(this,arguments)}function s(){return s=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/export",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:t||{},responseType:"blob"}));case 1:case"end":return e.stop()}},n)})),s.apply(this,arguments)}function y(n){return d.apply(this,arguments)}function d(){return d=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/orderIncomeList?id=".concat(t),{method:"GET",headers:{"Content-Type":"application/json;charset=UTF-8"}}));case 1:case"end":return e.stop()}},n)})),d.apply(this,arguments)}function O(n){return p.apply(this,arguments)}function p(){return p=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/orderRefund",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:t||{}}));case 1:case"end":return e.stop()}},n)})),p.apply(this,arguments)}function j(n){return E.apply(this,arguments)}function E(){return E=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/getWeiXinCollect",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:t||{}}));case 1:case"end":return e.stop()}},n)})),E.apply(this,arguments)}function C(n){return c.apply(this,arguments)}function c(){return c=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/getCollect",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:t||{}}));case 1:case"end":return e.stop()}},n)})),c.apply(this,arguments)}function P(n){return f.apply(this,arguments)}function f(){return f=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/getBalance",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:t||{}}));case 1:case"end":return e.stop()}},n)})),f.apply(this,arguments)}function D(n){return o.apply(this,arguments)}function o(){return o=i()(r()().mark(function n(t){return r()().wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",(0,l.request)("/api/orders/getZhiFuBaoCollect",{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},data:t||{}}));case 1:case"end":return e.stop()}},n)})),o.apply(this,arguments)}}}]);
|
|
||||||
File diff suppressed because one or more lines are too long
578
dist/umi.9848ee1f.js
vendored
578
dist/umi.9848ee1f.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -166,6 +166,30 @@ export default () => {
|
|||||||
label="功率"
|
label="功率"
|
||||||
placeholder="功率"
|
placeholder="功率"
|
||||||
/>
|
/>
|
||||||
|
<ProFormRadio.Group
|
||||||
|
name="purposeType"
|
||||||
|
options={[
|
||||||
|
{
|
||||||
|
label: '商用运维版',
|
||||||
|
value: '1',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '商用合作版',
|
||||||
|
value: '2',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '家庭专业版',
|
||||||
|
value: '3',
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
label={'设备类型'}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: false,
|
||||||
|
message: '请选择设备类型',
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
/>
|
||||||
<ProForm.Group>
|
<ProForm.Group>
|
||||||
<ProForm.Item
|
<ProForm.Item
|
||||||
rules={[{ required: true, message: '请输入!' }]}
|
rules={[{ required: true, message: '请输入!' }]}
|
||||||
|
|||||||
@@ -179,6 +179,30 @@ export default () => {
|
|||||||
name="itemType"
|
name="itemType"
|
||||||
label="功率"
|
label="功率"
|
||||||
placeholder="功率"
|
placeholder="功率"
|
||||||
|
/>
|
||||||
|
<ProFormRadio.Group
|
||||||
|
name="purposeType"
|
||||||
|
options={[
|
||||||
|
{
|
||||||
|
label: '商用运维版',
|
||||||
|
value: '1',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '商用合作版',
|
||||||
|
value: '2',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '家庭专业版',
|
||||||
|
value: '3',
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
label={'设备类型'}
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: false,
|
||||||
|
message: '请选择设备类型',
|
||||||
|
},
|
||||||
|
]}
|
||||||
/>
|
/>
|
||||||
<ProForm.Group>
|
<ProForm.Group>
|
||||||
<ProForm.Item
|
<ProForm.Item
|
||||||
|
|||||||
@@ -33,7 +33,16 @@ const GoodsTableList: React.FC = () => {
|
|||||||
valueType: 'text',
|
valueType: 'text',
|
||||||
search: false,
|
search: false,
|
||||||
render: (_: any, record: any) => {
|
render: (_: any, record: any) => {
|
||||||
return record?.itemType ? record?.itemType + 'KW' :'-'
|
return record?.itemType ? record?.itemType + 'KW' : '-'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '设备类型',
|
||||||
|
dataIndex: 'purposeType',
|
||||||
|
valueType: 'text',
|
||||||
|
search: false,
|
||||||
|
render: (_: any, record: any) => {
|
||||||
|
return record?.purposeType == 1 ? '商用运维版' : record?.purposeType == 2 ? '商用合作版' : record?.purposeType == 3 ? '家庭专业版' : '-'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { orderPage, orderExport, orderRefund, getWeiXinCollect, getCollect, getBalance, getZhiFuBaoCollect } from '@/services/order';
|
import { orderPage, orderExport, orderRefund, getWeiXinCollect, getCollect, getBalance, getZhiFuBaoCollect, deliverGoods } from '@/services/order';
|
||||||
import { exportData } from '@/utils/func';
|
import { exportData } from '@/utils/func';
|
||||||
import React, { useRef, useEffect, useState } from 'react';
|
import React, { useRef, useEffect, useState } from 'react';
|
||||||
import { useIntl, useAccess } from '@umijs/max';
|
import { useIntl, useAccess } from '@umijs/max';
|
||||||
@@ -7,7 +7,7 @@ import { ActionType, PageContainer, ProTable } from '@ant-design/pro-components'
|
|||||||
import BonusFormModal from './components/BonusFormModal';
|
import BonusFormModal from './components/BonusFormModal';
|
||||||
import EscFormModal from './components/EscFormModal';
|
import EscFormModal from './components/EscFormModal';
|
||||||
import { usersPage } from '@/services/user/user';
|
import { usersPage } from '@/services/user/user';
|
||||||
|
import UpdateForm from './fahuo';
|
||||||
|
|
||||||
|
|
||||||
const LogTableList: React.FC = () => {
|
const LogTableList: React.FC = () => {
|
||||||
@@ -21,8 +21,9 @@ const LogTableList: React.FC = () => {
|
|||||||
const [count2, setCount2] = useState({});
|
const [count2, setCount2] = useState({});
|
||||||
const [count3, setCount3] = useState({});
|
const [count3, setCount3] = useState({});
|
||||||
const [count4, setCount4] = useState({});
|
const [count4, setCount4] = useState({});
|
||||||
|
const [currentRow, setCurrentRow] = useState({});
|
||||||
|
|
||||||
|
const [modalVisible, setModalVisible] = useState<boolean>(false);
|
||||||
|
|
||||||
const access = useAccess()
|
const access = useAccess()
|
||||||
const count = useState({})
|
const count = useState({})
|
||||||
@@ -124,6 +125,7 @@ const LogTableList: React.FC = () => {
|
|||||||
/>
|
/>
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
title: '商品信息',
|
title: '商品信息',
|
||||||
dataIndex: 'ordersGoodsList',
|
dataIndex: 'ordersGoodsList',
|
||||||
@@ -237,6 +239,45 @@ const LogTableList: React.FC = () => {
|
|||||||
/>
|
/>
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '收货信息',
|
||||||
|
dataIndex: 'userId',
|
||||||
|
valueType: 'text',
|
||||||
|
search: false,
|
||||||
|
render: (_: any, record: any) => {
|
||||||
|
return <div className={'flex'}>
|
||||||
|
<div>
|
||||||
|
<div>
|
||||||
|
姓名：{record?.takeName}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
手机号：{record?.takePhone || '-'}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
地址：{record?.takeAddress}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '快递信息',
|
||||||
|
dataIndex: 'userId',
|
||||||
|
valueType: 'text',
|
||||||
|
search: false,
|
||||||
|
render: (_: any, record: any) => {
|
||||||
|
return <div className={'flex'}>
|
||||||
|
<div>
|
||||||
|
<div>
|
||||||
|
快递名称：{record?.expressName}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
快递单号：{record?.expressNumber || '-'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '备注',
|
title: '备注',
|
||||||
dataIndex: 'remarks',
|
dataIndex: 'remarks',
|
||||||
@@ -259,6 +300,27 @@ const LogTableList: React.FC = () => {
|
|||||||
return record?.createTime
|
return record?.createTime
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '操作',
|
||||||
|
dataIndex: 'option',
|
||||||
|
valueType: 'option',
|
||||||
|
render: (_, record) => [
|
||||||
|
<Button
|
||||||
|
type="link"
|
||||||
|
size="small"
|
||||||
|
onClick={() => {
|
||||||
|
var aaa = {
|
||||||
|
...record,
|
||||||
|
orderId: record.id
|
||||||
|
}
|
||||||
|
setModalVisible(true);
|
||||||
|
setCurrentRow(aaa);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
发货
|
||||||
|
</Button>,
|
||||||
|
],
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const escSubmit = async (fields) => {
|
const escSubmit = async (fields) => {
|
||||||
@@ -375,6 +437,29 @@ const LogTableList: React.FC = () => {
|
|||||||
columns={columns}
|
columns={columns}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<UpdateForm
|
||||||
|
onSubmit={async (values) => {
|
||||||
|
console.log(values);
|
||||||
|
|
||||||
|
let success = false;
|
||||||
|
if (values.orderId) {
|
||||||
|
success = await deliverGoods({ ...values });
|
||||||
|
}
|
||||||
|
if (success) {
|
||||||
|
setModalVisible(false);
|
||||||
|
setCurrentRow(undefined);
|
||||||
|
if (actionRef.current) {
|
||||||
|
actionRef.current.reload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onCancel={() => {
|
||||||
|
setModalVisible(false);
|
||||||
|
setCurrentRow(undefined);
|
||||||
|
}}
|
||||||
|
open={modalVisible}
|
||||||
|
values={currentRow || {}}
|
||||||
|
/>
|
||||||
</PageContainer>
|
</PageContainer>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -81,3 +81,13 @@ export async function getZhiFuBaoCollect(bodys) {
|
|||||||
data: bodys || {},
|
data: bodys || {},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function deliverGoods(bodys) {
|
||||||
|
return request('/api/orders/deliverGoods', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json;charset=UTF-8',
|
||||||
|
},
|
||||||
|
data: bodys || {},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user