Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录
切换导航
S
shop-new
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
王天霸
shop-new
Commits
ad7d3221
提交
ad7d3221
authored
11月 16, 2021
作者:
郑伟娜
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
联调保证金
上级
2044e9e8
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
148 行增加
和
67 行删除
+148
-67
securityFund.js
src/api/securityFund.js
+8
-0
index.js
src/router/index.js
+5
-0
PanelGroup.vue
src/views/dashboard/PanelGroup.vue
+92
-47
returnurl.vue
src/views/returnurl.vue
+16
-0
securityFund.vue
src/views/system/asset/securityFund.vue
+27
-20
没有找到文件。
src/api/securityFund.js
浏览文件 @
ad7d3221
...
...
@@ -62,4 +62,12 @@ export const payDetails = (params) => {
})
}
// 保证金申请详情
export
const
applyDetail
=
(
params
)
=>
{
return
request
({
url
:
'/local/bond/apply/detail'
,
method
:
'get'
,
params
})
}
src/router/index.js
浏览文件 @
ad7d3221
...
...
@@ -77,6 +77,11 @@ export const constantRoutes = [
component
:
(
resolve
)
=>
require
([
'@/views/error/401'
],
resolve
),
hidden
:
true
},
{
path
:
'/returnurl'
,
component
:
()
=>
import
(
'@/views/returnurl'
),
hidden
:
true
},
{
path
:
'/'
,
component
:
(
resolve
)
=>
require
([
'@/views/entry/newyuncang'
],
resolve
),
...
...
src/views/dashboard/PanelGroup.vue
浏览文件 @
ad7d3221
<
template
>
<el-row
:gutter=
"40"
class=
"panel-group"
>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('newVisitis')"
>
<div
class=
"card-panel-icon-wrapper icon-people"
>
<svg-icon
icon-class=
"peoples"
class-name=
"card-panel-icon"
/>
</div>
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
总商品
<div>
<el-row
:gutter=
"40"
class=
"panel-group"
>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('newVisitis')"
>
<div
class=
"card-panel-icon-wrapper icon-people"
>
<svg-icon
icon-class=
"peoples"
class-name=
"card-panel-icon"
/>
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.goods_total"
:duration=
"2600"
class=
"card-panel-num"
/>
</div>
</div>
</el-col>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('messages')"
>
<div
class=
"card-panel-icon-wrapper icon-message"
>
<svg-icon
icon-class=
"message"
class-name=
"card-panel-icon"
/>
</div>
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
总订单
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
总商品
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.goods_total"
:duration=
"2600"
class=
"card-panel-num"
/>
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.order_total"
:duration=
"3000"
class=
"card-panel-num"
/>
</div>
</div>
</el-col>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('purchases')"
>
<div
class=
"card-panel-icon-wrapper icon-money"
>
<svg-icon
icon-class=
"money"
class-name=
"card-panel-icon"
/>
</div>
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
总收入
</el-col>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('messages')"
>
<div
class=
"card-panel-icon-wrapper icon-message"
>
<svg-icon
icon-class=
"message"
class-name=
"card-panel-icon"
/>
</div>
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
总订单
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.order_total"
:duration=
"3000"
class=
"card-panel-num"
/>
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.total_price"
:decimals=
"2"
:duration=
"3200"
class=
"card-panel-num"
/>
</div>
</div>
</el-col>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('shoppings')"
>
<div
class=
"card-panel-icon-wrapper icon-shopping"
>
<svg-icon
icon-class=
"shopping"
class-name=
"card-panel-icon"
/>
</el-col>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('purchases')"
>
<div
class=
"card-panel-icon-wrapper icon-money"
>
<svg-icon
icon-class=
"money"
class-name=
"card-panel-icon"
/>
</div>
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
总收入
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.total_price"
:decimals=
"2"
:duration=
"3200"
class=
"card-panel-num"
/>
</div>
</div>
<div
class=
"xz-tip"
>
{{
(
panelData
.
refund_total
<
100
)?
panelData
.
refund_total
:
'99+'
}}
</div>
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
售后订单
</el-col>
<el-col
:xs=
"12"
:sm=
"12"
:lg=
"6"
class=
"card-panel-col"
>
<div
class=
"card-panel"
@
click=
"handleSetLineChartData('shoppings')"
>
<div
class=
"card-panel-icon-wrapper icon-shopping"
>
<svg-icon
icon-class=
"shopping"
class-name=
"card-panel-icon"
/>
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.refund_total"
:duration=
"3600"
class=
"card-panel-num"
/>
<div
class=
"xz-tip"
>
{{
(
panelData
.
refund_total
<
100
)?
panelData
.
refund_total
:
'99+'
}}
</div>
<div
class=
"card-panel-description"
>
<div
class=
"card-panel-text"
>
售后订单
</div>
<count-to
:start-val=
"0"
:end-val=
"panelData.refund_total"
:duration=
"3600"
class=
"card-panel-num"
/>
</div>
</div>
</el-col>
</el-row>
<!-- 保证金充值提醒 -->
<el-dialog
style=
"margin-top: 200px;"
title=
"保证金充值提醒"
:visible
.
sync=
"dialogVisible"
:destroy-on-close=
"true"
width=
"35%"
center
:close-on-click-modal=
"false"
append-to-body
>
<div>
<div
style=
"background: rgba(58, 160, 255, .05); padding: 20px; line-height: 24px; text-align: center;"
>
<div>
当前保证金余额不足,部分功能受限,请您及时充值保证金
</div>
</div>
</div>
</el-col>
</el-row>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"danger"
@
click=
"goPay"
>
去充值
</el-button>
</span>
</el-dialog>
</div>
</
template
>
<
script
>
import
CountTo
from
'vue-count-to'
import
{
shopInfo
}
from
'@/api/securityFund'
;
export
default
{
data
()
{
return
{}
return
{
dialogVisible
:
false
}
},
props
:
{
panelData
:
{
...
...
@@ -73,10 +98,30 @@ export default {
},
mounted
()
{
// console.log(75,this.panelData);
this
.
getShopInfo
()
},
methods
:
{
// 获取店铺信息
getShopInfo
()
{
shopInfo
().
then
(
res
=>
{
if
(
res
.
code
==
1
)
{
// 是否需要缴纳保证金 0否 1是
if
(
res
.
data
.
is_take_bond
==
1
||
res
.
data
.
bond
<
res
.
data
.
cate_bond
/
2
)
{
this
.
dialogVisible
=
true
}
else
{
this
.
dialogVisible
=
false
}
}
})
},
handleSetLineChartData
(
type
)
{
this
.
$emit
(
'handleSetLineChartData'
,
type
)
},
goPay
()
{
this
.
dialogVisible
=
false
this
.
$router
.
push
({
path
:
'/system/asset/securityFund'
})
}
}
}
...
...
src/views/returnurl.vue
0 → 100644
浏览文件 @
ad7d3221
<
template
>
</
template
>
<
script
>
export
default
{
name
:
'returnurl'
,
created
(){
},
mounted
()
{
window
.
opener
=
null
window
.
open
(
''
,
self
)
window
.
close
()
},
}
</
script
>
src/views/system/asset/securityFund.vue
浏览文件 @
ad7d3221
...
...
@@ -39,7 +39,7 @@
</div>
</div>
<div
style=
"text-align: center; margin-top: 50px; width: 100%;"
>
<el-button
type=
"primary"
size=
"mini"
style=
"width: 80px;"
@
click=
"payDialog = true"
:disabled=
"
bond == cate_bond
|| !isShowPay"
>
充值
</el-button>
<el-button
type=
"primary"
size=
"mini"
style=
"width: 80px;"
@
click=
"payDialog = true"
:disabled=
"
isPay
|| !isShowPay"
>
充值
</el-button>
<el-button
size=
"mini"
style=
"width: 80px;"
@
click=
"cancellationDialog = true"
:disabled=
"bond == 0"
>
申请退保
</el-button>
</div>
</div>
...
...
@@ -65,7 +65,7 @@
label=
"完成时间"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
updated_time
}}
{{
formatter
(
scope
.
row
.
updated_time
)
}}
</
template
>
</el-table-column>
<el-table-column
...
...
@@ -315,8 +315,9 @@
<
script
>
import
{
UploadImg
}
from
'@/api/module/goods'
import
{
shopInfo
,
bondDetail
,
addBond
,
bondByCate
,
accountList
,
bondApply
,
payDetails
}
from
'@/api/securityFund'
;
import
{
shopInfo
,
bondDetail
,
addBond
,
bondByCate
,
accountList
,
bondApply
,
payDetails
,
applyDetail
}
from
'@/api/securityFund'
;
import
{
getTelphoneCode
}
from
'@/api/module/settings'
import
{
dateFormat
}
from
'@/utils'
export
default
{
data
()
{
...
...
@@ -369,6 +370,9 @@
this
.
getPayDetails
()
},
methods
:
{
formatter
(
time
)
{
return
dateFormat
(
time
*
1000
,
'Y-m-d H:i:s'
)
},
// 处理金额
getFixed
(
value
)
{
let
data
=
0
...
...
@@ -437,13 +441,19 @@
this
.
bond
=
res
.
data
.
bond
||
0
this
.
frozen_bond
=
res
.
data
.
frozen_bond
||
0
this
.
cate_bond
=
res
.
data
.
cate_bond
||
0
this
.
isPay
=
res
.
data
.
is_take_bond
==
0
?
true
:
false
// 是否需要缴纳保证金 0否 1是
this
.
seller_id
=
res
.
data
.
seller_id
this
.
emergency_tel
=
res
.
data
.
emergency_tel
this
.
cancellationForm
.
money
=
this
.
getFixed
(
this
.
bond
)
this
.
payForm
.
money
=
this
.
getFixed
(
this
.
cate_bond
-
this
.
bond
)
// 是否需要缴纳保证金 0否 1是
if
(
res
.
data
.
is_take_bond
==
1
||
this
.
bond
<
this
.
cate_bond
/
2
)
{
this
.
isPay
=
true
}
else
{
this
.
isPay
=
false
}
this
.
getAccountList
()
}
})
...
...
@@ -484,30 +494,27 @@
if
(
res
.
code
==
1
)
{
if
(
type
==
1
)
{
this
.
$message
({
type
:
'
warning
'
,
type
:
'
success
'
,
message
:
'提交成功'
})
}
else
{
// 支付宝支付
window
.
open
(
res
.
data
.
pay_url
,
'_blank'
)
window
.
open
(
res
.
data
.
pay_url
,
'_blank'
)
this
.
$confirm
(
'请在支付宝充值页面进行充值。充值完成后,请回到此页面,根据您的情况,点击下方的按钮'
,
'充值'
,{
confirmButtonText
:
'充值成功'
,
cancelButtonText
:
'充值失败'
,
type
:
'warning'
}).
then
(
async
()
=>
{
// this.isKnow = false
// this.activeAliPay = true
// let payResult = await AlipayGet({sn: res.data.orderSn});
// if(payResult.code === 1) {
// if (payResult.message == '支付成功') this.$message({type: 'success',message: '充值成功!'});
// if (payResult.message == '支付失败') this.$message({type: 'error',message: payResult.message});
// // 如果充值成功,则需要初始化数据
// this.rechargeForm.aliPayAmount = 1000
// this.getIncome()
// }
}).
then
(
async
()
=>
{
let
payResult
=
await
applyDetail
({
id
:
res
.
data
.
id
})
if
(
payResult
.
code
===
1
)
{
if
(
payResult
.
data
.
audit_status
==
1
)
{
this
.
$message
({
type
:
'success'
,
message
:
'充值成功!'
})
}
else
{
this
.
$message
({
type
:
'error'
,
message
:
'充值失败!'
})
}
}
}).
catch
((
err
)
=>
{});
}
this
.
payDialog
=
false
this
.
getShopInfo
()
}
else
{
...
...
@@ -595,7 +602,7 @@
}
let
params
=
{
money
:
this
.
cancellationForm
.
money
,
money
:
this
.
cancellationForm
.
money
*
100
,
bank_id
:
this
.
cancellationForm
.
account
,
code
:
this
.
cancellationForm
.
code
}
...
...
@@ -680,7 +687,7 @@
let
data
=
{
"img_data"
:
this
.
Base64img
}
UploadImg
(
data
).
then
(
res
=>
{
if
(
res
&&
res
.
code
==
1
)
{
this
.
ruleFormdialogLogo
.
push
({
'url'
:
res
.
data
.
image_url
})
this
.
ruleFormdialogLogo
.
push
({
url
:
res
.
data
.
image_url
})
this
.
$message
({
message
:
'上传成功'
,
type
:
'success'
});
}
else
{
this
.
ruleFormdialogLogo
=
[];
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论