提交 146bd230 作者: 毛细亚

适配关联标签

上级 cb186d22
...@@ -177,6 +177,7 @@ export default { ...@@ -177,6 +177,7 @@ export default {
}, },
methods: { methods: {
...mapMutations('user', ['set_userid', 'set_corp_id', 'set_token', 'set_cser_info', 'set_cser_id', 'set_cser_name', 'set_userInfo']), ...mapMutations('user', ['set_userid', 'set_corp_id', 'set_token', 'set_cser_info', 'set_cser_id', 'set_cser_name', 'set_userInfo']),
...mapMutations('game', ['set_accountSelect']),
// 设置缓存 // 设置缓存
cacheCorp_id(corp_id) { cacheCorp_id(corp_id) {
Cookies.set('corp_id', corp_id, { expires: 7 }) Cookies.set('corp_id', corp_id, { expires: 7 })
......
...@@ -99,3 +99,11 @@ export function getSendingCodeList(data) { ...@@ -99,3 +99,11 @@ export function getSendingCodeList(data) {
data data
}) })
} }
// 标签
export function searchTags(data) {
return request({
url: returnApi('/tag/index'),
method: 'post',
data
})
}
\ No newline at end of file
...@@ -66,9 +66,9 @@ export default { ...@@ -66,9 +66,9 @@ export default {
} }
}, },
async mounted() { async mounted() {
console.log(this.external_userid,'external_userid')
this.bindUserList() this.bindUserList()
this.requestDetails() this.requestDetails()
this.gameMemberView()
}, },
methods: { methods: {
...mapMutations('game', [ ...mapMutations('game', [
...@@ -148,7 +148,7 @@ export default { ...@@ -148,7 +148,7 @@ export default {
console.log(res.data,'1231') console.log(res.data,'1231')
this.chatUserDetails = res.data this.chatUserDetails = res.data
this.set_chatUserInfo(this.chatUserDetails) // 设置云端信息 this.set_chatUserInfo(this.chatUserDetails) // 设置云端信息
console.log(this.chatUserDetails,'1231') console.log(this.chatUserDetails,'哈哈哈')
if (this.chatUserDetails.self_defined_columns && this.chatUserDetails.self_defined_columns.length > 0) { if (this.chatUserDetails.self_defined_columns && this.chatUserDetails.self_defined_columns.length > 0) {
this.memberCheckList = this.memberCheckList =
this.chatUserDetails.self_defined_columns.map( this.chatUserDetails.self_defined_columns.map(
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
:lock-scroll="true" :lock-scroll="true"
:title="title" :title="title"
:visible="show" :visible="show"
size="450px" size="320px"
@close="close" @close="close"
> >
<div> <div>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<span></span> <span></span>
<el-button <el-button
type="primary" type="primary"
size="small"
@click="showApplyGift = true" @click="showApplyGift = true"
>礼包申请</el-button> >礼包申请</el-button>
</div> </div>
...@@ -240,7 +241,6 @@ ...@@ -240,7 +241,6 @@
v-if="showApplyGift" v-if="showApplyGift"
:show.sync="showApplyGift" :show.sync="showApplyGift"
title="礼包申请" title="礼包申请"
width="25%"
@requestData="requestData" @requestData="requestData"
/> />
</div> </div>
...@@ -428,7 +428,7 @@ ...@@ -428,7 +428,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.detailsGiftApply { .detailsGiftApply {
width: 100%; width: 100%;
height: calc(100vh - 60px); height: calc(100vh - 160px);
background: #fff; background: #fff;
position: relative; position: relative;
overflow-y: hidden; overflow-y: hidden;
......
<template> <template>
<!-- 单日累充 分 积分开和积分关两种情况 --> <!-- 单日累充 分 积分开和积分关两种情况 -->
<el-drawer :lock-scroll="true" :title="title" :visible="show" size="540px" :modal="false" :modal-append-to-body="false" class="giftDetails" @close="close"> <el-drawer :lock-scroll="true" :title="title" :visible="show" size="320px" :modal="false" :modal-append-to-body="false" class="giftDetails" @close="close">
<div class="content"> <div class="content">
<div class="giftDetailsText"> <div class="giftDetailsText">
<div class="activeItem rowFlex"> <div class="activeItem rowFlex">
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
</div> </div>
<span class="dialog-footer rowFlex"> <span class="dialog-footer rowFlex">
<el-button :disabled="requestLoading" class="btn" type="primary" @click="submit">确 定</el-button> <el-button :disabled="requestLoading" size="small" class="btn" type="primary" @click="submit">确 定</el-button>
<el-button class="btn" @click="close">取 消</el-button> <el-button class="btn" size="small" @click="close">取 消</el-button>
</span> </span>
<!-- 确认弹窗 --> <!-- 确认弹窗 -->
<confirmLayer v-if="showConfirmLayer" :remark="remark" :active-info="[activeInfo]" :show.sync="showConfirmLayer" title="请核对申请奖品信息" @close="close" /> <confirmLayer v-if="showConfirmLayer" :remark="remark" :active-info="[activeInfo]" :show.sync="showConfirmLayer" title="请核对申请奖品信息" @close="close" />
...@@ -246,7 +246,7 @@ export default { ...@@ -246,7 +246,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.giftDetails { .giftDetails {
position: fixed; position: fixed;
right: 450px; right: 0px;
top: 0; top: 0;
box-shadow: 0px 9px 28px 0px rgba(0, 0, 0, 0.05); box-shadow: 0px 9px 28px 0px rgba(0, 0, 0, 0.05);
.icon{ .icon{
......
<template> <template>
<!-- 角色累充 --> <!-- 角色累充 -->
<el-drawer :lock-scroll="true" :title="title" :visible="show" size="540px" :modal="false" :modal-append-to-body="false" class="giftDetails" @close="close"> <el-drawer :lock-scroll="true" :title="title" :visible="show" size="320px" :modal="false" :modal-append-to-body="false" class="giftDetails" @close="close">
<div class="content"> <div class="content">
<div v-for="(item,index) in activeInfo" :key="index" class="list"> <div v-for="(item,index) in activeInfo" :key="index" class="list">
<div class="giftDetailsText"> <div class="giftDetailsText">
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
</div> </div>
</div> </div>
<span class="dialog-footer rowFlex"> <span class="dialog-footer rowFlex">
<el-button class="btn" :disabled="requestLoading" type="primary" :loading='btnLoading' @click="submit">确 定</el-button> <el-button class="btn" :disabled="requestLoading" type="primary" size="small" :loading='btnLoading' @click="submit">确 定</el-button>
<el-button class="btn" @click="close">取 消</el-button> <el-button size="small" class="btn" @click="close">取 消</el-button>
</span> </span>
<!-- 确认弹窗 --> <!-- 确认弹窗 -->
<confirmLayer :is-submit="isSubmit" :remark="remark" :active-info="activeInfo" :show.sync="showConfirmLayer" title="请核对申请奖品信息" @close="close" /> <confirmLayer :is-submit="isSubmit" :remark="remark" :active-info="activeInfo" :show.sync="showConfirmLayer" title="请核对申请奖品信息" @close="close" />
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.giftDetails { .giftDetails {
position: fixed; position: fixed;
right: 450px; right: 0px;
top: 0; top: 0;
box-shadow: 0px 9px 28px 0px rgba(0, 0, 0, 0.05); box-shadow: 0px 9px 28px 0px rgba(0, 0, 0, 0.05);
.icon{ .icon{
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-drawer :lock-scroll="true" <el-drawer :lock-scroll="true"
:title="title" :title="title"
:visible="show" :visible="show"
size="540px" size="320px"
:modal="false" :modal="false"
:modal-append-to-body="false" :modal-append-to-body="false"
class="giftDetails" class="giftDetails"
...@@ -232,12 +232,14 @@ ...@@ -232,12 +232,14 @@
<el-button <el-button
class="btn" class="btn"
type="primary" type="primary"
size="small"
:disabled="requestLoading" :disabled="requestLoading"
@click="submit" @click="submit"
:loading="btnLoading" :loading="btnLoading"
>确 定</el-button> >确 定</el-button>
<el-button <el-button
class="btn" class="btn"
size="small"
@click="close" @click="close"
>取 消</el-button> >取 消</el-button>
</span> </span>
...@@ -426,7 +428,7 @@ export default { ...@@ -426,7 +428,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.giftDetails { .giftDetails {
position: fixed; position: fixed;
right: 450px; right: 0px;
top: 0; top: 0;
box-shadow: 0px 9px 28px 0px rgba(0, 0, 0, 0.05); box-shadow: 0px 9px 28px 0px rgba(0, 0, 0, 0.05);
.icon { .icon {
......
...@@ -93,7 +93,7 @@ import Clipboard from 'clipboard' ...@@ -93,7 +93,7 @@ import Clipboard from 'clipboard'
<style lang="scss" scoped> <style lang="scss" scoped>
.wx-gift-container { .wx-gift-container {
height: calc(100vh - 160px); height: calc(100vh - 200px);
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
......
...@@ -10,24 +10,16 @@ ...@@ -10,24 +10,16 @@
<p>②不能以任何形式推送APP/网页链接,也不可承认有APP/网页端口!!</p> <p>②不能以任何形式推送APP/网页链接,也不可承认有APP/网页端口!!</p>
</div> </div>
<div <div
v-if="change_appraisal && false" v-if="change_appraisal"
style=" class="warnText"
font-size: 12px;
color: red;
text-align: center;
"
> >
钓鱼号 禁止转端通知组长! <p> 钓鱼号 禁止转端通知组长!</p>
</div> </div>
<div <div
v-else-if="gameUserInfo.exp_ip" v-else-if="gameUserInfo.exp_ip"
style=" class="warnText"
font-size: 12px;
color: red;
text-align: center;
"
> >
高风险用户,禁止转端 !!! <p>高风险用户,禁止转端 !!!</p>
</div> </div>
<div class="cser_name"> <div class="cser_name">
<span>当前客服:{{ cser_name }}</span> <span>当前客服:{{ cser_name }}</span>
...@@ -133,8 +125,7 @@ ...@@ -133,8 +125,7 @@
/> />
<!-- 游戏标签 --> <!-- 游戏标签 -->
<!-- <div <div
v-else-if="messageSource === 'company_work' && workerRouter !== 'novel'"
class="item rowFlex columnCenter spaceBetween tagsLost" class="item rowFlex columnCenter spaceBetween tagsLost"
> >
<div class="rowFlex"> <div class="rowFlex">
...@@ -159,13 +150,9 @@ ...@@ -159,13 +150,9 @@
</div> </div>
</div> </div>
</div> </div>
<svg-icon <i class="el-icon-edit icon" style="font-size: 14px;margin-right: 10px;"
icon-class="edit" @click="editTags"></i>
class="icon" </div>
style="font-size: 14px"
@click="editTags"
/>
</div> -->
<!-- 共享信息 --> <!-- 共享信息 -->
<shareInfo :chat-user-details="chatUserDetails" /> <shareInfo :chat-user-details="chatUserDetails" />
</div> </div>
...@@ -178,6 +165,14 @@ ...@@ -178,6 +165,14 @@
title="修改手机号" title="修改手机号"
width="350px" width="350px"
/> />
<!-- 修改标签 -->
<selectTag
v-if="showTag"
:show.sync="showTag"
:checkbox="true"
:check-list="chatUserDetails.tag_group || []"
@submit="selectTags"
/>
</div> </div>
</template> </template>
<script> <script>
...@@ -188,12 +183,14 @@ import changePhone from './changePhone.vue' ...@@ -188,12 +183,14 @@ import changePhone from './changePhone.vue'
import watchMember from '@/mixins/watchMember' import watchMember from '@/mixins/watchMember'
import { autoResetPassword,bindUserSelfAdd } from '@/api/game' import { autoResetPassword,bindUserSelfAdd } from '@/api/game'
import { memberBindCser,editUser,zyouUnBind } from '@/api/works' import { memberBindCser,editUser,zyouUnBind } from '@/api/works'
import selectTag from '@/components/selectTag.vue'
export default { export default {
name: 'UserDetailsPanel', name: 'UserDetailsPanel',
components: { components: {
gameDetails, gameDetails,
changePhone, changePhone,
shareInfo shareInfo,
selectTag
}, },
props: { props: {
// 用户详情 // 用户详情
...@@ -212,7 +209,8 @@ import watchMember from '@/mixins/watchMember' ...@@ -212,7 +209,8 @@ import watchMember from '@/mixins/watchMember'
showInput: false, showInput: false,
showInputValue: '', showInputValue: '',
inputIndex: -1, inputIndex: -1,
changePhone:false changePhone:false,
showTag:false
} }
}, },
computed: { computed: {
...@@ -376,12 +374,35 @@ import watchMember from '@/mixins/watchMember' ...@@ -376,12 +374,35 @@ import watchMember from '@/mixins/watchMember'
}, },
// 编辑标签 // 编辑标签
editTags() { editTags() {
this.$emit('edit-tags') this.showTag = true
}, },
// 处理评估变更 // 处理评估变更
changeAppraisal(val) { changeAppraisal(val) {
this.change_appraisal = val this.change_appraisal = val
},
// 选择的标签
selectTags(data, is_tag_sync) {
this.chatUserDetails.tag_group = data
const params = {
userid: this.chatUserDetails.userid,
external_userid: this.chatUserDetails.external_userid,
remark: this.chatUserDetails.remark,
is_tag_sync: is_tag_sync,
self_defined_columns: this.chatUserDetails.self_defined_columns,
tag_group: this.chatUserDetails.tag_group
}
this.editUserInfo(params)
},
editUserInfo(data) {
editUser(data).then((res) => {
if (res.status_code == 1) {
this.$message({
type: 'success',
message: res.msg
})
} }
})
},
} }
} }
</script> </script>
......
...@@ -18,13 +18,12 @@ export default { ...@@ -18,13 +18,12 @@ export default {
} }
}, },
computed:{ computed:{
...mapState('user',['chatUserInfo']), ...mapState('game',['chatUserInfo']),
}, },
created(){ created(){
// 初始化 vuex 中的值 // 初始化 vuex 中的值
}, },
methods:{ methods:{
...mapMutations('game',['set_chatUserInfo']),
} }
} }
</script> </script>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论