diff --git a/src/views/platform/buyDetail.vue b/src/views/platform/buyDetail.vue
index ed0ed85..cb13990 100644
--- a/src/views/platform/buyDetail.vue
+++ b/src/views/platform/buyDetail.vue
@@ -10,8 +10,9 @@
-
+
@@ -21,7 +22,7 @@
-
+
diff --git a/src/views/platform/cart.vue b/src/views/platform/cart.vue
index 3ca83c8..ada0aaa 100644
--- a/src/views/platform/cart.vue
+++ b/src/views/platform/cart.vue
@@ -46,11 +46,11 @@ export default {
getList() {
// this.loading = true;
- listCart(this.userId).then(response => {
- this.cartList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
+ // listCart(this.userId).then(response => {
+ // this.cartList = response.rows;
+ // this.total = response.total;
+ // this.loading = false;
+ // });
}
},
watch: {
diff --git a/src/views/platform/discount.vue b/src/views/platform/discount.vue
index 1879151..269d56c 100644
--- a/src/views/platform/discount.vue
+++ b/src/views/platform/discount.vue
@@ -2,8 +2,9 @@
-
+
@@ -29,7 +30,7 @@
-
+
@@ -62,6 +63,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
+ dateRange: undefined
},
}
},
diff --git a/src/views/platform/walletDetail.vue b/src/views/platform/walletDetail.vue
index 2500049..64aba3f 100644
--- a/src/views/platform/walletDetail.vue
+++ b/src/views/platform/walletDetail.vue
@@ -1,23 +1,23 @@
-
+
¥123.00
钱包余额
-
+
¥123.00
提现总金额
-
+
¥123.00
充值金额
-
+
¥123.00
邀请金额
-
+
¥123.00
支出金额
@@ -32,8 +32,9 @@
-
+
@@ -43,7 +44,7 @@
-
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0025d42..fdd9e6d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -99,12 +99,12 @@
- 详情
{{ scope.row.status === '0' ? '禁用' : '开启' }}
- 购买明细
@@ -123,7 +123,8 @@
-
+
@@ -131,7 +132,7 @@
-
+
@@ -235,7 +236,7 @@ export default {
// 是否显示弹出层
open: false,
//激活标签页
- activeName: "base"
+ activeName: null
},
// 用户导入参数
upload: {
@@ -282,6 +283,15 @@ export default {
});
},
methods: {
+ showBuyDetail(userId) {
+ this.detail.activeName = 'buy_detail'
+ this.clickUserId = userId
+ this.detail.open = true
+ },
+ showDetail(userId) {
+ this.detail.activeName = 'base'
+ this.clickUserId = userId
+ },
//批量更新用户状态
updateStatusByUserId(status, userId) {
updateStatus({
@@ -391,18 +401,19 @@ export default {
});
},
/** 修改按钮操作 */
- handleUpdate(row) {
+ handleUpdate() {
this.reset();
- const userId = row.userId || this.ids;
+ const userId = this.clickUserId
getUser(userId).then(response => {
this.form = response.data;
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds);
this.$set(this.form, "roleIds", response.roleIds);
- this.detail.open = true;
this.title = "用户详情";
this.form.password = "";
+ this.detail.open = true
+ this.form.referrerPhone = this.form.referrerSysUser.phonenumber
});
},
/** 重置密码按钮操作 */
@@ -466,6 +477,13 @@ export default {
submitFileForm() {
this.$refs.upload.submit();
}
+ },
+ watch: {
+ 'detail.activeName': function (value) {
+ if (value === 'base' && !this.detail.open) {
+ this.handleUpdate()
+ }
+ }
}
};
diff --git a/src/views/system/user/profile/baseForm.vue b/src/views/system/user/profile/baseForm.vue
index 7b9a053..b885394 100644
--- a/src/views/system/user/profile/baseForm.vue
+++ b/src/views/system/user/profile/baseForm.vue
@@ -152,8 +152,10 @@ export default {
}
]
}
+
}
},
+
methods: {
// 模糊查询手机号
queryByPhone(queryString, cb) {