Skip to content

C
company_app
提交 5aafb0b8 作者: 毛细亚
操作

更新代码

上级 4f3c2c0b
正在显示 包含 120 行增加 和 84 行删除
package.json
......@@ -37,8 +37,8 @@
"devDependencies": {
"@babel/core": "^7.12.16",
"@stagewise-plugins/vue": "^0.4.6",
"@stagewise/toolbar": "^0.4.4",
"@stagewise/toolbar-vue": "^0.4.4",
"@stagewise/toolbar": "^0.4.8",
"@stagewise/toolbar-vue": "^0.4.8",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-router": "~5.0.0",
"@vue/cli-plugin-vuex": "~5.0.0",
......
pnpm-lock.yaml
......@@ -86,13 +86,13 @@ importers:
version: 7.27.1
'@stagewise-plugins/vue':
specifier: ^0.4.6
version: 0.4.6(@stagewise/toolbar@0.4.4)
version: 0.4.6(@stagewise/toolbar@0.4.8)
'@stagewise/toolbar':
specifier: ^0.4.4
version: 0.4.4
specifier: ^0.4.8
version: 0.4.8
'@stagewise/toolbar-vue':
specifier: ^0.4.4
version: 0.4.4(vue@2.7.16)
specifier: ^0.4.8
version: 0.4.8(vue@2.7.16)
'@vue/cli-plugin-babel':
specifier: ~5.0.0
version: 5.0.8(@vue/cli-service@5.0.8(@vue/compiler-sfc@3.5.14)(lodash@4.17.21)(sass-loader@16.0.5(node-sass@4.14.1)(sass@1.89.0)(webpack@5.99.8))(vue-template-compiler@2.7.16)(vue@2.7.16)(webpack-sources@3.2.3))(core-js@3.42.0)(vue@2.7.16)
......@@ -817,13 +817,13 @@ packages:
peerDependencies:
'@stagewise/toolbar': 0.4.8
'@stagewise/toolbar-vue@0.4.4':
resolution: {integrity: sha512-0+r8SGExjz3+A64aMGgbg0clESg6yxZPwlO1aY+3bIwBjE+F/V3MetRE+5b7AuRKqEoz8GUXnll5O/zHIL+I3Q==}
'@stagewise/toolbar-vue@0.4.8':
resolution: {integrity: sha512-Zvxz59apepocu2cOD8UqUWIF7fIABGr+DNDSmz6Kp2nf1APNmfiK3QJ52rI2PfVDG9jaSE56EfYUA0t1xFJLYw==}
peerDependencies:
vue: '>=3.0.0'
'@stagewise/toolbar@0.4.4':
resolution: {integrity: sha512-hVxGqeYFx780m9SIv+YqhHx4o/fq94pMwr8OoemOCyOKozCGkvSIjpqkONvUyY5yWR+AVcop2p79LsSTdA6Etw==}
'@stagewise/toolbar@0.4.8':
resolution: {integrity: sha512-0ByvC4hYdHHf3rK5M+xSR9mipHYr8naNn2OgDBtv4DE0SoSCr08KfQtZ6VpsBNbOW/Mh1Y4c/AoWcyCTOc2ocA==}
'@trysound/sax@0.2.0':
resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
......@@ -1441,6 +1441,9 @@ packages:
brace-expansion@1.1.11:
resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
brace-expansion@1.1.12:
resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
braces@3.0.3:
resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
engines: {node: '>=8'}
......@@ -6283,16 +6286,16 @@ snapshots:
'@soda/get-current-script@1.0.2': {}
'@stagewise-plugins/vue@0.4.6(@stagewise/toolbar@0.4.4)':
'@stagewise-plugins/vue@0.4.6(@stagewise/toolbar@0.4.8)':
dependencies:
'@stagewise/toolbar': 0.4.4
'@stagewise/toolbar': 0.4.8
'@stagewise/toolbar-vue@0.4.4(vue@2.7.16)':
'@stagewise/toolbar-vue@0.4.8(vue@2.7.16)':
dependencies:
'@stagewise/toolbar': 0.4.4
'@stagewise/toolbar': 0.4.8
vue: 2.7.16
'@stagewise/toolbar@0.4.4': {}
'@stagewise/toolbar@0.4.8': {}
'@trysound/sax@0.2.0': {}
......@@ -7336,6 +7339,12 @@ snapshots:
balanced-match: 1.0.2
concat-map: 0.0.1
brace-expansion@1.1.12:
dependencies:
balanced-match: 1.0.2
concat-map: 0.0.1
optional: true
braces@3.0.3:
dependencies:
fill-range: 7.1.1
......@@ -8701,7 +8710,7 @@ snapshots:
fs.realpath: 1.0.0
inflight: 1.0.6
inherits: 2.0.4
minimatch: 3.1.2
minimatch: 3.0.8
once: 1.4.0
path-is-absolute: 1.0.1
optional: true
......@@ -9637,7 +9646,7 @@ snapshots:
minimatch@3.0.8:
dependencies:
brace-expansion: 1.1.11
brace-expansion: 1.1.12
optional: true
minimatch@3.1.2:
......@@ -11788,7 +11797,7 @@ snapshots:
wide-align@1.1.5:
dependencies:
string-width: 4.2.3
string-width: 1.0.2
optional: true
wildcard@2.0.1: {}
......
src/App.vue
......@@ -97,6 +97,10 @@ export default {
label: '快捷发送',
path: '/quickSendGame'
},
{
label: '任务列表',
path: '/taskList'
},
// {
// label: '通讯录',
// path: '/addressBook'
......
src/api/works.js
......@@ -225,3 +225,21 @@ export function zyouGetMemberLink(data) {
data
})
}
// 我的任务获取红点数组
export function getTaskUnReadData(data) {
return request({
url: returnApi('/corp_zyou_bind/getTaskUnReadData'),
method: 'post',
data
})
}
// 我的任务小时红点数字
export function clearTaskUnReadData(data) {
return request({
url: returnApi('/corp_zyou_bind/clearTaskUnReadData'),
method: 'post',
data
})
}
\ No newline at end of file
src/components/selectTag.vue
......@@ -363,19 +363,13 @@
padding-bottom: 120px;
.input {
width: 250px;
::v-deep .el-input__inner {
width: vw(250);
}
::v-deep .el-button {
width: vw(76);
}
}
.contnet {
width: 100%;
height: auto;
margin-top: 20px;
.contnetLeft {
width: vw(500);
width: auto;
height: 600px;
border-radius: 8px;
border: 1px solid rgba(0, 0, 0, 0.06);
......@@ -384,7 +378,7 @@
padding-top: 40px;
}
.contnetRight {
width: vw(260);
width: 260px;
height: 600px;
border-radius: 8px;
border: 1px solid rgba(0, 0, 0, 0.06);
......
src/directive/scroll/scroll.js
......@@ -62,7 +62,7 @@ function createScrollHandler(el, binding, vnode) {
const options = el.__infinite_scroll_options;
// 检查是否禁用
if (options.disabled) return;
if (options && options.disabled) return;
const scrollContainer = el.__infinite_scroll_container;
const isBottom = isScrollBottom(scrollContainer, el, options.distance);
......
src/router/index.js
......@@ -11,6 +11,7 @@ import violationRecord from '../views/ViolationRecord.vue'
import taskRecord from '../views/taskRecord.vue'
import mailList from '@/views/mailList.vue'
import quickSendGame from '@/views/quickSendGame.vue'
import taskList from '@/views/taskList.vue'
import Cookies from 'js-cookie'
import store from '@/store'
Vue.use(VueRouter)
......@@ -78,6 +79,11 @@ const routes = [
component: quickSendGame
},
{
path: '/taskList',
name: 'taskList',
component: taskList
},
{
path: '/login',
name: 'login',
component: () => import('../views/login.vue')
......
src/store/modules/game.js
......@@ -14,6 +14,7 @@ const state = {
send_game_log: null, // 转游发送渠道新增日志发送信息
chatUserInfo: {}, // 当前选中的用户的详情
viewLoading:false, // 查看用户详情的时候 加载状态
taskDetails: {}, // 任务详情
}
const mutations = {
......@@ -34,6 +35,9 @@ const mutations = {
},
set_viewLoading(state, data) {
state.viewLoading = data
},
set_taskDetails(state, data) {
state.taskDetails = data
}
}
......
src/views/components/ApplyRecords/AreaTransferApply.vue
......@@ -586,7 +586,7 @@ export default {
.chatListItem {
width: 100%;
height: 68px;
padding: 3px vw(20);
padding: 3px 10px;
position: relative;
cursor: pointer;
color: #333333;
......@@ -813,7 +813,7 @@ export default {
}
.trans-follow-1 {
width: vw(300);
width: 300px;
min-height: fit-content;
margin: 6px 0 12px 0;
padding: 12px 12px 2px 12px;
......
src/views/components/ApplyRecords/TerminaTranfer.vue
......@@ -516,7 +516,7 @@ export default {
.chatListItem {
width: 100%;
height: 68px;
padding: 3px vw(20);
padding: 3px 10px;
position: relative;
cursor: pointer;
color: #333333;
......@@ -743,7 +743,7 @@ export default {
}
.trans-follow-1 {
width: vw(300);
width: 300px;
min-height: fit-content;
margin: 6px 0 12px 0;
padding: 12px 12px 2px 12px;
......
src/views/components/ApplyRecords/errorHandle.vue
......@@ -305,7 +305,7 @@ export default {
position: relative;
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......@@ -379,7 +379,7 @@ export default {
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
color: #999999;
......
src/views/components/bindGameAccount/userTable.vue
......@@ -109,8 +109,8 @@
cursor: pointer;
}
.qrImage {
width: vw(140);
height: vw(140);
width: 140px;
height: 140px;
}
.tableImage {
width: 30px;
......
src/views/components/order/refundLog.vue
......@@ -482,7 +482,7 @@
background: #fff;
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......@@ -561,7 +561,7 @@
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
......
src/views/components/roleInfo/approval.vue
......@@ -627,7 +627,7 @@
.chatListItem {
width: 100%;
height: 68px;
padding: 3px vw(20);
padding: 3px 10px;
position: relative;
cursor: pointer;
color: #333333;
......@@ -854,7 +854,7 @@
}
.trans-follow-1 {
width: vw(300);
width: 300px;
min-height: fit-content;
margin: 6px 0 12px 0;
padding: 12px 12px 2px 12px;
......
src/views/components/roleInfo/report.vue
......@@ -630,7 +630,7 @@
.chatListItem {
width: 100%;
height: 68px;
padding: 3px vw(20);
padding: 3px 10px;
position: relative;
cursor: pointer;
color: #333333;
......@@ -857,7 +857,7 @@
}
.trans-follow-1 {
width: vw(300);
width: 300px;
min-height: fit-content;
margin: 6px 0 12px 0;
padding: 12px 12px 2px 12px;
......
src/views/components/roleInfo/roleInfoPanel.vue
......@@ -200,7 +200,7 @@
overflow: auto;
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......@@ -252,7 +252,7 @@
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
color: #999999;
......@@ -270,10 +270,10 @@
top: 12px;
}
.tags {
width: vw(300);
width: 300px;
margin-left: 10px;
.tagsItem {
width: vw(300);
width: 300px;
}
.tag {
height: 22px;
......
src/views/components/skill/skillCompany.vue
......@@ -357,12 +357,12 @@ export default {
</script>
<style lang="scss" scoped>
.details {
width: vw(444);
width: 100%;
height: 100%;
background: #fff;
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......@@ -376,7 +376,7 @@ export default {
}
.content {
width: 100%;
padding: vw(20);
padding: 10px;
height: 100%;
background: red;
.contentItemTitle {
......@@ -471,7 +471,7 @@ export default {
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
color: #999999;
......@@ -489,10 +489,10 @@ export default {
top: 12px;
}
.tags {
width: vw(300);
width:250px;
margin-left: 10px;
.tagsItem {
width: vw(300);
width: 250px;
}
.tag {
height: 22px;
......@@ -534,12 +534,12 @@ export default {
margin-top: 20px;
}
.tagList {
width: vw(130);
width: 100px;
height: 100%;
position: relative;
border-right: 1px solid #e0e0e0;
.tagItem {
width: vw(128);
width: 100px;
height: 36px;
background: #fff;
border-radius: 4px;
......@@ -551,7 +551,7 @@ export default {
margin-bottom: 6px;
cursor: pointer;
.text {
max-width: vw(90);
max-width: 100px;
margin-left: 10px;
}
}
......
src/views/components/skill/skillLibrary.vue
......@@ -375,7 +375,7 @@ export default {
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
color: #999999;
......@@ -393,10 +393,10 @@ export default {
top: 12px;
}
.tags {
width: vw(300);
width: 300px;
margin-left: 10px;
.tagsItem {
width: vw(300);
width: 300px;
}
.tag {
height: 22px;
......@@ -439,13 +439,13 @@ export default {
}
.tagList {
width: vw(130);
width: 100px;
height: 100%;
position: relative;
border-right: 1px solid #e0e0e0;
.tagItem {
width: vw(128);
width: 100px;
height: auto;
background: #fff;
border-radius: 4px;
......@@ -456,7 +456,7 @@ export default {
margin-bottom: 6px;
cursor: pointer;
.text {
max-width: vw(90);
max-width: 90px;
margin-left: 5px;
}
.tagItemGroup {
......
src/views/components/skill/skillPersonal.vue
......@@ -354,12 +354,12 @@ export default {
</script>
<style lang="scss" scoped>
.details {
width: vw(444);
width: 100%;
height: 100%;
background: #fff;
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......@@ -373,7 +373,7 @@ export default {
}
.content {
width: 100%;
padding: vw(20);
padding: 10px;
height: 100%;
background: red;
.contentItemTitle {
......@@ -468,7 +468,7 @@ export default {
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
color: #999999;
......@@ -486,10 +486,10 @@ export default {
top: 12px;
}
.tags {
width: vw(300);
width:260px;
margin-left: 10px;
.tagsItem {
width: vw(300);
width: 260px;
}
.tag {
height: 22px;
......@@ -531,12 +531,12 @@ export default {
margin-top: 20px;
}
.tagList {
width: vw(130);
width: 100px;
height: 100%;
position: relative;
border-right: 1px solid #e0e0e0;
.tagItem {
width: vw(128);
width: 100px;
height: 36px;
background: #fff;
border-radius: 4px;
......@@ -548,7 +548,7 @@ export default {
margin-bottom: 6px;
cursor: pointer;
.text {
max-width: vw(90);
max-width: 90px;
margin-left: 10px;
}
}
......
src/views/orderList.vue
......@@ -470,7 +470,7 @@ export default {
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......@@ -559,7 +559,7 @@ export default {
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
......
src/views/quickReply.vue
......@@ -105,7 +105,7 @@ export default {
}
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......
src/views/quickSendGame.vue
......@@ -66,7 +66,7 @@ export default {
}
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......
src/views/taskRecord.vue
......@@ -453,7 +453,7 @@ export default {
</script>
<style lang="scss" scoped>
.task-info-container {
width: vw(424);
width: 100%;
height: 100%;
background: #fff;
margin-left: 2px;
......@@ -461,7 +461,7 @@ export default {
overflow: hidden;
.detailsTitle {
width: 100%;
padding: 0 vw(20);
padding: 0 10px;
height: 60px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
......@@ -529,7 +529,7 @@ export default {
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.label {
color: #999999;
......
src/views/userInfo/components/gameInfo/gameUserInfo.vue
......@@ -430,7 +430,7 @@ import { debounce } from '@/utils'
margin-left: 10px;
}
.showInputRemarkInput {
width: vw(220);
width: 200px;
margin-left: 10px;
}
.label {
......@@ -462,10 +462,10 @@ import { debounce } from '@/utils'
cursor: pointer;
}
.tags {
width: vw(300);
width: 250px;
margin-left: 10px;
.tagsItem {
width: vw(300);
width: 250px;
}
.tag {
height: 22px;
......
src/views/userInfo/components/shareInfo.vue
......@@ -169,10 +169,10 @@
width: 40px;
height: 40px;
border-radius: 6px;
margin-right: vw(10);
margin-right: 10px;
}
.showInputRemarkInput {
width: vw(220);
width: 200px;
margin-left: 10px;
}
.label {
......@@ -204,10 +204,10 @@
cursor: pointer;
}
.tags {
width: vw(300);
width: 250px;
margin-left: 10px;
.tagsItem {
width: vw(300);
width: 250px;
}
.tag {
height: 22px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论