-
-
-
+
+
+
+
+
搜索
- 重置
+ 重置
- 展开
- 收起
-
+
@@ -44,7 +43,7 @@
手机号
用户ID
-
+
@@ -89,7 +88,7 @@
-
+
@@ -117,42 +116,42 @@
-
+
-
+
搜索
- 重置
+ 重置
展开
收起
-
+
-
-
-
-
-
-
-
-
-
-
- 创建用户
- 发送图文消息
- 批量设置分组
- 批量设置标签
- 批量设置分销员
- 发送优惠券
- 导出列表
-
-
-
- 选中本页
- 选中全部
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -218,18 +217,18 @@
-
-
- {{row.is_svip > 0 ? "是" : "否"}}
-
-
+
+
+
+
+
-
-
- {{ row.member?row.member.brokerage_name:'-' }}
-
-
-
+
+
+
+
+
+
{{ row.group?row.group.group_name:'无' }}
@@ -239,13 +238,18 @@
{{ row.spread ? row.spread.nickname + ' / ' + row.spread.uid : '-' }}
-
-
- {{ row.user_type === 'routine' ? '小程序' : row.user_type === 'wechat' ? '公众号' : row.user_type === 'app' || row.user_type === 'App' ? 'App' : row.user_type === 'pc' ? 'PC' : 'H5' }}
-
+
+
+ {{ row.is_lottery ? '是' : '否' }}
+
-
-
+
+
+
+
+
+
+
详情
@@ -257,15 +261,15 @@
- 设置余额
- 设置积分
- 清除等级
- 设置分组
- 设置标签
+
+
+
+ 设置用户等级
+
修改推荐人
- 修改密码
- 编辑会员等级
- 付费会员设置
+
+
+
@@ -283,8 +287,8 @@
-
+
@@ -439,7 +443,6 @@ export default {
multipleSelection: [],
ids: '',
wechatIds: '',
- uid: '',
labelPosition: 'right',
userProps: {
children: 'children',
@@ -466,7 +469,8 @@ export default {
limit: 20,
group_id: '',
fields_type: '',
- fields_value: ''
+ fields_value: '',
+ is_lottery: ''
},
address: [],
grid: {
@@ -582,7 +586,7 @@ export default {
} else if (index > -1) {
this.checkedPage.splice(index, 1)
}
-
+
this.syncCheckedId()
},
syncCheckedId() {
@@ -651,7 +655,7 @@ export default {
if (lebData.export.length) {
data = data.concat(lebData.export)
excelData.page++
- }
+ }
}
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
return
@@ -671,7 +675,7 @@ export default {
let label_id = this.userFrom.label_id == '' ? '' : this.getLabelValue(),
user_type = this.findKey(this.userFrom.user_type,{'':'','微信用户':'wechat','小程序用户':'routine','H5用户':'h5'}),
sex = this.findKey(this.userFrom.sex,{'男':'1','女':'2','保密':'0','':''}),
- pay_count = this.findKey(this.userFrom.sex,{'0次':'-1','1次以上':'0','2次以上':'1','3次以上':'2','4次以上':'3','5次以上':'4','': ''}),
+ pay_count = this.findKey(this.userFrom.sex,{'0次':'-1','1次以上':'0','2次以上':'1','3次以上':'2','4次以上':'3','5次以上':'4','': ''}),
is_promoter = this.findKey(this.userFrom.is_promoter,{'推广员':'1','普通用户':'0','':''}),
user_time_type = this.userFrom.user_time_type == 'visit' ? '最后访问' : this.userFrom.user_time_type == 'add_time' ? '首次访问' : ''
this.couponForm = {
@@ -766,7 +770,7 @@ export default {
this.drawer = true
this.uid = id
this.cancel_time = this.tableData.data.find(item => item.uid === id).cancel_time
- this.$refs.userDetails.getData(id,false,true);
+ this.$refs.userDetails.getData(id,false,true);
},
closeDrawer() {
this.drawer = false
@@ -779,7 +783,7 @@ export default {
if (this.checkedIds.length === 0 && this.allCheck == false) return this.$message.warning('请先选择用户')
this.visible = true
this.wechatIds = this.getWechatUsers(this.tableData.data, this.checkedIds)
-
+
},
handleClose() {
this.visible = false
@@ -792,7 +796,7 @@ export default {
if(arr1[i]['wechat_user_id']){
newArr.push(arr1[i]['wechat_user_id']);
}
- }
+ }
}else{
for (let i = 0; i < arr1.length; i++) {
for (let j = 0; j < arr2.length; j++) {
@@ -849,7 +853,7 @@ export default {
this.$modalForm(changeMemberApi(row.uid)).then(() => this.changeSearch())
},
// 赠送付费会员
- giveMember(row) {
+ giveMember(row) {
this.$modalForm(giveMemberApi(row.uid)).then(() => this.changeSearch())
},
// 修改推荐人
@@ -867,7 +871,7 @@ export default {
this.$modalForm(changeNowMoneyApi(row.uid)).then(() => this.changeSearch())
},
// 修改积分余额
- changeIntegral(row){
+ changeIntegral(row){
this.$modalForm(changeNowIntegralApi(row.uid)).then(() => this.changeSearch())
},
// 列表
@@ -940,7 +944,7 @@ export default {
color: #00a2d4;
}
.dia ::v-deep .el-dialog__body {
- height: 700px !important;
+ height: 700px !important;
}
.text-right {
text-align: right;
diff --git a/view/admin/src/views/user/list/userDetails.vue b/view/admin/src/views/user/list/userDetails.vue
index 6d1c85c..c2aaf55 100644
--- a/view/admin/src/views/user/list/userDetails.vue
+++ b/view/admin/src/views/user/list/userDetails.vue
@@ -5,7 +5,7 @@
:size="1000"
:visible.sync="drawer"
:direction="direction"
- :before-close="handleClose"
+ :before-close="handleClose"
>
@@ -19,7 +19,7 @@
-
+
完成
-
-
-
- 设置积分
- 设置余额
- 设置分组
- 设置标签
- 修改推荐人
- 修改密码
- 编辑会员等级
- 付费会员设置
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -120,30 +116,30 @@
用户概况
- -
-
推广员：
- {{psInfo.is_promoter == 1 ? '是' : '否'}}
-
- -
-
用户状态：
- {{psInfo.status == 1 ? '开启' : '关闭'}}
-
- -
-
用户等级：
- {{psInfo.member_level}}
-
- -
-
用户标签：
-
-
- {{item.label_name}}
-
-
-
- -
-
用户分组：
- {{psInfo.group && psInfo.group.group_name || '无'}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
推广人：
{{psInfo.spread && psInfo.spread.nickname || '无'}}
@@ -156,21 +152,21 @@
登录时间：
{{psInfo.last_time}}
- -
-
会员到期时间：
- {{psInfo.svip_endtime}}
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-->
-
-
用户概况
-
-
-
-
-
-
-
-
-
-
-
- 全部
-
-
-
-
-
-
-
- 全部
-
-
-
-
-
-
-
-
- 开启
- 关闭
-
-
-
-
-
-
- 开启
- 关闭
-
-
-
-
用户备注
@@ -359,7 +355,7 @@
v-model="item.value"
:placeholder="item.msg"
class="selWidth"
- />
+ />
+ />
+ />
+ />
+ />
@@ -420,13 +416,13 @@
v-model="item.value"
:placeholder="item.msg"
class="selWidth"
- />
+ />
-
-
+
+
@@ -451,8 +447,8 @@
-
-
+
+
-
-
- +{{scope.row.number}}
- -{{scope.row.number}}
-
-
- 已解冻
- 冻结中
-
-
- {{scope.row[item.key]}}
-
-
@@ -488,108 +471,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +{{scope.row[item.key]}}
- -{{scope.row[item.key]}}
-
- {{scope.row[item.key]}}
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
{{scope.row.spu&&scope.row.spu.store_name}}
-
// +----------------------------------------------------------------------
-import { userOrderApi, userDetailApi, userCouponApi, userBillApi,
+import { userOrderApi, userDetailApi, userCouponApi, userBillApi,assetsLogList,
modifyUserRefLog, userPointsApi, userSignLogApi, userHistoryApi, memberGrowthLog, userEditApi } from '@/api/user'
import { verifyEmail } from '@/utils/toolsValidate';
export default {
@@ -749,7 +624,7 @@ export default {
}
},
mounted() {
-
+
},
beforeUpdate(){
this.$nextTick(() =>{
@@ -816,23 +691,24 @@ export default {
this.loading = false
})
break
- case 'recommend':
- modifyUserRefLog(this.uid, this.tableFrom).then(res => {
+ case 'integral':
+ let data = {'uid':this.uid,asset_type:1,page:this.tableFrom.page, limit:this.tableFrom.limit}
+ assetsLogList(data).then(res => {
this.tableData.data = res.data.list
this.tableData.total = res.data.count
this.columns = [
{
- title: '上级推荐人ID',
- key: 'spread.uid',
+ title: '分值来源',
+ key: 'type',
minWidth: 120
},
{
- title: '上级推荐人昵称',
- key: 'spread.nickname',
+ title: '变动情况',
+ key: 'count',
minWidth: 120
},
{
- title: '绑定时间',
+ title: '变动时间',
key: 'create_time',
minWidth: 120
}
@@ -842,239 +718,97 @@ export default {
this.loading = false
})
break
- case 'signRecord':
- userSignLogApi(this.uid, this.tableFrom).then(res => {
- this.tableData.data = res.data.list
- this.tableData.total = res.data.count
- this.columns = [
- {
- title: '获得积分',
- key: 'number',
- minWidth: 120
- },
- {
- title: '签到时间',
- key: 'create_time',
- minWidth: 120
- },
- {
- title: '备注',
- key: 'title',
- minWidth: 120
- },
-
- ]
- this.loading = false
- }).catch(() => {
- this.loading = false
- })
- break
- case 'coupon':
- userCouponApi(this.uid, this.tableFrom).then(res => {
- this.tableData.data = res.data.list
- this.tableData.total = res.data.count
- this.columns = [
- {
- title: '优惠券名称',
- key: 'coupon_title',
- minWidth: 120
- },
- {
- title: '面值',
- key: 'coupon_price',
- minWidth: 120
- },
- {
- title: '最低消费额',
- key: 'use_min_price',
- minWidth: 120
- },
- {
- title: '兑换时间',
- key: 'use_time',
- minWidth: 120
- }
- ]
- this.loading = false
- }).catch(() => {
- this.loading = false
- })
- break
- case 'balance':
- userBillApi(this.uid, this.tableFrom).then(res => {
- this.tableData.data = res.data.list
- this.tableData.total = res.data.count
- this.columns = [
- {
- title: '变动金额',
- key: 'number',
- minWidth: 90
- },
- {
- title: '变动后',
- key: 'balance',
- minWidth: 90
- },
- {
- title: '类型',
- key: 'title',
- minWidth: 100
- },
- {
- title: '创建时间',
- key: 'create_time',
- minWidth: 150
- },
- {
- title: '备注',
- key: 'mark',
- minWidth: 200
- }
- ]
- this.loading = false
- }).catch(() => {
- this.loading = false
- })
- break
- case 'growth':
- this.tableFrom.uid = this.uid
- memberGrowthLog(this.tableFrom).then(res => {
- this.tableData.data = res.data.list
- this.tableData.total = res.data.count
- this.columns = [
- {
- title: '成长值来源',
- key: 'title',
- minWidth: 90
- },
- {
- title: '成长值变化',
- key: 'number',
- minWidth: 90
- },
- {
- title: '变化后成长值',
- key: 'balance',
- minWidth: 100
- },
- {
- title: '日期',
- key: 'create_time',
- minWidth: 150
- },
- {
- title: '备注',
- key: 'mark',
- minWidth: 200
- }
- ]
- this.loading = false
- }).catch(() => {
- this.loading = false
- })
- break
- case 'detailed':
- userPointsApi(this.uid, this.tableFrom).then(res => {
- this.tableData.data = res.data.list
- this.tableData.total = res.data.count
- this.columns = [
- {
- title: '来源/用途',
- key: 'title',
- minWidth: 90
- },
- {
- title: '积分变化',
- key: 'number',
- minWidth: 90
- },
- {
- title: '状态',
- key: 'status',
- minWidth: 90
- },
- {
- title: '当前有效积分',
- key: 'balance',
- minWidth: 100
- },
- {
- title: '日期',
- key: 'create_time',
- minWidth: 150
- },
- {
- title: '备注',
- key: 'mark',
- minWidth: 200
- }
- ]
- this.loading = false
- }).catch(() => {
- this.loading = false
- })
- break
- case 'footsteps':
- userHistoryApi(this.uid, this.tableFrom).then(res => {
- this.tableData.data = res.data.list
- this.tableData.total = res.data.count
- this.columns = [
- {
- title: '商品信息',
- key: 'image',
- minWidth: 200
- },
- {
- title: '价格',
- key: 'price',
- minWidth: 50
- },
- {
- title: '浏览时间',
- key: 'create_time',
- minWidth: 50
- }
- ]
- this.loading = false
- }).catch(() => {
- this.loading = false
- })
- break
- default:
- userBillApi(this.uid, this.tableFrom).then(res => {
- this.tableData.data = res.data.list
- this.tableData.total = res.data.count
- this.columns = [
- {
- title: '变动金额',
- key: 'number',
- minWidth: 90
- },
- {
- title: '变动后',
- key: 'balance',
- minWidth: 90
- },
- {
- title: '类型',
- key: 'title',
- minWidth: 100
- },
- {
- title: '创建时间',
- key: 'create_time',
- minWidth: 150
- },
- {
- title: '备注',
- key: 'mark',
- minWidth: 200
- }
- ]
- this.loading = false
- }).catch(() => {
- this.loading = false
- })
+
+ case 'diamond':
+ data = {'uid':this.uid,asset_type:2,page:this.tableFrom.page, limit:this.tableFrom.limit}
+ assetsLogList(data).then(res => {
+ this.tableData.data = res.data.list
+ this.tableData.total = res.data.count
+ this.columns = [
+ {
+ title: '分值来源',
+ key: 'type',
+ minWidth: 120
+ },
+ {
+ title: '变动情况',
+ key: 'count',
+ minWidth: 120
+ },
+ {
+ title: '变动时间',
+ key: 'create_time',
+ minWidth: 120
+ }
+ ]
+ this.loading = false
+ }).catch(() => {
+ this.loading = false
+ })
+ break
+ case 'stock':
+ data = {'uid':this.uid,asset_type:3,page:this.tableFrom.page, limit:this.tableFrom.limit}
+ assetsLogList(data).then(res => {
+ console.log(res);
+ this.tableData.data = res.data.list
+ this.tableData.total = res.data.count
+ this.columns = [
+ {
+ title: '分值来源',
+ key: 'type',
+ minWidth: 120
+ },
+ {
+ title: '变动情况',
+ key: 'count',
+ minWidth: 120
+ },
+ {
+ title: '变动时间',
+ key: 'create_time',
+ minWidth: 120
+ }
+ ]
+ this.loading = false
+ }).catch(() => {
+ this.loading = false
+ })
+ break
+ default:
+ userBillApi(this.uid, this.tableFrom).then(res => {
+ this.tableData.data = res.data.list
+ this.tableData.total = res.data.count
+ this.columns = [
+ {
+ title: '变动金额',
+ key: 'number',
+ minWidth: 90
+ },
+ {
+ title: '变动后',
+ key: 'balance',
+ minWidth: 90
+ },
+ {
+ title: '类型',
+ key: 'title',
+ minWidth: 100
+ },
+ {
+ title: '创建时间',
+ key: 'create_time',
+ minWidth: 150
+ },
+ {
+ title: '备注',
+ key: 'mark',
+ minWidth: 200
+ }
+ ]
+ this.loading = false
+ }).catch(() => {
+ this.loading = false
+ })
}
},
handleClose() {
@@ -1165,7 +899,7 @@ export default {
this.$emit('setMember',{uid: this.uid});
} else if (command == 'svipSet') {
this.$emit('giveMember',{uid: this.uid});
- }
+ }
},
pageChange(page) {
this.tableFrom.page = page
@@ -1284,7 +1018,7 @@ export default {
margin-right: 7px;
}
.svip{
-
+
.svip-img{
width: 40px;
height: 15px;