Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
occloud-server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yangjiarong
occloud-server
Commits
8784a8e7
Commit
8784a8e7
authored
Jul 26, 2022
by
liuliufashi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
72cb2989
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
107 additions
and
10 deletions
+107
-10
dist.zip
web-vue-admin/dist.zip
+0
-0
index.ts
web-vue-admin/src/api/index.ts
+17
-2
index.ts
web-vue-admin/src/router/index.ts
+8
-0
index.vue
...-admin/src/views/goods-cabinet/components/goods/index.vue
+4
-1
index.vue
...min/src/views/goods-cabinet/components/goodsubs/index.vue
+1
-1
index.vue
web-vue-admin/src/views/goods-cabinet/index.vue
+0
-2
index.vue
web-vue-admin/src/views/home/index.vue
+1
-4
index.vue
web-vue-admin/src/views/pay-info/index.vue
+76
-0
No files found.
web-vue-admin/dist.zip
deleted
100644 → 0
View file @
72cb2989
File deleted
web-vue-admin/src/api/index.ts
View file @
8784a8e7
...
...
@@ -168,4 +168,19 @@ export const onDelectgoodpay = async(data:any)=>{
url
:
`/goods/delectgoodpay?goodspayid=
${
data
.
goodspayid
}
&uid=
${
data
.
uid
}
`
,
method
:
'post'
,
});
}
\ No newline at end of file
}
export
const
onFindPayInfo
=
async
(
data
:
any
)
=>
{
return
await
request
({
url
:
`/orders/findall?page=
${
data
.
page
}
&size=
${
data
.
size
}
&uid=
${
data
.
uid
}
`
,
method
:
'post'
,
});
}
export
const
onFindPayOrderid
=
async
(
data
:
any
)
=>
{
return
await
request
({
url
:
`/orders/findorderid?orderid=
${
data
.
orderid
}
&uid=
${
data
.
uid
}
`
,
method
:
'post'
,
});
}
// /orders/findall
\ No newline at end of file
web-vue-admin/src/router/index.ts
View file @
8784a8e7
...
...
@@ -53,6 +53,14 @@ const routes: Array<RouteRecordRaw> = [
},
component
:
()
=>
import
(
'@/views/pay-config/index.vue'
)
},
{
path
:
'/home/payinfo'
,
name
:
'订单详情'
,
meta
:{
icon
:
'icon-fencengpeizhi'
},
component
:
()
=>
import
(
'@/views/pay-info/index.vue'
)
},
]
},
{
...
...
web-vue-admin/src/views/goods-cabinet/components/goods/index.vue
View file @
8784a8e7
...
...
@@ -320,6 +320,7 @@ const onBeforeUpload: UploadProps['beforeUpload'] = file => {
const
onSubmit
=
()
=>
{
validate
()
.
then
(
async
()
=>
{
const
fromData
:
any
=
toRaw
(
formState
)
const
uid
=
getUid
()
const
prarms
=
{
...
...
@@ -330,10 +331,12 @@ const onSubmit = () => {
uid
,
parent
:
1
,
markingprice
:
fromData
.
markingprice
*
100
,
price
:
fromData
.
marking
price
*
100
,
price
:
fromData
.
price
*
100
,
picurl
:
fromData
.
picurl
,
free
:
value
.
value
}
console
.
log
(
prarms
,
'toRaw(formState)'
);
const
data
:
any
=
await
onCreateGoods
(
JSON
.
stringify
(
prarms
))
if
(
data
.
state
===
1
)
{
resetFields
()
...
...
web-vue-admin/src/views/goods-cabinet/components/goodsubs/index.vue
View file @
8784a8e7
...
...
@@ -313,7 +313,7 @@ const onSubmit = () => {
uid
,
parent
:
1
,
markingprice
:
fromData
.
markingprice
*
100
,
price
:
fromData
.
marking
price
*
100
,
price
:
fromData
.
price
*
100
,
picurl
:
fromData
.
picurl
}
const
data
:
any
=
await
onCreateGoods
(
JSON
.
stringify
(
prarms
))
...
...
web-vue-admin/src/views/goods-cabinet/index.vue
View file @
8784a8e7
...
...
@@ -441,8 +441,6 @@ const handleChange = (info: any) => {
if
(
file
.
response
)
{
console
.
log
(
fileList
,
'fileList'
);
// Component will show file.url as link
// modelRef.picurl = file.response.data;
}
return
file
;
...
...
web-vue-admin/src/views/home/index.vue
View file @
8784a8e7
...
...
@@ -54,11 +54,8 @@ import {
BellOutlined
,
RadarChartOutlined
,
DashOutlined
,
AlipaySquareFilled
,
DatabaseFilled
,
}
from
"@ant-design/icons-vue"
;
import
{
getRouters
}
from
"@/api/index"
;
import
{
onSetRouter
}
from
"@/utils/userInfo"
interface
FormUser
{
name
:
String
;
password
:
String
;
...
...
@@ -85,7 +82,7 @@ const getText = (item:any)=>{
onMounted
(
async
()
=>
{
const
list
:
any
=
await
getRouters
();
const
newList
:
any
=
router
.
options
.
routes
[
2
].
children
setRoutet
(
newList
.
splice
(
1
,
3
));
setRoutet
(
newList
.
splice
(
1
,
4
));
// onSetRouter(list.data)
});
defineExpose
({
...
...
web-vue-admin/src/views/pay-info/index.vue
0 → 100644
View file @
8784a8e7
<
template
>
<div
style=
"display: flex;margin-bottom: 20px;"
>
<a-input-search
v-model:value=
"value"
placeholder=
"请输入订单号"
style=
"width: 200px"
@
search=
"onSearch"
/>
</div>
<a-table
:columns=
"columns"
:data-source=
"list"
>
</a-table>
</
template
>
<
script
lang=
"ts"
setup
>
import
{
onMounted
,
ref
,
defineExpose
}
from
'vue'
;
import
{
onFindPayInfo
,
onFindPayOrderid
}
from
'@/api/index'
import
{
getUid
}
from
'@/utils/userInfo'
let
list
=
ref
<
any
>
([])
let
page
=
ref
<
any
>
(
'1'
)
let
size
=
ref
<
any
>
(
'10'
)
let
value
=
ref
<
any
>
(
''
)
const
columns
=
[
{
title
:
'商品名'
,
dataIndex
:
'subject'
,
key
:
'subject'
,
},
{
title
:
'订单数'
,
dataIndex
:
'amount'
,
key
:
'amount'
,
},
{
title
:
'订单号'
,
dataIndex
:
'id'
,
key
:
'id'
,
},
{
title
:
'merchantorderid'
,
key
:
'merchantorderid'
,
dataIndex
:
'merchantorderid'
,
},
{
title
:
'订单时间'
,
dataIndex
:
'updatetime'
,
key
:
'updatetime'
,
},
];
const
onSearch
=
async
()
=>
{
const
prarms
=
{
uid
:
getUid
(),
orderid
:
value
.
value
}
const
data
:
any
=
await
onFindPayOrderid
(
prarms
)
if
(
data
.
state
===
1
){
list
.
value
=
[
data
.
data
]
}
}
onMounted
(
async
()
=>
{
const
uid
=
getUid
()
const
prarms
:
any
=
{
page
:
page
.
value
,
size
:
size
.
value
,
uid
}
const
data
:
any
=
await
onFindPayInfo
(
prarms
)
if
(
data
.
state
===
1
){
list
.
value
=
data
.
data
}
})
defineExpose
({
columns
})
</
script
>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment