Skip to content

C
company_app
提交 fccbd2cb 作者: 毛细亚
操作

合并分支 '6.3' 到 'release' 

6.3

查看合并请求 !11
上级 114871d3 8fa1cd1f
正在显示 包含 241 行增加 和 176 行删除
company_app/index.html
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.b6398f5b.js"></script><script defer="defer" src="static/js/app.2b8991ee.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.3be39905.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!DOCTYPE html>
\ No newline at end of file <html lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="favicon.ico">
<!-- HTTP 1.1 -->
<meta http-equiv="pragma" content="no-cache">
<!-- HTTP 1.0 -->
<meta http-equiv="cache-control" content="no-cache">
<!-- Prevent caching at the proxy server -->
<meta http-equiv="expires" content="0">
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
<title>company_app</title>
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,shrink-to-fit=no,user-scalable=no"> -->
<script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>
<script defer src="static/js/chunk-vendors.js"></script><script defer src="static/js/app.js"></script></head>
<body>
<noscript>
<strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
</body>
</html>
src/App.vue
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
// 监听用户信息变化，只在初始化时获取一次任务数据 // 监听用户信息变化，只在初始化时获取一次任务数据
userInfo: { userInfo: {
handler(newVal, oldVal) { handler(newVal, oldVal) {
if (newVal && newVal.id && (!oldVal || !oldVal.id)) { if (newVal && newVal.id && (!oldVal || !oldVal.id) && this.token) {
console.log('用户信息初始化完成，获取任务数据:', newVal) console.log('用户信息初始化完成，获取任务数据:', newVal)
// 只在用户信息第一次设置时获取任务数据 // 只在用户信息第一次设置时获取任务数据
this.getTaskUnReadData() this.getTaskUnReadData()
...@@ -178,7 +178,6 @@ export default { ...@@ -178,7 +178,6 @@ export default {
} }
}, },
mounted() { mounted() {
this.initVuexValue()
// 页面刷新时从 Cookie 恢复 token 到 store // 页面刷新时从 Cookie 恢复 token 到 store
const cookieToken = Cookies.get('token') const cookieToken = Cookies.get('token')
if (cookieToken && !this.token) { if (cookieToken && !this.token) {
...@@ -196,12 +195,11 @@ export default { ...@@ -196,12 +195,11 @@ export default {
// 监听窗口大小变化 // 监听窗口大小变化
window.addEventListener('resize', this.handleResize) window.addEventListener('resize', this.handleResize)
// 初始检查 // 初始检查
this.$nextTick(() => { this.$nextTick(() => {
this.checkMenuOverflow() this.checkMenuOverflow()
this.initVuexValue()
}) })
this.initVuexValue()
}, },
beforeDestroy() { beforeDestroy() {
window.removeEventListener('resize', this.handleResize) window.removeEventListener('resize', this.handleResize)
......
src/api/skill.js
...@@ -398,3 +398,19 @@ export function markUseful(data) { ...@@ -398,3 +398,19 @@ export function markUseful(data) {
data data
}) })
} }
// 跨主体分组列表
export function cross_corp_robot_knowledge_group_index(data) {
return request({
url: returnApi('/corp_cross_knowledge_group/index'),
method: 'post',
data
})
}
// 跨主体知识库分组列表
export function cross_corp_robot_knowledge_group_getList(data) {
return request({
url: returnApi('/corp_cross_knowledge_base/getList'),
method: 'post',
data
})
}
\ No newline at end of file
src/api/user.js
...@@ -125,6 +125,20 @@ export function getClientStatus(data) { ...@@ -125,6 +125,20 @@ export function getClientStatus(data) {
data data
}) })
} }
// 获取客服号绑定的客服人员
export function getUserList(data) {
return request({
url: '/api/corp/getCserByUser',
method: 'post',
data
})
}
// 选择客服人员登录
export function cserSelected(data) {
return request({
url: '/api/sidebar_login/cserSelected',
method: 'post',
data
})
}
src/router/index.js
...@@ -86,7 +86,7 @@ const routes = [ ...@@ -86,7 +86,7 @@ const routes = [
{ {
path: '/login', path: '/login',
name: 'login', name: 'login',
component: () => import('../views/login.vue') component: () => import('../views/newLogin.vue')
}, },
] ]
const router = new VueRouter({ const router = new VueRouter({
......
src/views/components/giftRecord/giftDetails/oneDay.vue
...@@ -44,73 +44,75 @@ ...@@ -44,73 +44,75 @@
</div> </div>
</div> </div>
<div class="activeList"> <div class="activeList">
<div v-for="(item,index) in giftInfo.rule.level_attribute" :key="index"> <div v-if=" giftInfo.rule && giftInfo.rule.level_attribute && giftInfo.rule.level_attribute.length > 0">
<div class="activeListItem"> <div v-for="(item,index) in giftInfo.rule.level_attribute" :key="index">
<div class="activeListItemTitle rowFlex spaceBetween columnCenter"> <div class="activeListItem">
<p class="title">{{ item.prize_level_name }}</p> <div class="activeListItemTitle rowFlex spaceBetween columnCenter">
<div class="rowFlex handle columnCenter"> <p class="title">{{ item.prize_level_name }}</p>
<p>{{ item.compare_amount + '积分' }}</p> <div class="rowFlex handle columnCenter">
<el-input-number <p>{{ item.compare_amount + '积分' }}</p>
v-model="item.apply_num" <el-input-number
class="inputNumber" v-model="item.apply_num"
size="mini" class="inputNumber"
:max="activeInfo.exchange_score_status == 2 ? 1 : 999" size="mini"
:min="0" :max="activeInfo.exchange_score_status == 2 ? 1 : 999"
@change="packNumChange(index)" :min="0"
></el-input-number> @change="packNumChange(index)"
></el-input-number>
<i v-if="!item.showContent" class="el-icon-arrow-down icon" @click="openPrizeItem(item,index,true)"></i> <i v-if="!item.showContent" class="el-icon-arrow-down icon" @click="openPrizeItem(item,index,true)"></i>
<i v-else class="el-icon-arrow-right icon" @click="openPrizeItem(item,index,false)"></i> <i v-else class="el-icon-arrow-right icon" @click="openPrizeItem(item,index,false)"></i>
</div>
</div> </div>
</div> <el-collapse-transition>
<el-collapse-transition> <div v-if="!item.showContent" class="activeListItemContent">
<div v-if="!item.showContent" class="activeListItemContent"> <div v-if="item.prize_default.length>0" class="activeListItemTitle">
<div v-if="item.prize_default.length>0" class="activeListItemTitle"> <div class="title">固定奖 * {{ item.apply_num ? item.apply_num : 0 }}</div>
<div class="title">固定奖 * {{ item.apply_num ? item.apply_num : 0 }}</div> <div class="handle">
<div class="handle"> <div
<div v-for="(trem, mark) in item.prize_default"
v-for="(trem, mark) in item.prize_default" :key="mark"
:key="mark" >
> {{ trem.name }}
{{ trem.name }} {{ trem.id }}
{{ trem.id }} </div>
</div> </div>
</div> </div>
</div> <div v-if="item.prize_auto.length > 0" class="activeListItemTitle">
<div v-if="item.prize_auto.length > 0" class="activeListItemTitle"> <div class="title">自选奖 （{{ item.prize_auto.length + '选' + item.prize_auto_num }} ） * {{ item.apply_num ? item.apply_num : 0 * item.prize_auto_num }}</div>
<div class="title">自选奖 （{{ item.prize_auto.length + '选' + item.prize_auto_num }} ） * {{ item.apply_num ? item.apply_num : 0 * item.prize_auto_num }}</div> </div>
</div> <!-- 自选奖 -->
<!-- 自选奖 --> <div v-for="(trem, mark) in item.prize_auto" :key="mark" class="activeListItemTitle rowFlex spaceBetween columnCenter">
<div v-for="(trem, mark) in item.prize_auto" :key="mark" class="activeListItemTitle rowFlex spaceBetween columnCenter"> <div>
<div> <div
<div v-for="(entry, sign) in trem.group"
v-for="(entry, sign) in trem.group" :key="sign"
:key="sign" >
> <div>
<div> {{ entry.name }}
{{ entry.name }} </div>
</div> </div>
</div> </div>
</div>
<div class="rowFlex handle columnCenter" style="margin-right:23px;"> <div class="rowFlex handle columnCenter" style="margin-right:23px;">
<el-input-number <el-input-number
v-model="trem.apply_num" v-model="trem.apply_num"
size="mini" size="mini"
:max="item.exchange_score_status == 2 ? 1 : item.residuePackNum || item.residuePackNum === 0 ? item.residuePackNum + trem.apply_num : 0" :max="item.exchange_score_status == 2 ? 1 : item.residuePackNum || item.residuePackNum === 0 ? item.residuePackNum + trem.apply_num : 0"
:min="0" :min="0"
@change="packAutoNumChange(index, trem)" @change="packAutoNumChange(index, trem)"
></el-input-number> ></el-input-number>
</div>
</div> </div>
<div
v-if="activeInfo.exchange_score_status == 1"
class="consumption-points rowFlex allCenter"
>消耗:{{ item.compare_amount * item.apply_num }}积分</div>
</div> </div>
<div </el-collapse-transition>
v-if="activeInfo.exchange_score_status == 1" </div>
class="consumption-points rowFlex allCenter" <div class="allIcon rowFlex allCenter">合计：{{ allpoints }} 积分</div>
>消耗:{{ item.compare_amount * item.apply_num }}积分</div>
</div>
</el-collapse-transition>
</div> </div>
<div class="allIcon rowFlex allCenter">合计：{{ allpoints }} 积分</div>
</div> </div>
<div class="activeItem rowFlex" style="margin-top:20px;"> <div class="activeItem rowFlex" style="margin-top:20px;">
<div class="activeLabel" style="text-align:right;">备注</div> <div class="activeLabel" style="text-align:right;">备注</div>
......
src/views/components/giftRecord/wxGift.vue
...@@ -3,19 +3,16 @@ ...@@ -3,19 +3,16 @@
<div ref="giftList" class="gift-list" @scroll="handleScroll"> <div ref="giftList" class="gift-list" @scroll="handleScroll">
<div v-for="item in giftList" :key="item._id" class="gift-item"> <div v-for="item in giftList" :key="item._id" class="gift-item">
<div class="gift-info"> <div class="gift-info">
<div class="rowFlex spaceBetween columnCenter"> <div v-if="item.gift_package_group_name ">分组: {{ item.gift_package_group_name }}</div>
<div class="gift-name hidden">{{ item.gift_package_name }}</div> <div>礼包名称: {{ item.gift_package_name }}</div>
<div class="gift-time">{{ item.send_time }}</div> <div>发送时间: {{ item.send_time }}</div>
</div> <div>礼包码: {{ item.code }}</div>
<div class="gift-code"> <div class="rowFlex spaceBetween columnCenter gift-sender">
<span class="giftCodeText">{{ item.code }}</span> <div>发送客服: {{ item.cser_name }}</div>
</div> <i class="el-icon-document-copy" style="cursor: pointer;" @click="handleCopy(item.code)"></i>
<div class="rowFlex spaceBetween columnCenter gift-sender">
<div>发送客服：{{ item.cser_name }}</div>
<i class="el-icon-document-copy" style="cursor: pointer;" @click="handleCopy(item.code)"></i>
</div>
</div> </div>
</div> </div>
</div>
<div v-if="loading" class="loading-more">加载中...</div> <div v-if="loading" class="loading-more">加载中...</div>
<div v-if="!hasMore && giftList.length > 0" class="no-more">没有更多数据了</div> <div v-if="!hasMore && giftList.length > 0" class="no-more">没有更多数据了</div>
<div v-if="giftList.length == 0" class="noContent rowFlex allCenter"> <div v-if="giftList.length == 0" class="noContent rowFlex allCenter">
...@@ -111,71 +108,62 @@ import Clipboard from 'clipboard' ...@@ -111,71 +108,62 @@ import Clipboard from 'clipboard'
border: 1px solid #E5E6EB; border: 1px solid #E5E6EB;
margin-bottom:12px; margin-bottom:12px;
.gift-info { .gift-info {
.gift-name { div{
font-weight: 400; line-height: 26px;
font-size: 14px;
color: #4E5969;
text-align: left;
font-style: normal;
width: calc(100% - 180px);
}
.gift-time {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 14px;
color: #4E5969;
text-align: left;
font-style: normal;
width: 150px;
}
.gift-code {
display: flex;
align-items: center;
justify-content: space-between;
border-radius: 4px;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 14px;
color: #323335;
text-align: justify;
font-style: normal;
margin: 10px 0;
span {
color: #323335;
font-size: 14px;
font-family: PingFangSC-Medium;
}
.el-button {
padding: 5px 12px;
border: 1px solid #dcdfe6;
border-radius: 4px;
font-size: 13px;
color: #606266;
&:hover {
color: #409eff;
border-color: #c6e2ff;
background-color: #ecf5ff;
}
}
}
.gift-sender {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 12px;
color: #4E5969;
line-height: 18px;
text-align: justify;
font-style: normal;
i{
color: #409EFF;
font-size: 14px;
}
}
} }
.gift-name {
font-weight: 400;
font-size: 14px;
color: #4E5969;
text-align: left;
font-style: normal;
}
.gift-code {
display: flex;
align-items: center;
justify-content: space-between;
border-radius: 4px;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 14px;
color: #323335;
text-align: justify;
font-style: normal;
span {
color: #323335;
font-size: 14px;
font-family: PingFangSC-Medium;
}
.el-button {
padding: 5px 12px;
border: 1px solid #dcdfe6;
border-radius: 4px;
font-size: 13px;
color: #606266;
&:hover {
color: #409eff;
border-color: #c6e2ff;
background-color: #ecf5ff;
}
}
}
.gift-sender {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 12px;
color: #4E5969;
line-height: 18px;
text-align: justify;
font-style: normal;
i{
color: #00BF8A;
font-size: 14px;
}
}
}
} }
.loading-more, .loading-more,
......
src/views/components/order/searchUser.vue
...@@ -90,8 +90,13 @@ ...@@ -90,8 +90,13 @@
} }
}, },
selectChange(value) { selectChange(value) {
const valueItem = this.searchUserOption.find(item => item.role_id == value || item.id == value) const valueItem = this.searchUserOption.find(item => {
console.log(valueItem, value) if(item.role_id){
return item.role_id == value
}else{
return item.id == value
}
})
this.$emit('result', value, valueItem) this.$emit('result', value, valueItem)
}, },
requestAccountList() { requestAccountList() {
......
src/views/components/quickSendGame/vipTools.vue
<template> <template>
<div class="vipToolsContent"> <div class="vipToolsContent">
<div class="gameList"> <div class="gameList">
<!-- VIP 自助工具 --> <!-- VIP 自助工具 暂时不显示 -->
<div class="gameListItem rowFlex columnCenter spaceBetween" v-if="false"> <div class="gameListItemApp rowFlex columnCenter spaceBetween" v-if="false">
<p class="rowFlex columnCenter"> <p class="rowFlex columnCenter">
<img src="@/assets/icon/vipIcon.svg" alt="vipIcon" style="width: 16px;height: 16px;margin-right: 5px;"> <img src="@/assets/icon/vipIcon.svg" alt="vipIcon" style="width: 16px;height: 16px;margin-right: 5px;">
VIP自助工具</p> VIP自助工具</p>
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
@click="sendVipGift" @click="sendVipGift"
>发送</el-button> >发送</el-button>
</div> </div>
<!-- --> <!-- 自助链接（举报、申诉、礼包申请） -->
<div class="gameListItem rowFlex columnCenter spaceBetween"> <div class="gameListItemApp rowFlex columnCenter spaceBetween">
<p class="rowFlex columnCenter"> <p class="rowFlex columnCenter">
<i class="el-icon-s-operation" style="font-size:16px;margin-right:5px;"></i> <i class="el-icon-s-operation" style="font-size:16px;margin-right:5px;"></i>
自助链接（举报、申诉、礼包申请）</p> 自助链接（举报、申诉、礼包申请）</p>
...@@ -50,8 +50,11 @@ ...@@ -50,8 +50,11 @@
<div <div
v-for="(items,indexs) in item.children" v-for="(items,indexs) in item.children"
:key="indexs" :key="indexs"
class="gameListItem rowFlex columnCenter spaceBetween gameListItemAc" class="gameListItemChange"
> >
<div class="gameListItemApp gameListItemAppAC" >
<p v-if="items.gift_package_group_name" class="gameName">{{ items.gift_package_group_name }}</p>
<div class="rowFlex columnCenter spaceBetween" style="margin-left: 20px;">
<p class="rowFlex columnCenter spaceBetween"> <p class="rowFlex columnCenter spaceBetween">
<el-popover <el-popover
placement="top" placement="top"
...@@ -86,6 +89,8 @@ ...@@ -86,6 +89,8 @@
>发送礼包码</el-button> >发送礼包码</el-button>
</div> </div>
</div> </div>
</div>
</div>
<div <div
v-else v-else
class="rowFlex allCenter" class="rowFlex allCenter"
...@@ -227,6 +232,7 @@ ...@@ -227,6 +232,7 @@
item.label = item.main_game_name + '/' + item.main_game_id item.label = item.main_game_name + '/' + item.main_game_id
item.value = item.main_game_id item.value = item.main_game_id
item.children = item.gift_package_list item.children = item.gift_package_list
item.group_name = item.gift_package_group_name
}) })
}, },
// 发送渠道 // 发送渠道
...@@ -346,9 +352,9 @@ ...@@ -346,9 +352,9 @@
cursor: pointer; cursor: pointer;
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
} }
.gameListItem { .gameListItemApp {
width: 100%; width: 100%;
height: 40px; padding-left: 20px;
.gameName{ .gameName{
max-width: 120px; max-width: 120px;
overflow: hidden; overflow: hidden;
...@@ -367,7 +373,7 @@ ...@@ -367,7 +373,7 @@
cursor: pointer; cursor: pointer;
} }
} }
.gameListItemAc { .gameListItemAppAC {
background: #f7f8fa; background: #f7f8fa;
} }
} }
......
src/views/components/skill/skillCompany.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-popover> </el-popover>
<div class="rowFlex titleFixed columnCenter"> <div class="rowFlex titleFixed columnCenter">
<div class="num">{{ items.message.attachments.length > 1 ? `+${items.message.attachments.length - 1}条` : '' }}</div> <div class="num">{{items.message && items.message.attachments && items.message.attachments.length > 1 ? `+${items.message.attachments.length - 1}条` : '' }}</div>
</div> </div>
<el-collapse-item title="" :name="items._id" class="contentItem"> <el-collapse-item title="" :name="items._id" class="contentItem">
...@@ -291,7 +291,7 @@ export default { ...@@ -291,7 +291,7 @@ export default {
} }
procedure_group(data).then((res) => { procedure_group(data).then((res) => {
this.loading = false this.loading = false
if (res.data.data && res.data.data.length > 0) { if (res.data && res.data.data && res.data.data.length > 0) {
this.groupList = res.data.data.map((item, index) => { this.groupList = res.data.data.map((item, index) => {
item.label = item.group_name item.label = item.group_name
item.value = item._id item.value = item._id
......
src/views/components/taskList/uesrTask.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
v-model="collapseValue" v-model="collapseValue"
@change="handleChange(item,$event)" @change="handleChange(item,$event)"
> >
<el-collapse-item :name="item.order_id"> <el-collapse-item :name="item.order_id || '--'">
<template slot="title"> <template slot="title">
<div class="orderDetailsTitle"> <div class="orderDetailsTitle">
<div class="money rowFlex spaceBetween"> <div class="money rowFlex spaceBetween">
......
src/views/orderList.vue
...@@ -190,8 +190,8 @@ export default { ...@@ -190,8 +190,8 @@ export default {
return { return {
sanjiaoxing, sanjiaoxing,
loading: false, loading: false,
activeType: 4, activeType: 2,
activeTypeStr: '4', activeTypeStr: '2',
dateDetailsValue: [], dateDetailsValue: [],
isloadMore: true, isloadMore: true,
collapseValue: ['1'], collapseValue: ['1'],
...@@ -259,10 +259,10 @@ export default { ...@@ -259,10 +259,10 @@ export default {
mounted() { mounted() {
this.payTypeList() this.payTypeList()
this.searchDate = [ this.searchDate = [
this.$moment().subtract(1, 'day').format('YYYY-MM-DD'), this.$moment().format('YYYY-MM-DD'),
this.$moment().format('YYYY-MM-DD') this.$moment().format('YYYY-MM-DD')
] ]
this.timerData.order_time_start = this.$moment().subtract(1, 'day').format('YYYY-MM-DD') this.timerData.order_time_start = this.$moment().format('YYYY-MM-DD')
this.timerData.order_time_end = this.$moment().format('YYYY-MM-DD') this.timerData.order_time_end = this.$moment().format('YYYY-MM-DD')
}, },
methods: { methods: {
......
src/views/quickReply.vue
...@@ -28,20 +28,15 @@ ...@@ -28,20 +28,15 @@
:active-name="activeName" :active-name="activeName"
/> />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane <el-tab-pane
v-if="workerRouter==='game' && messageSource === 'company_work'" label="跨主体知识库"
label="AI微言" name="robotLibrary"
name="aiLibrary"
> >
<template slot="label"> <crossLibrary
AI微言 v-if="activeName === 'robotLibrary'"
<span class="bate">beta</span>
</template>
<aiLibrary
v-if="activeName === 'aiLibrary'"
:active-name="activeName" :active-name="activeName"
/> />
</el-tab-pane> --> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
...@@ -51,6 +46,7 @@ ...@@ -51,6 +46,7 @@
import skillCompany from './components/skill/skillCompany.vue' import skillCompany from './components/skill/skillCompany.vue'
import skillPersonal from './components/skill/skillPersonal.vue' import skillPersonal from './components/skill/skillPersonal.vue'
import skillLibrary from './components/skill/skillLibrary.vue' import skillLibrary from './components/skill/skillLibrary.vue'
import crossLibrary from './components/skill/crossLibrary.vue'
import { mapActions } from 'vuex' import { mapActions } from 'vuex'
export default { export default {
name: 'quickReply', name: 'quickReply',
...@@ -58,7 +54,7 @@ export default { ...@@ -58,7 +54,7 @@ export default {
skillCompany, skillCompany,
skillPersonal, skillPersonal,
skillLibrary, skillLibrary,
// aiLibrary crossLibrary
}, },
data() { data() {
return { return {
......
src/views/taskList.vue
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<div v-for="(item, index) in taskList" :key="index" class="chatListItem columnCenter spaceBetween" <div v-for="(item, index) in taskList" :key="index" class="chatListItem columnCenter spaceBetween"
:class="item.id === taskDetails.id ? 'chatListItemActive' : ''" @click="selectTaskItem(item)"> :class="item.id === taskDetails.id ? 'chatListItemActive' : ''" @click="selectTaskItem(item)">
<div class="top rowFlex spaceBetween"> <div class="top rowFlex spaceBetween">
<div v-if="item.username && item.username.split('\n').length > 0" class="value"> <div v-if="item.username && item.username.split('\n') && item.username.split('\n').length > 0" class="value">
<div v-if="item.username.split('\n').length <= 1" class="rowFlex columnCenter"> <div v-if="item.username.split('\n').length <= 1" class="rowFlex columnCenter">
<div v-for="(items, indexs) in item.username.split('\n')" :key="indexs" <div v-for="(items, indexs) in item.username.split('\n')" :key="indexs"
class="rowFlex columnCenter userInfoStyle"> class="rowFlex columnCenter userInfoStyle">
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<span class="textHidden" style="max-width:150px;">{{ items }}</span> <span class="textHidden" style="max-width:150px;">{{ items }}</span>
</p> </p>
</div> </div>
<el-button slot="reference" type="text">{{ item.username.split("\n").length <el-button slot="reference" type="text">{{ item.username && item.username.split("\n") && item.username.split("\n").length?item.username.split("\n").length : 0
}}个</el-button> }}个</el-button>
</el-popover> </el-popover>
</div> </div>
...@@ -635,14 +635,14 @@ export default { ...@@ -635,14 +635,14 @@ export default {
const res = await taskIndex(data) const res = await taskIndex(data)
this.loading = false this.loading = false
if (this.pageInfo.page == 1) { if (this.pageInfo.page == 1) {
this.taskList = res.data.data this.taskList = res.data.data || []
} else { } else {
this.taskList = removeDp(this.taskList, res.data.data, 'id') this.taskList = removeDp(this.taskList, res.data.data, 'id')
} }
// if (!this.taskDetails.id && this.taskList.length > 0) { // if (!this.taskDetails.id && this.taskList.length > 0) {
// this.set_taskDetails(this.taskList[0]) // this.set_taskDetails(this.taskList[0])
// } // }
if (res.data.data.length < 20) { if (res?.data?.data?.length < 20) {
this.isMoreRecord = false this.isMoreRecord = false
} else { } else {
this.isMoreRecord = true this.isMoreRecord = true
......
src/views/taskRecord.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
v-model="collapseValue" v-model="collapseValue"
@change="handleChange(item,$event)" @change="handleChange(item,$event)"
> >
<el-collapse-item :name="item.order_id"> <el-collapse-item :name="item.order_id || '--'">
<template slot="title"> <template slot="title">
<div class="orderDetailsTitle"> <div class="orderDetailsTitle">
<div class="money rowFlex spaceBetween"> <div class="money rowFlex spaceBetween">
......
src/views/userInfo/userInfo.vue
...@@ -22,7 +22,7 @@ import roleInfo from '@/views/roleInfo.vue' ...@@ -22,7 +22,7 @@ import roleInfo from '@/views/roleInfo.vue'
import orderList from '@/views/orderList.vue' import orderList from '@/views/orderList.vue'
import violationRecord from '@/views/ViolationRecord.vue' import violationRecord from '@/views/ViolationRecord.vue'
import { mapState, mapMutations } from 'vuex' import { mapState, mapMutations } from 'vuex'
import Cookies from 'js-cookie'
export default { export default {
name: 'userInfo', name: 'userInfo',
components: { components: {
...@@ -44,7 +44,23 @@ export default { ...@@ -44,7 +44,23 @@ export default {
created() { created() {
// 初始化 vuex 中的值 // 初始化 vuex 中的值
}, },
mounted() {
this.$nextTick(() => {
this.initVuexValue()
})
},
methods: { methods: {
...mapMutations('user', ['set_userInfo']),
initVuexValue(){
const userinfo = {
cser_id: Cookies.get('cser_id'),
cser_name: Cookies.get('cser_name'),
username: Cookies.get('cser_name'),
id: Cookies.get('cser_id'),
}
this.set_userInfo(userinfo)
}
} }
} }
</script> </script>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论