diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js
index df3c216..0a95455 100644
--- a/src/constant/statusMap.js
+++ b/src/constant/statusMap.js
@@ -128,5 +128,30 @@ export const indexDisplayList = [
{ value: 1, label: '展示',listClass: listClass.info},
]
+// 类型 1 个人详情页 2.IM页面 3 视频页
+export const userGiftTypeList = [
+ { value: 1, label: '个人详情页'},
+ { value: 2, label: 'IM页面'},
+ { value: 3, label: '视频页'},
+]
+
+// 类型 1-充值 2-礼物 3-守护 4-通话
+export const consumeLogTypeList = [
+ { value: 1, label: '充值'},
+ { value: 2, label: '礼物'},
+ { value: 3, label: '守护'},
+ { value: 4, label: '通话'},
+]
+
+export const consumeLogStatusList = [
+ { value: -1, label: '无须分销',listClass: listClass.info},
+ { value: 0, label: '待分销',listClass: listClass.warning},
+ { value: 1, label: '已分销',listClass: listClass.primary},
+]
+
+export const consumeLogCalculateStatusList = [
+ { value: false, label: '待计算',listClass: listClass.warning},
+ { value: true, label: '已计算',listClass: listClass.primary},
+]
diff --git a/src/views/cai/consumeLog/index.vue b/src/views/cai/consumeLog/index.vue
index 8e376c5..68ab2e6 100644
--- a/src/views/cai/consumeLog/index.vue
+++ b/src/views/cai/consumeLog/index.vue
@@ -1,230 +1,38 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
搜索
重置
@@ -232,105 +40,80 @@
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.opCreate, '{y}-{m}-{d}') }}
+
+
+
-
-
+
+
+
+
+
+
+
+ 蜜瓜号:{{scope.row.sourceUsercode}}
+ 手机号:{{scope.row.sourcePhone}}
+
+
+
+
+
+ 蜜瓜号:{{scope.row.targetUsercode}}
+ 手机号:{{scope.row.targetPhone}}
+
+
+
+
+ 费率:{{scope.row.targetRate}}
+ 金额:{{scope.row.anchorAmount}}
+
+
+
+
+ 蜜瓜号:{{scope.row.oneUsercode}}
+ 手机号:{{scope.row.onePhone}}
+
+
+
+
+ 分销:{{scope.row.oneJoin ? '参与' : '不参与'}}
+ 费率:{{scope.row.oneRate}}
+ 金额:{{scope.row.oneAmount}}
+
+
+
+
+ 蜜瓜号:{{scope.row.unionUsercode}}
+ 手机号:{{scope.row.unionPhone}}
+
+
+
+
+ 分销:{{scope.row.unionJoin ? '参与' : '不参与'}}
+ 费率:{{scope.row.unionRate}}
+ 金额:{{scope.row.unionAmount}}
+
+
+
+
+
+
+
+
+
+
修改
- 删除
+ icon="el-icon-info"
+ @click="handleInfo(scope.row)"
+ >详情
@@ -342,117 +125,18 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/cai/guardLog/index.vue b/src/views/cai/guardLog/index.vue
index eb9981a..48beda9 100644
--- a/src/views/cai/guardLog/index.vue
+++ b/src/views/cai/guardLog/index.vue
@@ -1,44 +1,36 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
@@ -48,75 +40,28 @@
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
修改
- 删除
+ size="mini"
+ type="text"
+ icon="el-icon-info"
+ @click="handleConsumerLog(scope.row)"
+ >分销记录
+
@@ -128,43 +73,16 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/cai/guardTotal/index.vue b/src/views/cai/guardTotal/index.vue
index c6eb28e..71f4919 100644
--- a/src/views/cai/guardTotal/index.vue
+++ b/src/views/cai/guardTotal/index.vue
@@ -1,36 +1,36 @@
-
-
+
+
-
+
-
+
-
+
@@ -40,74 +40,27 @@
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
+
+
+
+
+
-
+
修改
- 删除
+ size="mini"
+ type="text"
+ icon="el-icon-info"
+ @click="handleConsumerLog(scope.row)"
+ >分销记录
+
@@ -119,28 +72,6 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -151,8 +82,6 @@ export default {
name: "GuardTotal",
data() {
return {
- // 按钮loading
- buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
@@ -167,39 +96,15 @@ export default {
total: 0,
// 用户守护累计表格数据
guardTotalList: [],
- // 弹出层标题
- title: "",
- // 是否显示弹出层
- open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
- fromUserId: undefined,
- toUserId: undefined,
- guardNum: undefined,
- guardValue: undefined,
+ toUsercode: undefined,
+ toMobile: undefined,
+ fromUsercode: undefined,
+ fromMobile: undefined,
},
- // 表单参数
- form: {},
- // 表单校验
- rules: {
- id: [
- { required: true, message: "自增id不能为空", trigger: "blur" }
- ],
- fromUserId: [
- { required: true, message: "被守护人的user_id(大咖)不能为空", trigger: "blur" }
- ],
- toUserId: [
- { required: true, message: "守护人的user_id不能为空", trigger: "blur" }
- ],
- guardNum: [
- { required: true, message: "累计守护符个数不能为空", trigger: "blur" }
- ],
- guardValue: [
- { required: true, message: "守护值不能为空", trigger: "blur" }
- ],
- }
};
},
created() {
@@ -215,24 +120,6 @@ export default {
this.loading = false;
});
},
- // 取消按钮
- cancel() {
- this.open = false;
- this.reset();
- },
- // 表单重置
- reset() {
- this.form = {
- id: undefined,
- fromUserId: undefined,
- toUserId: undefined,
- guardNum: undefined,
- guardValue: undefined,
- createTime: undefined,
- updateTime: undefined
- };
- this.resetForm("form");
- },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -249,70 +136,8 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
- /** 新增按钮操作 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "添加用户守护累计";
+ handleConsumerLog(row) {
},
- /** 修改按钮操作 */
- handleUpdate(row) {
- this.loading = true;
- this.reset();
- const id = row.id || this.ids
- getGuardTotal(id).then(response => {
- this.loading = false;
- this.form = response.data;
- this.open = true;
- this.title = "修改用户守护累计";
- });
- },
- /** 提交按钮 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- this.buttonLoading = true;
- if (this.form.id != null) {
- updateGuardTotal(this.form).then(response => {
- this.$modal.msgSuccess("修改成功");
- this.open = false;
- this.getList();
- }).finally(() => {
- this.buttonLoading = false;
- });
- } else {
- addGuardTotal(this.form).then(response => {
- this.$modal.msgSuccess("新增成功");
- this.open = false;
- this.getList();
- }).finally(() => {
- this.buttonLoading = false;
- });
- }
- }
- });
- },
- /** 删除按钮操作 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('是否确认删除用户守护累计编号为"' + ids + '"的数据项？').then(() => {
- this.loading = true;
- return delGuardTotal(ids);
- }).then(() => {
- this.loading = false;
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => {
- }).finally(() => {
- this.loading = false;
- });
- },
- /** 导出按钮操作 */
- handleExport() {
- this.download('cai/guardTotal/export', {
- ...this.queryParams
- }, `guardTotal_${new Date().getTime()}.xlsx`)
- }
}
};
diff --git a/src/views/cai/userGift/index.vue b/src/views/cai/userGift/index.vue
index 09bc793..4d38edb 100644
--- a/src/views/cai/userGift/index.vue
+++ b/src/views/cai/userGift/index.vue
@@ -1,44 +1,36 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
@@ -48,124 +40,57 @@
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
修改
- 删除
+ size="mini"
+ type="text"
+ icon="el-icon-info"
+ @click="handleConsumerLog(scope.row)"
+ >分销记录
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-