Skip to content

D
dcxy-manage-shell
Commit 710edf13 by 姜雷
Options

Merge branch 'develop' into 'test'

Develop See merge request !32
parents a691b653 7f79669f
Showing with 7 additions and 2 deletions
src/components/Dialog/UserDialog.vue
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
> >
<user-with-content <user-with-content
:customerId="customerId" :customerId="customerId"
:visible='visible' :visible="visible"
:showMoney="showMoney"
ref="userContent" ref="userContent"
> >
<button <button
...@@ -59,6 +60,10 @@ export default { ...@@ -59,6 +60,10 @@ export default {
extends: Dialog, extends: Dialog,
props: { props: {
customerId: Number, customerId: Number,
showMoney: {
type: Boolean,
default: false,
},
}, },
// mounted() { // mounted() {
// let dialogWidth = 0; // let dialogWidth = 0;
......
src/containers/Dashboard/CustomerRecharge/chart.vue
...@@ -259,7 +259,7 @@ export default { ...@@ -259,7 +259,7 @@ export default {
}, },
}, },
start: this.data.length - 4, start: this.data.length - 4,
end: this.data.length - -1, end: this.data.length - 1,
minSpan: 4, minSpan: 4,
maxSpan: 4, maxSpan: 4,
data: this.dataList, data: this.dataList,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment