Skip to content

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

Merge branch '1.1' into 1.2

上级 3cdff6b1 3fc2ac98
正在显示 包含 103 行增加 和 100 行删除
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.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>
<!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.756234a1.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.b6496a0d.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>
src/App.vue
......@@ -153,13 +153,6 @@ export default {
this.set_token(cookieToken)
console.log('从 Cookie 恢复 token:', cookieToken)
}
// 页面刷新时从 Cookie 恢复 accountSelect 到 store
const cookieAccountSelect = Cookies.get('accountSelect')
if (cookieAccountSelect && !this.$store.state.game.accountSelect) {
this.set_accountSelect(cookieAccountSelect)
console.log('从 Cookie 恢复 accountSelect:', cookieAccountSelect)
}
// 初始化时处理路径
const currentPath = this.$route.path
if (currentPath === '/' || currentPath === '' || currentPath === '/index.html') {
......
src/components/debug.vue
......@@ -9,7 +9,7 @@
<script>
import devModeManager from '@/utils/devMode'
export default {
name: 'Debug',
name: 'debug',
methods: {
handleDevModeClick() {
devModeManager.handleClick()
......
src/components/inputTags/alias.vue
......@@ -32,6 +32,7 @@
<script>
export default {
name: 'inputTagsAlias',
props: {
rowInfo: {
type: Array,
......
src/components/inputTags/index.vue
......@@ -58,6 +58,7 @@
<script>
import Alias from './alias.vue'
export default {
name: 'inputTags',
props: {
inputSelectList: {
type: Array,
......
src/components/loading.vue
......@@ -7,6 +7,7 @@
<script>
export default {
name: 'loading',
data() {
return {
}
......
src/components/mainGame.vue
......@@ -17,6 +17,7 @@
import { selectSearch } from '@/api/game'
import { searchcondition } from '@/api/pigeon'
export default {
name: 'mainGame',
// gameType:存在的时候取信鸽的游戏列表接口 gameDefaultList 编辑的时候 如果没有当前的游戏 id 主动加上去
props: ['defaultValue', 'width', 'label', 'disabled','gameType','gameDefaultList','isResize'],
data() {
......
src/components/noContent.vue
......@@ -14,7 +14,7 @@
<script>
export default {
name: 'NoContent',
name: 'noContent',
props: {
// 主标题
title: {
......
src/components/page/pageNum.vue
......@@ -14,7 +14,7 @@
<script type="text/javascript">
export default {
name: 'page',
name: 'pageNum',
props: ['pageInfo'],
data() {
return {}
......
src/components/selectTag.vue
......@@ -105,6 +105,7 @@
<script type="text/javascript">
import { searchTags } from '@/api/works'
export default {
name: 'selectTag',
components: {
},
// checkList 选中的标签 checkbox 是否显示 在当前主体不同客服号同步进行打标
......
src/components/textEditor.vue
......@@ -45,6 +45,7 @@
<script>
import { base64toFile } from '@/utils/index'
export default {
name: 'textEditor',
props: ['remark', 'contenteditable', 'domid'], // remark 原来的图文内容 contenteditable 是否可编辑 domid 编辑器的 DomId resultReamrk 方法吐出最后的编辑好的内容
data() {
return {
......
src/components/uploadMultiple.vue
......@@ -79,6 +79,7 @@
import { uploadImageBefore } from '@/utils/index'
// import imageCropper from './imageCorpper.vue'
export default {
name: 'uploadMultiple',
components: {
// imageCropper
},
......
src/store/modules/game.js
......@@ -5,12 +5,9 @@ import { zyouBindMember } from '@/api/works'
import Cookies from 'js-cookie'
// 从本地缓存获取accountSelect
const getAccountSelectFromCache = () => {
return Cookies.get('accountSelect') || ''
}
const state = {
accountSelect: getAccountSelectFromCache(), // 当前选中的用户的member_id，从缓存初始化
accountSelect: '', // 当前选中的用户的member_id，从缓存初始化
bindGameUserList: [], // 用户绑定的游戏角色
changeSelectWindow: false, // 切换客服窗口的时候 下发通知
gameUserInfo:{},
......@@ -22,12 +19,6 @@ const state = {
const mutations = {
set_accountSelect(state, data) {
state.accountSelect = data
// 同步到本地缓存
if (data) {
Cookies.set('accountSelect', data, { expires: 30 }) // 30天过期
} else {
Cookies.remove('accountSelect')
}
},
set_bindGameUserList(state, data) {
state.bindGameUserList = data
......
src/views/applyRecord.vue
......@@ -18,7 +18,7 @@ import AreaTransferApply from './components/ApplyRecords/AreaTransferApply.vue'
import errorHandle from './components/ApplyRecords/errorHandle.vue'
import TerminalTransfer from './components/ApplyRecords/TerminaTranfer.vue'
export default {
name: 'GiftTab',
name: 'applyRecord',
components: {
AreaTransferApply,
errorHandle,
......
src/views/components/ApplyRecords/AreaTransferApply.vue
......@@ -245,6 +245,7 @@ import shenpi4 from '@/assets/icon/shenpi4.svg'
import shenpi5 from '@/assets/icon/shenpi5.svg'
import noContent from '@/components/noContent.vue'
export default {
name: 'AreaTransferApply',
computed: {
...mapState('game', ['accountSelect']),
...mapState('user', ['userInfo'])
......
src/views/components/ApplyRecords/AreaTransferDialog.vue
......@@ -225,7 +225,7 @@ import { searchcondition, transfer_server_request_add } from '@/api/game'
import textEditor from '@/components/textEditor.vue'
import mainGameSelect from '@/components/mainGame.vue'
export default {
name: 'AreaTransferDialog',
name: 'areaTransferDialog',
components: {
textEditor,
mainGameSelect
......
src/views/components/ApplyRecords/TerminaTranfer.vue
......@@ -178,6 +178,7 @@ import shenpi5 from '@/assets/icon/shenpi5.svg'
import shenpi6 from '@/assets/icon/shenpi6.svg'
import noContent from '@/components/noContent.vue'
export default {
name: 'terminaTranfer',
computed: {
...mapState('game', ['accountSelect']),
...mapState('user', ['userInfo'])
......
src/views/components/ApplyRecords/TerminalTransferDialog.vue
......@@ -28,7 +28,7 @@
v-for="item in bindGameUserList"
:key="item.member_id"
:label="item.username"
:value="item.member_id"
:value="item.member_id"
/>
</el-select>
</el-form-item>
......@@ -141,7 +141,7 @@ import { searchcondition, approval_group_flow_list, approval_group_flow_user, ap
import textEditor from '@/components/textEditor.vue'
export default {
name: 'TerminalTransferDialog',
name: 'terminalTransferDialog',
components: {
textEditor
},
......
src/views/components/ApplyRecords/addErrorHandle.vue
......@@ -119,6 +119,7 @@
import { mapMutations, mapActions, mapState } from 'vuex'
import textEditor from '@/components/textEditor.vue'
export default {
name: 'addErrorHandle',
components: { searchSelect, uploadMultiple, textEditor },
props: ['show', 'width', 'title', 'info'],
computed: {
......
src/views/components/ApplyRecords/errorHandle.vue
......@@ -108,6 +108,7 @@ import { memberView, misoperationIndex, searchcondition } from '@/api/game'
import addErrorHandle from './addErrorHandle.vue'
import noContent from '@/components/noContent.vue'
export default {
name: 'errorHandle',
components: {
searchSelect,
addErrorHandle,
......
src/views/components/bindGameAccount/addUser.vue
......@@ -187,6 +187,7 @@
import { mapMutations, mapActions, mapState } from 'vuex'
import page from '@/components/page/pageNum.vue'
export default {
name: 'addUser',
components: {
userTable,
page
......
src/views/components/bindGameAccount/bindUserList.vue
......@@ -32,6 +32,7 @@ import { getToken,removeToken } from '@/utils/auth'
// 更新代码
export default {
name: 'bindUserList',
components: {
addUser
},
......
src/views/components/bindGameAccount/userTable.vue
......@@ -54,6 +54,7 @@
<script>
export default {
name: 'userTable',
props: ['list'],
data() {
return {
......
src/views/components/giftRecord/applyGift.vue
......@@ -73,6 +73,7 @@
import roleTimeRecharge from './giftDetails/roleTimeRecharge.vue'
import { debounce } from '@/utils/index'
export default {
name: 'applyGift',
components: {
roleRecharge, // 角色累充
oneDayCharge, // 单日累充
......
src/views/components/giftRecord/confirmLayer.vue
......@@ -66,6 +66,7 @@
import { giftBagApply } from '@/api/game'
import { mapState } from 'vuex'
export default {
name: 'confirmLayer',
// type 3:image 4:video
props: ['show', 'width', 'title', 'activeInfo', 'remark'],
data() {
......
src/views/components/giftRecord/emailGift.vue
......@@ -142,6 +142,7 @@ import { removeDp, debounce } from '@/utils/index'
import applyGift from './applyGift.vue'
import selectDate from '@/components/selectDate.vue'
export default {
name: 'emailGift',
components: {
selectDate,
applyGift
......
src/views/components/giftRecord/giftDetails/oneDay.vue
......@@ -135,6 +135,7 @@ import { giftBagApply } from '@/api/game'
import { mapState, mapMutations, mapActions } from 'vuex'
import confirmLayer from '../confirmLayer'
export default {
name: 'oneDay',
// type 3:image 4:video
components: {
confirmLayer
......
src/views/components/giftRecord/giftDetails/roleRecharge.vue
......@@ -67,6 +67,7 @@ import { giftBagApply } from '@/api/game'
import confirmLayer from '../confirmLayer'
import { mapState } from 'vuex'
export default {
name: 'roleRecharge',
// type 3:image 4:video
components: {
confirmLayer
......
src/views/components/giftRecord/giftDetails/roleTimeRecharge.vue
......@@ -261,6 +261,7 @@ import { giftBagApply, checkRoleReceivedBag } from '@/api/game'
import { mapState, mapMutations, mapActions } from 'vuex'
import confirmLayer from '../confirmLayer'
export default {
name: 'roleTimeRecharge',
// type 3:image 4:video
components: {
confirmLayer
......
src/views/components/giftRecord/wxGift.vue
......@@ -31,7 +31,7 @@ import Clipboard from 'clipboard'
import { debounce,copyText,sendChatMessage } from '@/utils/index'
import { mapState } from 'vuex'
export default {
name: 'WxGift',
name: 'wxGift',
data() {
return {
loading: false,
......
src/views/components/order/orderRefund.vue
......@@ -61,6 +61,7 @@
import { refundRequest } from '@/api/game'
import textEditor from '@/components/textEditor.vue'
export default {
name: 'orderRefund',
components: { textEditor },
props: ['show', 'title', 'info'],
data() {
......
src/views/components/order/refundLog.vue
......@@ -231,6 +231,7 @@
import orderRefund from './orderRefund.vue'
import noContent from '@/components/noContent.vue'
export default {
name: 'refundLog',
components: {
searchSelect,
orderRefund,
......
src/views/components/order/searchUser.vue
......@@ -35,6 +35,7 @@
import { roleList } from '@/api/game'
import { mapState } from 'vuex'
export default {
name: 'searchUser',
// uid 默认选择的uid
props: ['placeholder', 'selectWord', 'value', 'width', 'defaultValue', 'disabled', 'accountChange'],
data() {
......
src/views/components/quickSendGame/sendGame.vue
......@@ -206,6 +206,7 @@ import sendSelectChannel from './sendGame/sendSelectChannel.vue'
import gameLogMixin from '@/mixins/gameLogMixin'
export default {
name: 'sendGame',
mixins: [gameLogMixin],
components: {
createChannel,
......
src/views/components/quickSendGame/sendGame/createChannel.vue
......@@ -136,6 +136,7 @@
import { getZqCserGroup,getZqCserWxBelong } from '@/api/works'
import mainGameSelect from './mainGame.vue'
export default {
name: 'createChannel',
components: {
mainGameSelect
},
......
src/views/components/quickSendGame/sendGame/mainGame.vue
......@@ -20,56 +20,57 @@
<script>
import { selectSearch } from '@/api/game'
export default {
props: ['defaultValue', 'width', 'label'],
data() {
return {
loading: false,
reg_game_id: '',
regGameList: []
}
},
watch: {
defaultValue(newVal) {
if (newVal) {
this.reg_game_id = this.defaultValue
} else {
}
}
},
mounted() {
this.reg_game_id = this.defaultValue
this.requestRegGameList()
},
methods: {
requestRegGameList() {
const data = {
type: 'gameListWithType',
value: '',
weixin_blong_id: ''
name: 'mainGame',
props: ['defaultValue', 'width', 'label'],
data() {
return {
loading: false,
reg_game_id: '',
regGameList: []
}
selectSearch(data).then(res => {
this.loading = false
if (res.status_code == 1) {
this.regGameList = res.data.data
},
watch: {
defaultValue(newVal) {
if (newVal) {
this.reg_game_id = this.defaultValue
} else {
}
})
}
},
mounted() {
this.reg_game_id = this.defaultValue
this.requestRegGameList()
},
returnGameId() {
let label = ''
let list = []
this.regGameList.map(item => {
list = list.concat(item.children)
})
list.map(items => {
if (items.value === this.reg_game_id) {
label = items.label
methods: {
requestRegGameList() {
const data = {
type: 'gameListWithType',
value: '',
weixin_blong_id: ''
}
selectSearch(data).then(res => {
this.loading = false
if (res.status_code == 1) {
this.regGameList = res.data.data
}
})
this.$emit('result', this.reg_game_id, label)
})
},
returnGameId() {
let label = ''
let list = []
this.regGameList.map(item => {
list = list.concat(item.children)
})
list.map(items => {
if (items.value === this.reg_game_id) {
label = items.label
}
})
this.$emit('result', this.reg_game_id, label)
}
}
}
}
</script>
<style lang="scss" scoped>
......
src/views/components/quickSendGame/sendGame/selectChannel.vue
......@@ -55,6 +55,7 @@ import { zyouGetMemberLink } from '@/api/works'
import gameLogMixin from '@/mixins/gameLogMixin'
export default {
name: 'selectChannel',
mixins: [gameLogMixin],
props: ['show', 'channelInfoList', 'chatUser'],
data() {
......
src/views/components/quickSendGame/sendGame/sendSelectChannel.vue
......@@ -9,6 +9,7 @@ import { throttle } from '@/utils/index'
import gameLogMixin from '@/mixins/gameLogMixin'
export default {
name: 'sendSelectChannel',
mixins: [gameLogMixin],
props: ['show', 'channelInfoList', 'chatUser'],
data() {
......
src/views/components/quickSendGame/vipTools.vue
......@@ -103,6 +103,7 @@
import { passwardEncryption,createVipUrl } from '@/api/game'
import { giftCodeList, sendGiftCode, getZyouAuthLink } from '@/api/works'
export default {
name: 'vipTools',
data() {
return {
disabled: true,
......
src/views/components/roleInfo/approval.vue
......@@ -252,6 +252,7 @@
import noContent from "@/components/noContent.vue";
import watchMember from '@/mixins/watchMember'
export default {
name: 'approval',
computed: {
...mapState('game', ['accountSelect']),
...mapState('user', ['userInfo'])
......
src/views/components/roleInfo/report.vue
......@@ -284,6 +284,7 @@
import shenpi5 from '@/assets/icon/shenpi5.svg'
import noContent from '@/components/noContent.vue'
export default {
name: 'report',
computed: {
...mapState('game', ['accountSelect']),
...mapState('user', ['cser_id','cser_name'])
......
src/views/components/roleInfo/roleInfo.vue
......@@ -122,6 +122,7 @@
import appeal from './layer/appeal.vue'
import watchMember from '@/mixins/watchMember'
export default {
name: 'roleInfo',
components: {
noContent,
appeal
......
src/views/components/skill/aiLibrary.vue
......@@ -232,7 +232,7 @@ import debounce from '@/directive/debounce/index'
import loadingChat from '@/directive/loading/index'
import { getCorpBetaConfig, getAiResponse, Aihistory, answerComment, calAnswerClickTime, getQuoteData } from '@/api/skill'
export default {
name: 'AiLibrary',
name: 'aiLibrary',
directives: {
debounce,
loadingChat
......
src/views/components/skill/skillCompany.vue
......@@ -58,6 +58,7 @@ import { mapState, mapMutations, mapActions } from 'vuex'
import { throttle, copyToClipboard } from '@/utils/index'
import {getMediaId} from '@/api/works'
export default {
name: 'skillCompany',
components: {},
props: {
activeName: {
......
src/views/components/skill/skillLibrary.vue
......@@ -62,6 +62,7 @@ import { mapState, mapMutations, mapActions } from 'vuex'
import { throttle, debounce, copyToClipboard,sendChatMessage } from '@/utils/index'
import noContent from '@/components/noContent.vue'
export default {
name: 'skillLibrary',
components: {
noContent
},
......
src/views/components/skill/skillPersonal.vue
......@@ -58,6 +58,7 @@ import {getMediaId} from '@/api/works'
import { mapState, mapMutations, mapActions } from 'vuex'
import { debounce, copyToClipboard } from '@/utils/index'
export default {
name: 'skillPersonal',
components: {},
props: {
activeName: {
......
src/views/giftRecord.vue
......@@ -15,7 +15,7 @@ import EmailGift from './components/giftRecord/emailGift.vue'
import WxGift from './components/giftRecord/wxGift.vue'
import { mapActions } from 'vuex'
export default {
name: 'GiftTab',
name: 'giftRecord',
components: {
EmailGift,
WxGift
......
src/views/login.vue
......@@ -48,6 +48,7 @@ import { mapMutations, mapState } from 'vuex'
import { getToken, setToken } from '@/utils/auth'
import jsApiList from '@/utils/jsApiList'
export default {
name: 'login',
components: {
},
data() {
......
src/views/mailList.vue
......@@ -166,7 +166,7 @@ import { debounce } from '@/utils/index'
import searchSelectUser from '@/components/searchSelectUser.vue'
export default {
name: 'MailList',
name: 'mailList',
components: {
searchSelectUser
},
......
src/views/orderList.vue
......@@ -177,6 +177,7 @@ import { throttle } from '@/utils'
import sanjiaoxing from '@/assets/icon/sanjiaoxing.svg'
import noContent from '@/components/noContent.vue'
export default {
name: 'orderList',
components: {
searchSelect,
refundLog,
......
src/views/quickReply.vue
......@@ -53,6 +53,7 @@ import skillPersonal from './components/skill/skillPersonal.vue'
import skillLibrary from './components/skill/skillLibrary.vue'
import { mapActions } from 'vuex'
export default {
name: 'quickReply',
components: {
skillCompany,
skillPersonal,
......
src/views/quickSendGame.vue
......@@ -24,6 +24,7 @@ import vipTools from './components/quickSendGame/vipTools.vue'
import sendGame from './components/quickSendGame/sendGame.vue'
import { mapActions } from 'vuex'
export default {
name: 'quickSendGame',
components: {
vipTools,
sendGame,
......
src/views/roleInfo.vue
......@@ -20,6 +20,7 @@ import report from './components/roleInfo/report.vue'
import approval from './components/roleInfo/approval.vue'
import { mapState } from 'vuex'
export default {
name: 'roleInfo',
components: {
roleInfo,
approval,
......
src/views/taskRecord.vue
......@@ -197,6 +197,7 @@ import { mapState } from 'vuex'
import textEditor from '@/components/textEditor.vue'
import NoContent from '@/components/noContent.vue'
export default {
name: 'taskRecord',
components: {
textEditor,
NoContent
......
src/views/userInfo/components/Info.vue
......@@ -226,7 +226,7 @@ import watchMember from '@/mixins/watchMember'
import { sendChatMessage } from '@/utils/index.js'
import { getToken,removeToken } from '@/utils/auth'
export default {
name: 'UserDetailsPanel',
name: 'info',
components: {
gameDetails,
changePhone,
......
src/views/userInfo/components/changePhone.vue
......@@ -15,6 +15,7 @@
import { bindMobile } from '@/api/game'
import { mapState } from 'vuex'
export default {
name: 'changePhone',
components: {
},
props: ['show', 'width', 'title', 'body', 'phone'],
......
src/views/userInfo/components/gameInfo/gameUserInfo.vue
......@@ -220,6 +220,7 @@
import ZyouTag from './ZyouTag.vue'
import { debounce } from '@/utils'
export default {
name: 'gameUserInfo',
components: {
ZyouTag
},
......
src/views/userInfo/components/shareInfo.vue
......@@ -56,7 +56,7 @@
import { shareInfoUpsert, shareInfoDel } from '@/api/works'
import { mapState } from 'vuex'
export default {
name: 'ShareInfo',
name: 'shareInfo',
props: ['chatUserDetails'],
data() {
return {
......
src/views/userInfo/userInfo.vue
......@@ -24,7 +24,7 @@ import violationRecord from '@/views/ViolationRecord.vue'
import { mapState, mapMutations } from 'vuex'
export default {
name: 'UserInfo',
name: 'userInfo',
components: {
Info,
roleInfo,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论