Skip to content

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

更新代码

上级 8876ee97
正在显示 包含 158 行增加 和 20 行删除
src/views/components/giftRecord/emailGift.vue
...@@ -11,7 +11,15 @@ ...@@ -11,7 +11,15 @@
</div> </div>
<div class="detailsGiftApplyContent"> <div class="detailsGiftApplyContent">
<!-- 过滤条件 --> <!-- 过滤条件 -->
<el-form class="filterList" label-position="top"> <el-form class="filterList" label-position="top" :class="{ 'collapsed-form': isCollapsed }">
<div class="filter-header">
<span class="filter-title">筛选条件</span>
<i
:class="isCollapsed ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
class="collapse-icon"
@click="toggleCollapse"
></i>
</div>
<el-form-item label="主游戏"> <el-form-item label="主游戏">
<el-select <el-select
v-model.trim="form.main_game_id" v-model.trim="form.main_game_id"
...@@ -279,7 +287,8 @@ ...@@ -279,7 +287,8 @@
page: 0, page: 0,
page_size: 20, page_size: 20,
total: 0 total: 0
} },
isCollapsed: false
} }
}, },
computed: { computed: {
...@@ -417,6 +426,9 @@ ...@@ -417,6 +426,9 @@
}, err => { }, err => {
this.listLoading = false this.listLoading = false
}) })
},
toggleCollapse() {
this.isCollapsed = !this.isCollapsed
} }
} }
} }
...@@ -523,6 +535,47 @@ ...@@ -523,6 +535,47 @@
} }
.filterList { .filterList {
margin-bottom: 10px; margin-bottom: 10px;
position: relative;
border: 1px solid #EBEEF5;
border-radius: 4px;
padding: 10px;
transition: all 0.3s;
.filter-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
padding-bottom: 5px;
border-bottom: 1px dashed #EBEEF5;
}
.filter-title {
font-size: 14px;
font-weight: 500;
color: #606266;
}
.collapse-icon {
cursor: pointer;
color: #409EFF;
font-size: 16px;
padding: 5px;
transition: all 0.3s;
}
&.collapsed-form {
.el-form-item {
display: none;
}
.filter-header {
margin-bottom: 0;
padding-bottom: 0;
border-bottom: none;
}
}
.label { .label {
width: 80px; width: 80px;
text-align: center; text-align: center;
......
src/views/components/order/refundLog.vue
...@@ -2,7 +2,15 @@ ...@@ -2,7 +2,15 @@
<div class="detailsRefund columnFlex"> <div class="detailsRefund columnFlex">
<div class="content refundContent"> <div class="content refundContent">
<div class="filter-container"> <div class="filter-container">
<el-form class="filter-form" label-position="top" label-width="auto"> <el-form class="filter-form" label-position="top" label-width="auto" :class="{ 'collapsed-form': isCollapsed }">
<div class="filter-header">
<span class="filter-title">筛选条件</span>
<i
:class="isCollapsed ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
class="collapse-icon"
@click="toggleCollapse"
></i>
</div>
<el-form-item label="订单号:"> <el-form-item label="订单号:">
<el-input <el-input
v-model="requestData.order_id" v-model="requestData.order_id"
...@@ -276,7 +284,8 @@ ...@@ -276,7 +284,8 @@
page: 0, page: 0,
page_size: 20, page_size: 20,
total: 0 total: 0
} },
isCollapsed: false
} }
}, },
computed: { computed: {
...@@ -461,7 +470,10 @@ ...@@ -461,7 +470,10 @@
this.loading = false this.loading = false
} }
) )
}, 1000) }, 1000),
toggleCollapse() {
this.isCollapsed = !this.isCollapsed
}
} }
} }
</script> </script>
...@@ -784,6 +796,79 @@ ...@@ -784,6 +796,79 @@
} }
} }
.filter-container {
margin-bottom: 10px;
.filter-form {
border: 1px solid #EBEEF5;
border-radius: 4px;
padding: 10px;
transition: all 0.3s;
.filter-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
padding-bottom: 5px;
border-bottom: 1px dashed #EBEEF5;
}
.filter-title {
font-size: 14px;
font-weight: 500;
color: #606266;
}
.collapse-icon {
cursor: pointer;
color: #409EFF;
font-size: 16px;
padding: 5px;
transition: all 0.3s;
}
&.collapsed-form {
.el-form-item {
display: none;
}
.filter-header {
margin-bottom: 0;
padding-bottom: 0;
border-bottom: none;
}
}
.el-form-item {
margin-bottom: 15px;
width: 48%;
margin-right: 2%;
display: inline-block;
vertical-align: top;
&:nth-child(2n) {
margin-right: 0;
}
}
::v-deep .el-form-item__label {
padding: 0;
line-height: 24px;
font-size: 14px;
color: #606266;
}
::v-deep .el-form-item__content {
line-height: 36px;
}
.searchInput {
width: 100%;
}
}
}
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
line-height: 26px; line-height: 26px;
font-size: 16px; font-size: 16px;
......
src/views/components/quickSendGame/sendGame.vue
...@@ -693,11 +693,11 @@ export default { ...@@ -693,11 +693,11 @@ export default {
// const list = [ // const list = [
// { // {
// msgtype: 'text', // msgtype: 'text',
// text: { content: `账号:${username} \n密码:${res.data.encryptPassword}`, key: res.data.key, iv: res.data.iv } // text: { content: `账号:${username} \n密码:${res.data.password}`, key: res.data.key, iv: res.data.iv }
// } // }
// ] // ]
// this.set_sendSkillMessage(list) // this.set_sendSkillMessage(list)
this.sendChatMessage(`账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`账号:${username} \n密码:${res.data.password}`, 'text')
this.markTransScene(type) this.markTransScene(type)
this.sendGameLog(item) this.sendGameLog(item)
}) })
...@@ -740,13 +740,13 @@ export default { ...@@ -740,13 +740,13 @@ export default {
{ {
msgtype: 'text', msgtype: 'text',
text: { text: {
content: `${str}${item.url} \n账号:${username} \n密码:${res.data.encryptPassword}`, content: `${str}${item.url} \n账号:${username} \n密码:${res.data.password}`,
key: res.data.key, iv: res.data.iv key: res.data.key, iv: res.data.iv
} }
} }
] ]
// this.set_sendSkillMessage(list) // this.set_sendSkillMessage(list)
this.sendChatMessage(`${str}${item.url} \n账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`${str}${item.url} \n账号:${username} \n密码:${res.data.password}`, 'text')
this.markTransScene(type) this.markTransScene(type)
item.type = 1 item.type = 1
this.sendGameLog(item) this.sendGameLog(item)
...@@ -941,14 +941,14 @@ export default { ...@@ -941,14 +941,14 @@ export default {
channel_key: item.channel_key channel_key: item.channel_key
}, },
text: { text: {
content: `${str}${item.game_url} \n账号:${username} \n密码:${res.data.encryptPassword}`, content: `${str}${item.game_url} \n账号:${username} \n密码:${res.data.password}`,
key: res.data.key, iv: res.data.iv key: res.data.key, iv: res.data.iv
} }
} }
] ]
// 这里需要特殊处理，因为有taskInfo参数 // 这里需要特殊处理，因为有taskInfo参数
// this.set_sendSkillMessage(list) // this.set_sendSkillMessage(list)
this.sendChatMessage(`${str}${item.game_url} \n账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`${str}${item.game_url} \n账号:${username} \n密码:${res.data.password}`, 'text')
item.type = 3 item.type = 3
this.sendGameLog(item) this.sendGameLog(item)
}) })
......
src/views/components/quickSendGame/sendGame/selectChannel.vue
...@@ -211,11 +211,11 @@ export default { ...@@ -211,11 +211,11 @@ export default {
const list = [ const list = [
{ {
msgtype: 'text', msgtype: 'text',
text: { content: `账号:${username} \n密码:${res.data.encryptPassword}`, key: res.data.key, iv: res.data.iv } text: { content: `账号:${username} \n密码:${res.data.password}`, key: res.data.key, iv: res.data.iv }
} }
] ]
// this.set_sendSkillMessage(list) // this.set_sendSkillMessage(list)
this.sendChatMessage(`账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`账号:${username} \n密码:${res.data.password}`, 'text')
this.close() this.close()
}) })
.catch((err) => { .catch((err) => {
...@@ -252,14 +252,14 @@ export default { ...@@ -252,14 +252,14 @@ export default {
{ {
msgtype: 'text', msgtype: 'text',
text: { text: {
content: `${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.encryptPassword}`, content: `${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.password}`,
key: res.data.key, key: res.data.key,
iv: res.data.iv iv: res.data.iv
} }
} }
] ]
// this.set_sendSkillMessage(list) // this.set_sendSkillMessage(list)
this.sendChatMessage(`${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.password}`, 'text')
this.close() this.close()
}) })
.catch((err) => { .catch((err) => {
......
src/views/components/quickSendGame/sendGame/sendSelectChannel.vue
...@@ -170,11 +170,11 @@ export default { ...@@ -170,11 +170,11 @@ export default {
// const list = [ // const list = [
// { // {
// msgtype: 'text', // msgtype: 'text',
// text: { content: `账号:${username} \n密码:${res.data.encryptPassword}`, key: res.data.key, iv: res.data.iv } // text: { content: `账号:${username} \n密码:${res.data.password}`, key: res.data.key, iv: res.data.iv }
// } // }
// ] // ]
// this.set_sendSkillMessage(list) // this.set_sendSkillMessage(list)
this.sendChatMessage(`账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`账号:${username} \n密码:${res.data.password}`, 'text')
this.close() this.close()
}) })
.catch((err) => { .catch((err) => {
...@@ -211,13 +211,13 @@ export default { ...@@ -211,13 +211,13 @@ export default {
// { // {
// msgtype: 'text', // msgtype: 'text',
// text: { // text: {
// content: `${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.encryptPassword}`, // content: `${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.password}`,
// key: res.data.key, iv: res.data.iv // key: res.data.key, iv: res.data.iv
// } // }
// } // }
// ] // ]
// this.set_sendSkillMessage(list) // this.set_sendSkillMessage(list)
this.sendChatMessage(`${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`${str}${this.webForm.channel_id.game_url} \n账号:${username} \n密码:${res.data.password}`, 'text')
this.close() this.close()
}) })
.catch((err) => { .catch((err) => {
......
src/views/components/quickSendGame/vipTools.vue
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
} }
const username = this.bindGameUserList.find(item => item.member_id == this.accountSelect).username const username = this.bindGameUserList.find(item => item.member_id == this.accountSelect).username
passwardEncryption({ member_id: this.accountSelect }).then(res => { passwardEncryption({ member_id: this.accountSelect }).then(res => {
this.sendChatMessage(`${str}${item.url} \n账号:${username} \n密码:${res.data.encryptPassword}`, 'text') this.sendChatMessage(`${str}${item.url} \n账号:${username} \n密码:${res.data.password}`, 'text')
}).catch(err => { }).catch(err => {
this.sendChatMessage(`${str}${item.url} \n账号:${username}`, 'text') this.sendChatMessage(`${str}${item.url} \n账号:${username}`, 'text')
console.log(err) console.log(err)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论