diff --git a/src/views/shop/shop_configuration.vue b/src/views/shop/shop_configuration.vue
index 9c55bec..3d30106 100644
--- a/src/views/shop/shop_configuration.vue
+++ b/src/views/shop/shop_configuration.vue
@@ -6,7 +6,7 @@
-
+
@@ -35,6 +35,7 @@ export default {
data() {
return {
activeName: '1',
+ shopId:localStorage.getItem('shopId')
}
}
}
diff --git a/src/views/user_manage/user_list.vue b/src/views/user_manage/user_list.vue
index 6b4dd04..6ffc365 100644
--- a/src/views/user_manage/user_list.vue
+++ b/src/views/user_manage/user_list.vue
@@ -72,9 +72,21 @@
否
-
+
+
+
+ {{ scope.row.amount }}
+
+
+
-
+
+
+
+ {{ scope.row.orderNumber }}
+
+
+
@@ -159,8 +171,8 @@
- 充值
- 消费退款
+ {{ userinfo.operationType == 'in' ? '充值' : '消费' }}
+ {{ userinfo.operationType == 'in' ? '消费退款' : '充值退款' }}
@@ -169,6 +181,13 @@
确 定
+
+
+
+
+
@@ -197,6 +216,7 @@ export default {
},
dialogVisible: false,
dialogVisibleedit: false,
+ moneyvisible: false,
userinfo: {
nickName: '',
operationType: 'in',
@@ -222,6 +242,17 @@ export default {
this.getShopInfo();
},
methods: {
+ moneyevent(d) {
+ this.moneyvisible = true
+ },
+ orderNumberevent(d) {
+ this.$router.push({
+ path: '/order_manage/order_list',
+ query: {
+ id: d.id
+ }
+ })
+ },
checkIfNum() {
this.userinfos.telephone = this.userinfos.telephone.toString().replace(/\D/g, '');
},