Skip to content

C
company_app
提交 9daf8372 作者: 毛细亚
操作

合并分支 'release' 到 'master' 

更新代码

查看合并请求 !2
上级 bdcdf05f 88656c38
正在显示 包含 294 行增加 和 174 行删除
.env.development
...@@ -7,5 +7,3 @@ VUE_APP_URL = 'http://localhost:9528' ...@@ -7,5 +7,3 @@ VUE_APP_URL = 'http://localhost:9528'
# 掌权登录跳转url # 掌权登录跳转url
NODE_ENV = 'development' NODE_ENV = 'development'
ENV = 'development' ENV = 'development'
isTestWx = true
\ No newline at end of file
.env.production
...@@ -4,3 +4,4 @@ NODE_ENV = 'production' ...@@ -4,3 +4,4 @@ NODE_ENV = 'production'
# base api # base api
VUE_APP_BASE_API = '/api/' VUE_APP_BASE_API = '/api/'
package.json
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build:prod": "vue-cli-service build --mode prod", "build:prod": "vue-cli-service build --mode production",
"build:stage": "vue-cli-service build --mode staging", "build:stage": "vue-cli-service build --mode staging",
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
......
src/api/works.js
...@@ -71,4 +71,22 @@ export function toTransfer(data) { ...@@ -71,4 +71,22 @@ export function toTransfer(data) {
method: 'post', method: 'post',
data data
}) })
} }
\ No newline at end of file // 修改共享信息
export function shareInfoUpsert(data) {
return request({
url: returnApi('/external_user/shareInfoUpsert'),
method: 'post',
data
})
}
// 解绑掌游账号
export function zyouUnBind(data) {
return request({
url: returnApi('/external_user/zyouUnBind'),
method: 'post',
data
})
}
\ No newline at end of file
src/assets/icon/shenpi6.svg
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<g id="5.反馈/3.Modal弹窗/展示/3空" transform="translate(1296, 0)"> <g id="5.反馈/3.Modal弹窗/展示/3空" transform="translate(1296, 0)">
<g id="已通过备份" transform="translate(554, 240)"> <g id="已通过备份" transform="translate(554, 240)">
<rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="50" height="50"></rect> <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="50" height="50"></rect>
<path d="M48.9604167,18.1563095 L41.587381,6.53083335 C40.9435714,5.51708335 39.5982143,5.21714287 38.5814286,5.85535713 L1.78476191,29.1335714 C0.770773828,29.777381 0.471071436,31.1227381 1.10791665,32.1336905 L8.48095239,43.7606548 C9.12482144,44.7718453 10.470119,45.0715477 11.4841667,44.4333929 L48.2822024,21.1567857 C49.2989881,20.512619 49.6044643,19.1689286 48.9604167,18.1563095 Z M47.4918452,19.907381 L10.6938095,43.1870238 C10.3683333,43.3920833 9.94232144,43.2960714 9.73726191,42.9719643 L2.36422617,31.3450595 C2.15910713,31.0195238 2.25517856,30.5949405 2.58065479,30.3870833 L39.380119,7.10886904 C39.7058929,6.90517856 40.1332143,7.00142856 40.3352976,7.32553569 L47.711369,18.9522619 C47.9092262,19.2707738 47.8117857,19.6981548 47.4918452,19.907381 Z M15.7707738,12.5301786 L16.3818452,13.9957143 L17.1735714,12.6204167 L18.7553571,12.4927381 L17.6897619,11.313869 L18.0526786,9.77208335 L16.6069048,10.4219643 L15.2488095,9.6 L15.4208333,11.1790476 L14.2161905,12.2060714 L15.7707738,12.5301786 L15.7707738,12.5301786 Z M25.1401786,8.16726191 L24.3800595,6.77196431 L23.73625,8.22470239 L22.1730357,8.52303569 L23.3532738,9.58142856 L23.1495833,11.1546429 L24.5263095,10.3586905 L25.9620833,11.04 L25.6307738,9.48541665 L26.7191667,8.33232144 L25.1401786,8.16726191 Z M39.4247619,31.540119 L38.1668452,30.5733333 L38.16125,32.1581548 L36.8475595,33.0489286 L38.3605357,33.5479762 L38.8064881,35.0695238 L39.7444643,33.7888095 L41.3320833,33.8332738 L40.3999405,32.5455357 L40.9377381,31.0581548 L39.4247619,31.540119 L39.4247619,31.540119 Z M34.2903571,37.8589286 L33.6909524,36.3889881 L32.8861905,37.75875 L31.3057738,37.8734524 L32.361369,39.0580357 L31.9855952,40.5982143 L33.4397619,39.9629762 L34.7923214,40.8032738 L34.6330357,39.2228571 L35.8376786,38.1974405 L34.2903571,37.8589286 L34.2903571,37.8589286 Z M24.884881,42.1558333 L25.6380357,43.5569643 L26.294881,42.1083929 L27.8580952,41.8289286 L26.6848214,40.758869 L26.900119,39.1870833 L25.5175595,39.9688095 L24.0889881,39.2775595 L24.4073214,40.8291071 L23.3030952,41.9780357 L24.884881,42.1558333 L24.884881,42.1558333 Z M10.7956548,18.6727381 L12.046369,19.655119 L12.0649405,18.0689286 L13.3844643,17.1825595 L11.879881,16.6733333 L11.4452976,15.1445833 L10.4959524,16.4166667 L8.90833335,16.3592262 L9.82767856,17.6529167 L9.27964287,19.1445238 L10.7956548,18.6727381 L10.7956548,18.6727381 Z M5.20952383,25.5207738 C5.04327383,18.8059524 8.30892861,12.1672024 14.3926786,8.31934521 C20.4777976,4.47142856 27.8752976,4.36238091 33.8844048,7.37720239 L35.3357738,6.45922617 C33.5575,5.46541665 31.6443453,4.73815474 29.6294048,4.28636904 C26.9373214,3.68113096 24.1952977,3.60529761 21.4845833,4.05130952 C18.6779167,4.51583335 16.0247024,5.52845239 13.6009524,7.06446431 C11.178631,8.6004167 9.12482144,10.562381 7.50416665,12.900119 C5.93517856,15.1545833 4.83238096,17.6659524 4.22571431,20.3535714 C3.77392861,22.3655357 3.61327383,24.4049405 3.75392856,26.437381 L5.20952383,25.5207738 Z M44.7254167,24.4939881 C44.898869,31.2088095 41.6332143,37.8475595 35.5494643,41.6940476 C29.4657143,45.546131 22.0669048,45.652381 16.0591071,42.637619 L14.6049405,43.5569643 C16.3832143,44.5479167 18.2977381,45.2767262 20.3129762,45.7283929 C23.0047619,46.333631 25.7468452,46.4125 28.4575,45.9634524 C31.2641667,45.498869 33.9174405,44.4876786 36.3397619,42.9516667 C38.7620833,41.4156547 40.8158929,39.4536905 42.4379167,37.117381 C44.001131,34.860119 45.1039286,32.3503571 45.7091667,29.6641071 C46.1623214,27.6505357 46.3202381,25.6097619 46.1795238,23.577381 L44.7254167,24.4939881 Z M18.781131,15.243631 C20.485,14.1680357 22.3593453,13.5941667 24.2410714,13.4795238 L26.4869048,12.0595833 C23.5195238,11.7096429 20.5480357,12.3780953 17.9838095,13.9973214 C15.4266071,15.6149405 13.5520833,18.0172619 12.6013095,20.8453571 L14.8457738,19.4256548 C15.7579762,17.7675596 17.0789286,16.3220238 18.781131,15.243631 Z M31.1595238,34.7697619 C29.4556548,35.8483929 27.5827381,36.4220238 25.7010119,36.5366667 L23.4564881,37.9566071 C26.4225,38.3065476 29.392619,37.6366667 31.9582143,36.0174405 C34.5154167,34.40125 36.3899405,31.9975 37.3392857,29.1694048 L35.0961905,30.5921429 C34.1841071,32.2427977 32.8617857,33.6941667 31.1595238,34.7697619 Z" id="形状" fill="#00BF8A" fill-rule="nonzero"></path> <path d="M48.9604167,18.1563095 L41.587381,6.53083335 C40.9435714,5.51708335 39.5982143,5.21714287 38.5814286,5.85535713 L1.78476191,29.1335714 C0.770773828,29.777381 0.471071436,31.1227381 1.10791665,32.1336905 L8.48095239,43.7606548 C9.12482144,44.7718453 10.470119,45.0715477 11.4841667,44.4333929 L48.2822024,21.1567857 C49.2989881,20.512619 49.6044643,19.1689286 48.9604167,18.1563095 Z M47.4918452,19.907381 L10.6938095,43.1870238 C10.3683333,43.3920833 9.94232144,43.2960714 9.73726191,42.9719643 L2.36422617,31.3450595 C2.15910713,31.0195238 2.25517856,30.5949405 2.58065479,30.3870833 L39.380119,7.10886904 C39.7058929,6.90517856 40.1332143,7.00142856 40.3352976,7.32553569 L47.711369,18.9522619 C47.9092262,19.2707738 47.8117857,19.6981548 47.4918452,19.907381 Z M15.7707738,12.5301786 L16.3818452,13.9957143 L17.1735714,12.6204167 L18.7553571,12.4927381 L17.6897619,11.313869 L18.0526786,9.77208335 L16.6069048,10.4219643 L15.2488095,9.6 L15.4208333,11.1790476 L14.2161905,12.2060714 L15.7707738,12.5301786 L15.7707738,12.5301786 Z M25.1401786,8.16726191 L24.3800595,6.77196431 L23.73625,8.22470239 L22.1730357,8.52303569 L23.3532738,9.58142856 L23.1495833,11.1546429 L24.5263095,10.3586905 L25.9620833,11.04 L25.6307738,9.48541665 L26.7191667,8.33232144 L25.1401786,8.16726191 Z M39.4247619,31.540119 L38.1668452,30.5733333 L38.16125,32.1581548 L36.8475595,33.0489286 L38.3605357,33.5479762 L38.8064881,35.0695238 L39.7444643,33.7888095 L41.3320833,33.8332738 L40.3999405,32.5455357 L40.9377381,31.0581548 L39.4247619,31.540119 L39.4247619,31.540119 Z M34.2903571,37.8589286 L33.6909524,36.3889881 L32.8861905,37.75875 L31.3057738,37.8734524 L32.361369,39.0580357 L31.9855952,40.5982143 L33.4397619,39.9629762 L34.7923214,40.8032738 L34.6330357,39.2228571 L35.8376786,38.1974405 L34.2903571,37.8589286 L34.2903571,37.8589286 Z M24.884881,42.1558333 L25.6380357,43.5569643 L26.294881,42.1083929 L27.8580952,41.8289286 L26.6848214,40.758869 L26.900119,39.1870833 L25.5175595,39.9688095 L24.0889881,39.2775595 L24.4073214,40.8291071 L23.3030952,41.9780357 L24.884881,42.1558333 L24.884881,42.1558333 Z M10.7956548,18.6727381 L12.046369,19.655119 L12.0649405,18.0689286 L13.3844643,17.1825595 L11.879881,16.6733333 L11.4452976,15.1445833 L10.4959524,16.4166667 L8.90833335,16.3592262 L9.82767856,17.6529167 L9.27964287,19.1445238 L10.7956548,18.6727381 L10.7956548,18.6727381 Z M5.20952383,25.5207738 C5.04327383,18.8059524 8.30892861,12.1672024 14.3926786,8.31934521 C20.4777976,4.47142856 27.8752976,4.36238091 33.8844048,7.37720239 L35.3357738,6.45922617 C33.5575,5.46541665 31.6443453,4.73815474 29.6294048,4.28636904 C26.9373214,3.68113096 24.1952977,3.60529761 21.4845833,4.05130952 C18.6779167,4.51583335 16.0247024,5.52845239 13.6009524,7.06446431 C11.178631,8.6004167 9.12482144,10.562381 7.50416665,12.900119 C5.93517856,15.1545833 4.83238096,17.6659524 4.22571431,20.3535714 C3.77392861,22.3655357 3.61327383,24.4049405 3.75392856,26.437381 L5.20952383,25.5207738 Z M44.7254167,24.4939881 C44.898869,31.2088095 41.6332143,37.8475595 35.5494643,41.6940476 C29.4657143,45.546131 22.0669048,45.652381 16.0591071,42.637619 L14.6049405,43.5569643 C16.3832143,44.5479167 18.2977381,45.2767262 20.3129762,45.7283929 C23.0047619,46.333631 25.7468452,46.4125 28.4575,45.9634524 C31.2641667,45.498869 33.9174405,44.4876786 36.3397619,42.9516667 C38.7620833,41.4156547 40.8158929,39.4536905 42.4379167,37.117381 C44.001131,34.860119 45.1039286,32.3503571 45.7091667,29.6641071 C46.1623214,27.6505357 46.3202381,25.6097619 46.1795238,23.577381 L44.7254167,24.4939881 Z M18.781131,15.243631 C20.485,14.1680357 22.3593453,13.5941667 24.2410714,13.4795238 L26.4869048,12.0595833 C23.5195238,11.7096429 20.5480357,12.3780953 17.9838095,13.9973214 C15.4266071,15.6149405 13.5520833,18.0172619 12.6013095,20.8453571 L14.8457738,19.4256548 C15.7579762,17.7675596 17.0789286,16.3220238 18.781131,15.243631 Z M31.1595238,34.7697619 C29.4556548,35.8483929 27.5827381,36.4220238 25.7010119,36.5366667 L23.4564881,37.9566071 C26.4225,38.3065476 29.392619,37.6366667 31.9582143,36.0174405 C34.5154167,34.40125 36.3899405,31.9975 37.3392857,29.1694048 L35.0961905,30.5921429 C34.1841071,32.2427977 32.8617857,33.6941667 31.1595238,34.7697619 Z" id="形状" fill="#3491FA " fill-rule="nonzero"></path>
<text id="已完成" transform="translate(25, 24.5) rotate(-32) translate(-25, -24.5)" font-family="STSongti-SC-Black, Songti SC" font-size="12" font-weight="700" fill="#00BF8A"> <text id="已完成" transform="translate(25, 24.5) rotate(-32) translate(-25, -24.5)" font-family="STSongti-SC-Black, Songti SC" font-size="12" font-weight="700" fill="#3491FA ">
<tspan x="7" y="29">已完成</tspan> <tspan x="7" y="29">已完成</tspan>
</text> </text>
</g> </g>
......
src/components/noContent.vue
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
// 图标主题色 // 图标主题色
.no-content-container[data-theme="primary"] .no-data-icon { .no-content-container[data-theme="primary"] .no-data-icon {
color: #00BF8A; color: #3491FA ;
} }
.no-content-container[data-theme="success"] .no-data-icon { .no-content-container[data-theme="success"] .no-data-icon {
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
position: absolute; position: absolute;
width: 6px; width: 6px;
height: 6px; height: 6px;
background: #00BF8A; background: #3491FA ;
border-radius: 50%; border-radius: 50%;
opacity: 0.6; opacity: 0.6;
} }
......
src/components/textEditor.vue
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
title="查看大图" title="查看大图"
append-to-body append-to-body
center center
top="50%"
:visible.sync="showScoleImage" :visible.sync="showScoleImage"
> >
<div class="showScoleImageContent columnFlex allCenter" v-html="remark"></div> <div class="showScoleImageContent columnFlex allCenter" v-html="remark"></div>
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
width: 100px; width: 100px;
} }
.watchImageText{ .watchImageText{
color: #00bf8a; color: #3491FA ;
cursor: pointer; cursor: pointer;
} }
.noActive { .noActive {
......
src/main.js
...@@ -5,30 +5,34 @@ import store from './store' ...@@ -5,30 +5,34 @@ import store from './store'
// import ElementUI from 'element-ui'; // import ElementUI from 'element-ui';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import _ from 'lodash'; import _ from 'lodash';
import ElementUI from 'element-ui';
import 'lib-flexible/flexible.js' import 'lib-flexible/flexible.js'
// Vue.use(ElementUI); // Vue.use(ElementUI);
import '@/styles/element-theme-colors.css'; // import '@/styles/element-theme-colors.css';
import '@/styles/index.scss'; import '@/styles/index.scss';
import moment from 'moment' import moment from 'moment'
import VConsole from 'vconsole'; import VConsole from 'vconsole';
import 'bi-element-ui/lib/bi-element-ui.css' // import 'bi-element-ui/lib/bi-element-ui.css'
import Element from 'bi-eleme' import Element from 'bi-eleme'
import 'bi-eleme/lib/theme-chalk/index.css' // import 'bi-eleme/lib/theme-chalk/index.css'
import BiElementUi from 'bi-element-ui' import BiElementUi from 'bi-element-ui'
import 'bi-element-ui/lib/bi-element-ui.css' // import 'bi-element-ui/lib/bi-element-ui.css'
import uploading from '@/utils/cos-upload' import uploading from '@/utils/cos-upload'
import 'element-ui/lib/theme-chalk/index.css';
if(process.env.NODE_ENV !== 'production'){ if(process.env.NODE_ENV !== 'production'){
new VConsole(); new VConsole();
} }
// 测试一下
Vue.use(uploading) Vue.use(uploading)
Vue.use(BiElementUi, { Vue.use(BiElementUi, {
dev: process.env.NODE_ENV !== 'production', dev: true,
env: process.env.NODE_ENV, env: 'development',
system: null system: null
}) })
Vue.use(Element, { Vue.use(Element, {
size: Cookies.get('size') || 'small' // set element-ui default size size: Cookies.get('size') || 'small' // set element-ui default size
// locale: enLang, // 如果使用中文，无需设置，请删除 // locale: enLang, // 如果使用中文，无需设置，请删除123132
}) })
new Vue({ new Vue({
router, router,
......
src/styles/element-variables.scss deleted 100644 → 0
/**
* I think element-ui's default theme color is too light for long-term use.
* So I modified the default color and you can modify it to your liking.
**/
/* theme color */
$--color-primary: #00BF8A;
// $--color-success: #13ce66;
// $--color-warning: #ffba00;
// $--color-danger: #ff4949;
// $--color-info: #1E1E1E;
$--button-font-weight: 400;
// $--color-text-regular: #1f2d3d;
$--border-color-light: #dfe4ed;
$--border-color-lighter: #e6ebf5;
$--table-border: 1px solid #dfe6ec;
/* icon font path, required */
$--font-path: '~bi-eleme/lib/theme-chalk/fonts';
@import '~bi-eleme/packages/theme-chalk/src/index';
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
:export {
theme: $--color-primary;
}
\ No newline at end of file
src/styles/index.scss
...@@ -541,7 +541,7 @@ li { ...@@ -541,7 +541,7 @@ li {
display: inline-block; display: inline-block;
width: 6px; width: 6px;
height: 6px; height: 6px;
background: #00bf8a; background: #3491FA ;
border-radius: 5px; border-radius: 5px;
margin-right: 4px; margin-right: 4px;
vertical-align: middle; vertical-align: middle;
...@@ -571,7 +571,7 @@ li { ...@@ -571,7 +571,7 @@ li {
border: 1px solid #c5ffe2; border: 1px solid #c5ffe2;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #46c988; color: #3491FA ;
padding: 0 5px; padding: 0 5px;
line-height: 12px; line-height: 12px;
font-size: 12px; font-size: 12px;
...@@ -588,4 +588,16 @@ li { ...@@ -588,4 +588,16 @@ li {
} }
/* ----------------- 适配企微客户端侧边栏 --------------------*/
.el-message-box{
max-width: 300px;
z-index: 10000 !important;
}
.el-message{
max-width: 300px;
z-index: 10000 !important;
}
src/styles/variables.scss
...@@ -7,15 +7,15 @@ $green: #30b08f; ...@@ -7,15 +7,15 @@ $green: #30b08f;
$tiffany: #4ab7bd; $tiffany: #4ab7bd;
$yellow: #fec171; $yellow: #fec171;
$panGreen: #30b08f; $panGreen: #30b08f;
$themeColor: #00BF8A; $themeColor: #3491FA;
$sidebarWidthOpen: 190px; $sidebarWidthOpen: 190px;
$sidebarWidthClosed: 56px; $sidebarWidthClosed: 56px;
$navbarHeight: 50px; $navbarHeight: 50px;
// sidebar // sidebar
$menuText: #606266; $menuText: #606266;
$menuActiveText: #00BF8A; $menuActiveText: #3491FA;
$subMenuActiveText: #00BF8A; // https://github.com/ElemeFE/element/issues/12951 $subMenuActiveText: #3491FA; // https://github.com/ElemeFE/element/issues/12951
$menuBg: #ffffff; $menuBg: #ffffff;
$menuHover: #E1FFF0; $menuHover: #E1FFF0;
......
src/views/components/bindGameAccount/addUser.vue
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<div class="table"> <div class="table account_table">
<div class="bind-account-title"> <div class="bind-account-title">
账号列表 账号列表
</div> </div>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<el-button <el-button
class="btn" class="btn"
size="small" size="small"
@click="$emit('update:show', false)" @click="close"
>取 消</el-button> >取 消</el-button>
</span> </span>
</el-drawer> </el-drawer>
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
} }
}, },
mounted() { mounted() {
}, },
methods: { methods: {
...mapActions('game', ['gameBindUser']), ...mapActions('game', ['gameBindUser']),
...@@ -306,6 +306,7 @@ ...@@ -306,6 +306,7 @@
close() { close() {
this.$emit('update:show', false) this.$emit('update:show', false)
this.resizeData() this.resizeData()
this.$emit('close')
}, },
onSubmit() { onSubmit() {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
...@@ -462,6 +463,7 @@ ...@@ -462,6 +463,7 @@
height: auto; height: auto;
padding-left: 20px; padding-left: 20px;
margin-top: -20px; margin-top: -20px;
margin-bottom: 150px;
.item { .item {
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
...@@ -483,6 +485,12 @@ ...@@ -483,6 +485,12 @@
} }
} }
} }
}
.account_table{
width: 100%;
height: auto;
overflow: auto;
} }
.account_type { .account_type {
color: #f56c6c; color: #f56c6c;
......
src/views/components/bindGameAccount/bindUserList.vue
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
:show.sync="showLayer" :show.sync="showLayer"
title="选择玩家" title="选择玩家"
width="60%" width="60%"
@close="close"
/> />
</div> </div>
</template> </template>
...@@ -83,6 +84,9 @@ export default { ...@@ -83,6 +84,9 @@ export default {
this.set_accountSelect(value) this.set_accountSelect(value)
} }
}, },
close(){
this.bindAccount = this.accountSelect
},
gameMemberView(item) { gameMemberView(item) {
if (this.accountSelect && this.accountSelect !== '') { if (this.accountSelect && this.accountSelect !== '') {
const data = { member_id: this.accountSelect, need_channel: 1, need_roleInfo: 1, need_banned: 1 } const data = { member_id: this.accountSelect, need_channel: 1, need_roleInfo: 1, need_banned: 1 }
...@@ -191,12 +195,12 @@ export default { ...@@ -191,12 +195,12 @@ export default {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
background: #ecfff6; background: #ecfff6;
color: #46c988; color: #3491FA ;
} }
::v-deep .el-input__suffix { ::v-deep .el-input__suffix {
// display: none; // display: none;
color: #46c988; color: #3491FA ;
} }
} }
......
src/views/components/bindGameAccount/userTable.vue
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
border: 1px solid #c5ffe2; border: 1px solid #c5ffe2;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #46c988; color: #3491FA ;
padding: 0 5px; padding: 0 5px;
max-width: 100%; max-width: 100%;
font-size: 12px; font-size: 12px;
......
src/views/login.vue
...@@ -62,6 +62,7 @@ export default { ...@@ -62,6 +62,7 @@ export default {
dingUserInfo: null, // 钉钉用户信息 dingUserInfo: null, // 钉钉用户信息
signData: null, // 企微签名数据 signData: null, // 企微签名数据
orgList: [], orgList: [],
organizationNum: 5,
urlParams:{}, urlParams:{},
currentOrg: {}, currentOrg: {},
showOrgDialog: false, showOrgDialog: false,
...@@ -74,6 +75,7 @@ export default { ...@@ -74,6 +75,7 @@ export default {
} }
}, },
async mounted() { async mounted() {
console.log(1231321321,'1231321321')
this.$nextTick(() => { this.$nextTick(() => {
this.initLogin() this.initLogin()
}) })
...@@ -118,10 +120,6 @@ export default { ...@@ -118,10 +120,6 @@ export default {
Cookies.set('userid',userid, { expires: 7 }) Cookies.set('userid',userid, { expires: 7 })
this.set_userid(userid) this.set_userid(userid)
}, },
cacheWx_userinfo(userinfo){
Cookies.set('wx_userinfo',JSON.stringify(userinfo), { expires: 7 })
this.set_userInfo(userinfo)
},
cacheCser(cser_id,cser_name){ cacheCser(cser_id,cser_name){
Cookies.set('cser_id',cser_id, { expires: 7 }) Cookies.set('cser_id',cser_id, { expires: 7 })
Cookies.set('cser_name',cser_name, { expires: 7 }) Cookies.set('cser_name',cser_name, { expires: 7 })
...@@ -140,7 +138,11 @@ export default { ...@@ -140,7 +138,11 @@ export default {
// 1. 企微静默授权 // 1. 企微静默授权
async startWeComSilentAuth() { async startWeComSilentAuth() {
this.urlParams = getParams(); this.urlParams = getParams();
const corp_id = Cookies.get('corp_id') const corp_id = this.urlParams.corp_id
if(!corp_id){
this.$message.error('当前客服号信息异常，请切换会话后重试')
return
}
// 确定是第一次进入页面 没有 code 和 state // 确定是第一次进入页面 没有 code 和 state
if (!this.urlParams.code && !this.urlParams.state) { if (!this.urlParams.code && !this.urlParams.state) {
// 跳转企微静默授权 // 跳转企微静默授权
...@@ -152,7 +154,6 @@ export default { ...@@ -152,7 +154,6 @@ export default {
// 用code // 用code
const res = await getAuthUser({ code: this.urlParams.code, url: window.location.href,corp_id:corp_id }); const res = await getAuthUser({ code: this.urlParams.code, url: window.location.href,corp_id:corp_id });
if (res.status_code === 1) { if (res.status_code === 1) {
// this.cacheWx_userinfo(res.data)
this.cacheuserid(res.data.userid) this.cacheuserid(res.data.userid)
this.initDingTalkLogin(); // 初始化钉钉扫码 this.initDingTalkLogin(); // 初始化钉钉扫码
} else { } else {
...@@ -233,7 +234,7 @@ export default { ...@@ -233,7 +234,7 @@ export default {
async initOrganization() { async initOrganization() {
const res = await getOrganization(); const res = await getOrganization();
if (res.data.status_code === 1) { if (res.data.status_code === 1) {
this.orgList = res.data.data.data; this.orgList = res.data.data.data.filter(item => item.id <= this.organizationNum)
// 默认组织逻辑：可根据业务自定义 // 默认组织逻辑：可根据业务自定义
this.initCurrentApp(); this.initCurrentApp();
} }
...@@ -307,6 +308,9 @@ export default { ...@@ -307,6 +308,9 @@ export default {
const corp_id = Cookies.get('corp_id') const corp_id = Cookies.get('corp_id')
if(ddParams.code=='error' && ddParams.msg){ if(ddParams.code=='error' && ddParams.msg){
this.$message.error(ddParams.msg) this.$message.error(ddParams.msg)
setTimeout(() => {
window.location.href = window.location.origin +'/company_app/index.html?corp_id='+corp_id+'&msg=error'
}, 5000)
return return
} }
if(ddParams.token && ddParams.token!='undefined'){ if(ddParams.token && ddParams.token!='undefined'){
...@@ -337,6 +341,7 @@ export default { ...@@ -337,6 +341,7 @@ export default {
font-weight: bold; font-weight: bold;
margin-right: 5px; margin-right: 5px;
} }
.loginContent{ .loginContent{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -371,7 +376,7 @@ export default { ...@@ -371,7 +376,7 @@ export default {
i { i {
line-height: 40px; line-height: 40px;
font-size: 26px; font-size: 26px;
color: #00BF8A; color: #3491FA ;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -400,7 +405,7 @@ export default { ...@@ -400,7 +405,7 @@ export default {
width: 40px; width: 40px;
height: 40px; height: 40px;
border: 4px solid #e0e0e0; border: 4px solid #e0e0e0;
border-top: 4px solid #00BF8A; border-top: 4px solid #3491FA ;
border-radius: 50%; border-radius: 50%;
animation: spin 1s linear infinite; animation: spin 1s linear infinite;
} }
......
src/views/userInfo/components/Info.vue
...@@ -4,14 +4,17 @@ ...@@ -4,14 +4,17 @@
class="userDetailsPanel columnFlex" class="userDetailsPanel columnFlex"
> >
<div class="content"> <div class="content">
<div v-if="chatUserDetails.is_phishing_account==1" class="warnText">
<p>高风险玩家,请立即通知组长！！！！</p>
<p>①千万不能推转游！！不要发送违禁词汇！！不要发送礼包和告知任何礼包信息！！</p>
<p>②不能以任何形式推送APP/网页链接，也不可承认有APP/网页端口！！</p>
</div>
<div <div
v-if="change_appraisal" v-if="change_appraisal && false"
style=" style="
font-size: 28px; font-size: 12px;
color: red; color: red;
text-align: center; text-align: center;
margin-bottom: 20px;
line-height: 40px;
" "
> >
钓鱼号 禁止转端通知组长! 钓鱼号 禁止转端通知组长!
...@@ -19,15 +22,16 @@ ...@@ -19,15 +22,16 @@
<div <div
v-else-if="gameUserInfo.exp_ip" v-else-if="gameUserInfo.exp_ip"
style=" style="
font-size: 28px; font-size: 12px;
color: red; color: red;
text-align: center; text-align: center;
margin-bottom: 20px;
line-height: 40px;
" "
> >
高风险用户,禁止转端 !!! 高风险用户,禁止转端 !!!
</div> </div>
<div class="cser_name">
<span>当前客服：{{ cser_name }}</span>
</div>
<div class="item rowFlex"> <div class="item rowFlex">
<!-- 公共的信息 --> <!-- 公共的信息 -->
<el-image <el-image
...@@ -57,8 +61,8 @@ ...@@ -57,8 +61,8 @@
> >
<el-button-group> <el-button-group>
<el-button size="mini" @click="zyouUnBindConfirm">解绑</el-button> <el-button size="mini" @click="zyouUnBindConfirm">解绑</el-button>
<el-button size="mini" @click="autoResetPassword">修改密码</el-button> <!-- <el-button size="mini" @click="autoResetPassword">修改密码</el-button>
<el-button size="mini" @click="changePhoneClick">修改手机号</el-button> <el-button size="mini" @click="changePhoneClick">修改手机号</el-button> -->
<el-button v-if="!chatUserDetails.bind_cser" size="mini" @click="relationKfh">关联客服</el-button> <el-button v-if="!chatUserDetails.bind_cser" size="mini" @click="relationKfh">关联客服</el-button>
<el-button size="mini" v-if="false" @click="errorHandle">误操作</el-button> <el-button size="mini" v-if="false" @click="errorHandle">误操作</el-button>
</el-button-group> </el-button-group>
...@@ -177,13 +181,13 @@ ...@@ -177,13 +181,13 @@
</div> </div>
</template> </template>
<script> <script>
import { mapState } from 'vuex' import { mapState,mapMutations } from 'vuex'
import gameDetails from './gameInfo/gameUserInfo.vue' import gameDetails from './gameInfo/gameUserInfo.vue'
import shareInfo from './shareInfo.vue' import shareInfo from './shareInfo.vue'
import changePhone from './changePhone.vue' import changePhone from './changePhone.vue'
import watchMember from '@/mixins/watchMember' import watchMember from '@/mixins/watchMember'
import { zyouUnBind,autoResetPassword,bindUserSelfAdd } from '@/api/game' import { autoResetPassword,bindUserSelfAdd } from '@/api/game'
import { memberBindCser,editUser } from '@/api/works' import { memberBindCser,editUser,zyouUnBind } from '@/api/works'
export default { export default {
name: 'UserDetailsPanel', name: 'UserDetailsPanel',
components: { components: {
...@@ -223,6 +227,7 @@ import watchMember from '@/mixins/watchMember' ...@@ -223,6 +227,7 @@ import watchMember from '@/mixins/watchMember'
mounted() { mounted() {
}, },
methods: { methods: {
...mapMutations('game', ['set_accountSelect']),
memberChange() { memberChange() {
this.requestBindUser() this.requestBindUser()
}, },
...@@ -258,18 +263,19 @@ import watchMember from '@/mixins/watchMember' ...@@ -258,18 +263,19 @@ import watchMember from '@/mixins/watchMember'
}, },
zyouUnBind() { zyouUnBind() {
const data = { const data = {
userid: this.selectUser.userid, userid: this.chatUserDetails.userid,
external_userid: this.chatUserDetails.external_userid, external_userid: this.chatUserDetails.external_userid,
member_id: this.accountSelect member_id: this.accountSelect
} }
zyouUnBind(data).then((res) => { zyouUnBind(data).then((res) => {
if (res.status_code == 1) { if (res.status_code == 1) {
this.$message.success(res.msg) this.$message.success(res.msg)
this.set_selectWindow() const index = this.bindGameUserList.findIndex(item => item.member_id == this.accountSelect)
this.bindGameUserList.splice(index,1)
this.set_accountSelect(this.bindGameUserList[0].member_id)
} }
}) })
}, },
// 修改密码 之前是客服手动设置密码 现在改成系统自动设置密码 // 修改密码 之前是客服手动设置密码 现在改成系统自动设置密码
autoResetPassword() { autoResetPassword() {
this.$confirm('确认重置密码吗？密码重置后玩家将无法登录，请谨慎操作！', '重置密码', { this.$confirm('确认重置密码吗？密码重置后玩家将无法登录，请谨慎操作！', '重置密码', {
...@@ -391,7 +397,20 @@ import watchMember from '@/mixins/watchMember' ...@@ -391,7 +397,20 @@ import watchMember from '@/mixins/watchMember'
background-color: #fff; background-color: #fff;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
margin-top: 20px; .warnText{
width:100%;
height:auto;
font-weight: 600;
font-size: 18px;
p{
color: #F56C6C;
line-height: 25px;
}
}
.cser_name{
font-size: 14px;
margin-bottom: 10px;
}
.detailsTitle { .detailsTitle {
height: 50px; height: 50px;
padding: 0 20px; padding: 0 20px;
...@@ -401,6 +420,17 @@ import watchMember from '@/mixins/watchMember' ...@@ -401,6 +420,17 @@ import watchMember from '@/mixins/watchMember'
font-weight: 600; font-weight: 600;
} }
} }
.warnText{
width:100%;
height:auto;
font-weight: 600;
font-size: 18px;
margin-bottom: 10px;
p{
color: #F56C6C;
line-height: 25px;
}
}
.content { .content {
width: 100%; width: 100%;
...@@ -412,8 +442,8 @@ import watchMember from '@/mixins/watchMember' ...@@ -412,8 +442,8 @@ import watchMember from '@/mixins/watchMember'
position: relative; position: relative;
.tableImage { .tableImage {
width: 40px; width: 50px;
height: 40px; height: 50px;
border-radius: 4px; border-radius: 4px;
margin-right: 10px; margin-right: 10px;
} }
...@@ -430,7 +460,7 @@ import watchMember from '@/mixins/watchMember' ...@@ -430,7 +460,7 @@ import watchMember from '@/mixins/watchMember'
} }
.noBind { .noBind {
color: #00bf8a; color: #3491FA ;
cursor: pointer; cursor: pointer;
margin-right: 10px; margin-right: 10px;
} }
......
src/views/userInfo/components/RoleInfo.vue
<template> <template>
<div class="roleTab"> <div class="roleTab">
<el-tabs v-model="roleActive" @tab-click="handleClick">
<el-tab-pane label="角色信息" name="role">
<userInfo v-if="roleActive==='role'" /> <el-radio-group v-model="roleActive" >
</el-tab-pane> <el-radio-button border label="role">角色信息</el-radio-button>
<!-- <el-tab-pane label="举报记录" name="report"> <el-radio-button border label="approval">申诉记录</el-radio-button>
<report v-show="roleActive==='report'" /> </el-radio-group>
</el-tab-pane> <userInfo v-if="roleActive==='role'" />
--> <approval v-else-if="roleActive==='approval'" />
<el-tab-pane label="申诉记录" name="approval">
<approval v-if="roleActive==='approval'" />
</el-tab-pane>
</el-tabs>
</div> </div>
</template> </template>
......
src/views/userInfo/components/ViolationRecord.vue
...@@ -123,9 +123,9 @@ ...@@ -123,9 +123,9 @@
<el-dialog <el-dialog
title="查看大图" title="查看大图"
:visible.sync="imageLayer" :visible.sync="imageLayer"
width="50%" width="320px"
center
append-to-body append-to-body
fit="contain"
@close="imageLayer = false" @close="imageLayer = false"
> >
<div <div
...@@ -238,7 +238,7 @@ export default { ...@@ -238,7 +238,7 @@ export default {
.layerImage { .layerImage {
img { img {
max-width: 800px; max-width: 300px;
} }
} }
</style> </style>
...@@ -246,7 +246,7 @@ export default { ...@@ -246,7 +246,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.details { .details {
width:100%; width:100%;
height: calc(100vh - 150px); height: calc(100vh - 170px);
background: #fff; background: #fff;
margin-left: 2px; margin-left: 2px;
.content { .content {
...@@ -258,10 +258,8 @@ export default { ...@@ -258,10 +258,8 @@ export default {
.contentMain { .contentMain {
} }
.contentItem { .contentItem {
border-bottom: 1px dashed #ebeef5; border-bottom: 1px dashed #ebeef5;
margin-top: 10px;
} }
.remarkType { .remarkType {
...@@ -273,7 +271,7 @@ export default { ...@@ -273,7 +271,7 @@ export default {
} }
.label { .label {
color: #99a3b4; color: #86909C;
margin-right: 5px; margin-right: 5px;
} }
...@@ -305,7 +303,7 @@ export default { ...@@ -305,7 +303,7 @@ export default {
::v-deep .el-collapse-item__header { ::v-deep .el-collapse-item__header {
width: 100%; width: 100%;
height: 44px; height: 44px;
background: #f9faff; background: #F7F8FA;
color: #333333; color: #333333;
padding-left: 80px; padding-left: 80px;
font-size: 14px; font-size: 14px;
...@@ -313,7 +311,7 @@ export default { ...@@ -313,7 +311,7 @@ export default {
} }
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 10px; margin-bottom: 5px;
} }
} }
......
src/views/userInfo/components/gameInfo/ZyouTag.vue
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
.el-icon-circle-plus{ .el-icon-circle-plus{
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
color: #00bf8a !important; color: #3491FA !important;
} }
} }
.tag-list { .tag-list {
......
src/views/userInfo/components/gameInfo/gameUserInfo.vue
<template> <template>
<div class="gameUserDetails"> <div class="gameUserDetails">
<!-- 智能标签 --> <!-- 智能标签 -->
<div class="item rowFlex columnCenter spaceBetween"> <div class="item rowFlex columnCenter">
<div class="rowFlex columnCenter"> <div class="rowFlex columnCenter">
<span class="label" style="min-width:60px;">智能标签:</span> <span class="label" style="min-width:60px;">智能标签:</span>
<p class="text"> <p class="text">
...@@ -174,11 +174,31 @@ ...@@ -174,11 +174,31 @@
<div v-if="gameUserInfo.service_wechat_number_info && gameUserInfo.service_wechat_number_info.length>0" class="item rowFlex columnCenter spaceBetween"> <div v-if="gameUserInfo.service_wechat_number_info && gameUserInfo.service_wechat_number_info.length>0" class="item rowFlex columnCenter spaceBetween">
<div class="columnFlex " style="width:100%;"> <div class="columnFlex " style="width:100%;">
<span class="label">客服微信号:</span> <span class="label">客服微信号:</span>
<div v-for="(item,index) in gameUserInfo.service_wechat_number_info" :key="index" class="rowFlex columnCenter " style="margin-top:10px;width:100%;"> <div class="rowFlex columnCenter" style="margin-top:10px;width:100%;">
<p class="hidden wxName">{{ item.service_wechat_number_name }}({{ item.service_type_name }})</p> <!-- 显示第一个微信号 -->
<span class="bradge">{{ item.type_name }}</span> <div class="rowFlex columnCenter">
<div class="colorStatus rowFlex columnCenter" style="margin-left: 10px;"> <p class="hidden wxName">{{ gameUserInfo.service_wechat_number_info[0].service_wechat_number_name }}({{ gameUserInfo.service_wechat_number_info[0].service_type_name }})</p>
<span v-if="item.loss_status==1" class="fail">{{ item.loss_status_text }}</span> <span class="bradge">{{ gameUserInfo.service_wechat_number_info[0].type_name }}</span>
<div class="colorStatus rowFlex columnCenter" style="margin-left: 10px;">
<span v-if="gameUserInfo.service_wechat_number_info[0].loss_status==1" class="fail">{{ gameUserInfo.service_wechat_number_info[0].loss_status_text }}</span>
</div>
</div>
<!-- 如果有多个，显示 +n -->
<div v-if="gameUserInfo.service_wechat_number_info.length > 1">
<el-popover
placement="top"
trigger="hover"
width="300"
>
<div v-for="(item,index) in gameUserInfo.service_wechat_number_info.slice(1)" :key="index" class="rowFlex columnCenter" style="margin-bottom:10px;">
<p class="hidden wxName">{{ item.service_wechat_number_name }}({{ item.service_type_name }})</p>
<span class="bradge">{{ item.type_name }}</span>
<div class="colorStatus rowFlex columnCenter" style="margin-left: 10px;">
<span v-if="item.loss_status==1" class="fail">{{ item.loss_status_text }}</span>
</div>
</div>
<el-button slot="reference" type="text" style="font-size: 14px;">+{{ gameUserInfo.service_wechat_number_info.length - 1 }}</el-button>
</el-popover>
</div> </div>
</div> </div>
</div> </div>
...@@ -375,9 +395,9 @@ import { debounce } from '@/utils' ...@@ -375,9 +395,9 @@ import { debounce } from '@/utils'
.changeUser{ .changeUser{
font-size: 18px; font-size: 18px;
transform: rotate(90deg); transform: rotate(90deg);
color: #00bf8a; color: #3491FA ;
margin-left: 10px; margin-left: 10px;
margin-top: -3px; margin-top: -5px;
:first-child{ :first-child{
margin-right: -5px; margin-right: -5px;
} }
...@@ -388,7 +408,7 @@ import { debounce } from '@/utils' ...@@ -388,7 +408,7 @@ import { debounce } from '@/utils'
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
padding: 10px 0; padding: 5px 0;
transition: all 0.5s; transition: all 0.5s;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
...@@ -396,7 +416,7 @@ import { debounce } from '@/utils' ...@@ -396,7 +416,7 @@ import { debounce } from '@/utils'
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 6px; border-radius: 6px;
margin-right: vw(10); margin-right: 5px;
} }
.wxName{ .wxName{
max-width: 80%; max-width: 80%;
...@@ -413,7 +433,8 @@ import { debounce } from '@/utils' ...@@ -413,7 +433,8 @@ import { debounce } from '@/utils'
margin-left: 10px; margin-left: 10px;
} }
.label { .label {
color: #999999; color: #86909C;
font-size: 14px;
} }
.text { .text {
color: #333333; color: #333333;
...@@ -431,11 +452,11 @@ import { debounce } from '@/utils' ...@@ -431,11 +452,11 @@ import { debounce } from '@/utils'
width: 44px; width: 44px;
height: 22px; height: 22px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #00bf8a; border: 1px solid #3491FA ;
font-size: 12px; font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #00bf8a; color: #3491FA ;
margin-left: 30px; margin-left: 30px;
cursor: pointer; cursor: pointer;
} }
...@@ -464,11 +485,15 @@ import { debounce } from '@/utils' ...@@ -464,11 +485,15 @@ import { debounce } from '@/utils'
.item:hover .icon { .item:hover .icon {
display: block; display: block;
} }
.el-icon-sort-up{
font-size: 16px;
}
} }
.refreshList { .refreshList {
color: #00bf8a; color: #3491FA ;
cursor: pointer; cursor: pointer;
font-size: 18px; font-size: 18px;
margin-left: 20px;
} }
.refreshListActive{ .refreshListActive{
animation:rotate 0.5s linear infinite ; animation:rotate 0.5s linear infinite ;
...@@ -482,4 +507,16 @@ import { debounce } from '@/utils' ...@@ -482,4 +507,16 @@ import { debounce } from '@/utils'
} }
} }
</style> </style>
<style>
.wxName{
max-width: 80%;
}
.bradge{
padding: 2px 5px;
border-radius: 3px;
background: #f4f4f5;
color: #909399;
margin-left: 10px;
}
</style>
\ No newline at end of file
src/views/userInfo/components/roleInfo/appeal.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
:lock-scroll="true" :lock-scroll="true"
title="玩家申诉" title="玩家申诉"
:visible="show" :visible="show"
size="400px" size="300px"
:append-to-body="true" :append-to-body="true"
@close="close" @close="close"
> >
......
src/views/userInfo/components/roleInfo/approval.vue
<template> <template>
<div class="approval-role-list columnFlex"> <div class="approval-role-list columnFlex">
<el-form ref="taskForm" :model="reportForm" class="taskForm" label-width="85px"> <el-form ref="taskForm" :model="reportForm" :inline="true" class="taskForm" label-width="85px">
<el-form-item label="角色名称"> <el-form-item label="角色名称">
<el-input <el-input
v-model="reportForm.role_name" v-model="reportForm.role_name"
style="width:95%;"
clearable clearable
placeholder="请输入角色名称" placeholder="请输入角色名称"
@change="filterChange" @change="filterChange"
...@@ -14,7 +13,6 @@ ...@@ -14,7 +13,6 @@
<el-form-item label="审批状态"> <el-form-item label="审批状态">
<el-select <el-select
v-model="reportForm.approval_status" v-model="reportForm.approval_status"
style="width:95%;"
clearable clearable
placeholder="请选择审批状态" placeholder="请选择审批状态"
@change="filterChange" @change="filterChange"
...@@ -26,7 +24,6 @@ ...@@ -26,7 +24,6 @@
<el-form-item label="申请方式"> <el-form-item label="申请方式">
<el-select <el-select
v-model="reportForm.register_type" v-model="reportForm.register_type"
style="width:95%;"
clearable clearable
placeholder="请选择申请方式" placeholder="请选择申请方式"
@change="filterChange" @change="filterChange"
...@@ -40,7 +37,7 @@ ...@@ -40,7 +37,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间范围"> <!-- <el-form-item label="时间范围">
<BiDatePicker <BiDatePicker
v-model="reportForm.create_time" v-model="reportForm.create_time"
style="width: 95%" style="width: 95%"
...@@ -55,7 +52,31 @@ ...@@ -55,7 +52,31 @@
end-placeholder="结束日期" end-placeholder="结束日期"
@change="createResult" @change="createResult"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="开始时间">
<el-date-picker
v-model="reportForm.create_time_start"
type="datetime"
style="width: 100%;"
value-format="yyyy-MM-dd HH:mm:ss"
@change="createResult"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker
v-model="reportForm.create_time_end"
type="datetime"
style="width: 100%;"
@change="endResult"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="filterChange">搜索</el-button>
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form> </el-form>
<div <div
v-infinite-scroll="paperScroll" v-infinite-scroll="paperScroll"
...@@ -199,7 +220,7 @@ ...@@ -199,7 +220,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-dialog :visible.sync="dialogRemarkVisible" append-to-body title="查看大图" custom-class="remake-dialog"> <el-dialog :visible.sync="dialogRemarkVisible" top="50%" center append-to-body title="查看大图" custom-class="remake-dialog">
<div class="remake-box"> <div class="remake-box">
<div v-html="dialogRemake"></div> <div v-html="dialogRemake"></div>
</div> </div>
...@@ -260,7 +281,6 @@ import { debounce } from '@/utils' ...@@ -260,7 +281,6 @@ import { debounce } from '@/utils'
role_name: '', role_name: '',
register_type: 1, register_type: 1,
approval_status: '', approval_status: '',
create_time: [],
create_time_start: '', create_time_start: '',
create_time_end: '' create_time_end: ''
}, },
...@@ -280,9 +300,7 @@ import { debounce } from '@/utils' ...@@ -280,9 +300,7 @@ import { debounce } from '@/utils'
taskTypeList: [] taskTypeList: []
} }
}, },
// 9111321331231903744
mounted() { mounted() {
this.reportForm.create_time = [this.$moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss'), this.$moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')]
this.reportForm.create_time_start = this.$moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss') this.reportForm.create_time_start = this.$moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss')
this.reportForm.create_time_end = this.$moment().endOf('day').format('YYYY-MM-DD HH:mm:ss') this.reportForm.create_time_end = this.$moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
this.requstApprovalList() this.requstApprovalList()
...@@ -290,24 +308,37 @@ import { debounce } from '@/utils' ...@@ -290,24 +308,37 @@ import { debounce } from '@/utils'
this.filterChange() this.filterChange()
}, },
methods: { methods: {
resetForm(){
this.reportForm={
customer_id: '',
member_id: '',
role_id: '',
username: '',
role_name: '',
register_type: 1,
approval_status: '',
create_time_start: this.$moment().subtract(1, 'months').format('YYYY-MM-DD HH:mm:ss') ,
create_time_end: this.$moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
}
},
memberChange() { memberChange() {
this.filterChange() this.filterChange()
}, },
filterChange() { filterChange() {
if (this.$moment(this.reportForm.create_time_start).isAfter(this.$moment(this.reportForm.create_time_end))) {
this.$message.warning('开始时间不能大于结束时间')
return
}
this.pageInfo.page = 1 this.pageInfo.page = 1
this.reportList = [] this.reportList = []
this.isMoreRecord = true this.isMoreRecord = true
this.appealList() this.appealList()
}, },
createResult(data) { createResult(data) {
if (data) { this.reportForm.create_time_start = data
this.reportForm.create_time_start = data[0] },
this.reportForm.create_time_end = data[1] endResult(data){
} else { this.reportForm.create_time_end = data
this.reportForm.create_time_start = ''
this.reportForm.create_time_end = ''
}
this.filterChange()
}, },
async requstApprovalList() { async requstApprovalList() {
const data = { const data = {
...@@ -468,7 +499,7 @@ import { debounce } from '@/utils' ...@@ -468,7 +499,7 @@ import { debounce } from '@/utils'
<style lang="scss" scoped> <style lang="scss" scoped>
.approval-role-list { .approval-role-list {
width: 100%; width: 100%;
height: calc(100vh - 186px); height: calc(100vh - 200px);
overflow: auto; overflow: auto;
padding-top: 10px; padding-top: 10px;
.taskForm { .taskForm {
...@@ -503,7 +534,7 @@ import { debounce } from '@/utils' ...@@ -503,7 +534,7 @@ import { debounce } from '@/utils'
font-size: 12px; font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #00bf8a; color: #3491FA ;
border: none; border: none;
} }
...@@ -557,7 +588,7 @@ import { debounce } from '@/utils' ...@@ -557,7 +588,7 @@ import { debounce } from '@/utils'
width: 100%; width: 100%;
.label { .label {
font-weight: 400; font-weight: 500;
font-size: 14px; font-size: 14px;
color: #86909c; color: #86909c;
line-height: 20px; line-height: 20px;
...@@ -565,7 +596,7 @@ import { debounce } from '@/utils' ...@@ -565,7 +596,7 @@ import { debounce } from '@/utils'
} }
.value { .value {
font-weight: 400; font-weight: 500;
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
line-height: 20px; line-height: 20px;
...@@ -632,8 +663,8 @@ import { debounce } from '@/utils' ...@@ -632,8 +663,8 @@ import { debounce } from '@/utils'
} }
::v-deep .el-step>.is-success { ::v-deep .el-step>.is-success {
color: #00bf8a; color: #3491FA ;
border-color: #00bf8a; border-color: #3491FA ;
.el-step__line { .el-step__line {
background-color: #e5e6eb; background-color: #e5e6eb;
...@@ -641,12 +672,12 @@ import { debounce } from '@/utils' ...@@ -641,12 +672,12 @@ import { debounce } from '@/utils'
} }
::v-deep .el-step__main>.is-success { ::v-deep .el-step__main>.is-success {
color: #00bf8a; color: #3491FA ;
} }
::v-deep .el-step>.is-process { ::v-deep .el-step>.is-process {
color: #00bf8a; color: #3491FA ;
border-color: #00bf8a; border-color: #3491FA ;
.el-step__line { .el-step__line {
background-color: #e5e6eb; background-color: #e5e6eb;
...@@ -654,7 +685,7 @@ import { debounce } from '@/utils' ...@@ -654,7 +685,7 @@ import { debounce } from '@/utils'
} }
::v-deep .el-step__main>.is-process { ::v-deep .el-step__main>.is-process {
color: #00bf8a; color: #3491FA ;
} }
.form-item-btn { .form-item-btn {
...@@ -675,7 +706,7 @@ import { debounce } from '@/utils' ...@@ -675,7 +706,7 @@ import { debounce } from '@/utils'
.preview-btn { .preview-btn {
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
color: #00bf8a; color: #3491FA ;
margin: 0 0 0 10px; margin: 0 0 0 10px;
i { i {
...@@ -831,7 +862,7 @@ import { debounce } from '@/utils' ...@@ -831,7 +862,7 @@ import { debounce } from '@/utils'
} }
.info-value-color { .info-value-color {
color: #00bf8a; color: #3491FA ;
margin-left: 5px; margin-left: 5px;
} }
} }
...@@ -888,4 +919,5 @@ import { debounce } from '@/utils' ...@@ -888,4 +919,5 @@ import { debounce } from '@/utils'
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 20px; margin-top: 20px;
} }
</style> </style>
\ No newline at end of file
\ No newline at end of file
src/views/userInfo/components/roleInfo/report.vue
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<div class="reportItemRight columnFlex columnCenter"> <div class="reportItemRight columnFlex columnCenter">
<!-- 撤销 当item.create_user_id == zq_user_id 的时候才可以撤销 只能撤销自己提交的审批 --> <!-- 撤销 当item.create_user_id == zq_user_id 的时候才可以撤销 只能撤销自己提交的审批 -->
<el-button <el-button
v-if="item.approval_status == 1 && (item.create_user_id == userInfo.id)" v-if="item.approval_status == 1 && (item.create_user_id == cser_id)"
type="primary" type="primary"
size="mini" size="mini"
@click.stop="handleReport(item)" @click.stop="handleReport(item)"
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
export default { export default {
computed: { computed: {
...mapState('game', ['accountSelect', 'report_is_send']), ...mapState('game', ['accountSelect', 'report_is_send']),
...mapState('user', ['userInfo']) ...mapState('user', ['cser_id','cser_name'])
}, },
components: { components: {
resubmitReport, resubmitReport,
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
font-size: 12px; font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #00bf8a; color: #3491FA ;
border: none; border: none;
} }
...@@ -679,8 +679,8 @@ ...@@ -679,8 +679,8 @@
} }
::v-deep .el-step > .is-success { ::v-deep .el-step > .is-success {
color: #00bf8a; color: #3491FA ;
border-color: #00bf8a; border-color: #3491FA ;
.el-step__line { .el-step__line {
background-color: #e5e6eb; background-color: #e5e6eb;
...@@ -688,12 +688,12 @@ ...@@ -688,12 +688,12 @@
} }
::v-deep .el-step__main > .is-success { ::v-deep .el-step__main > .is-success {
color: #00bf8a; color: #3491FA ;
} }
::v-deep .el-step > .is-process { ::v-deep .el-step > .is-process {
color: #00bf8a; color: #3491FA ;
border-color: #00bf8a; border-color: #3491FA ;
.el-step__line { .el-step__line {
background-color: #e5e6eb; background-color: #e5e6eb;
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,7 @@
} }
::v-deep .el-step__main > .is-process { ::v-deep .el-step__main > .is-process {
color: #00bf8a; color: #3491FA ;
} }
.form-item-btn { .form-item-btn {
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
.preview-btn { .preview-btn {
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
color: #00bf8a; color: #3491FA ;
margin: 0 0 0 10px; margin: 0 0 0 10px;
i { i {
...@@ -878,7 +878,7 @@ ...@@ -878,7 +878,7 @@
} }
.info-value-color { .info-value-color {
color: #00bf8a; color: #3491FA ;
margin-left: 5px; margin-left: 5px;
} }
} }
......
src/views/userInfo/components/roleInfo/userInfo.vue
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
::v-deep .el-collapse-item__header { ::v-deep .el-collapse-item__header {
width: 100%; width: 100%;
height: 44px; height: 44px;
background: #f9faff; background: #F7F8FA;
color: #333333; color: #333333;
padding-left: 10px; padding-left: 10px;
font-size: 14px; font-size: 14px;
......
src/views/userInfo/components/shareInfo.vue
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
} }
.label { .label {
color: #999999; color: #999999;
width: vw(125); width: 120px;
} }
.text { .text {
color: #333333; color: #333333;
...@@ -165,11 +165,11 @@ ...@@ -165,11 +165,11 @@
width: 44px; width: 44px;
height: 22px; height: 22px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #00bf8a; border: 1px solid #3491FA ;
font-size: 12px; font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #00bf8a; color: #3491FA ;
margin-left: 30px; margin-left: 30px;
cursor: pointer; cursor: pointer;
} }
......
src/views/userInfo/userInfo.vue
...@@ -57,13 +57,20 @@ export default { ...@@ -57,13 +57,20 @@ export default {
}, },
methods:{ methods:{
...mapMutations('game',['set_chatUserInfo']), ...mapMutations('game',['set_chatUserInfo']),
...mapMutations('user',['set_userid','set_corp_id','set_token','set_cser_info','set_cser_id','set_cser_name']), ...mapMutations('user',['set_userid','set_corp_id','set_token','set_cser_info','set_cser_id','set_cser_name','set_userInfo']),
initVuexValue(){ initVuexValue(){
this.set_userid(Cookies.get('userid')) this.set_userid(Cookies.get('userid'))
this.set_corp_id(Cookies.get('corp_id')) this.set_corp_id(Cookies.get('corp_id'))
this.set_token(Cookies.get('token')) this.set_token(Cookies.get('token'))
this.set_cser_id(Cookies.get('cser_id')) this.set_cser_id(Cookies.get('cser_id'))
this.set_cser_name(Cookies.get('cser_name')) this.set_cser_name(Cookies.get('cser_name'))
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)
const cser_info = Cookies.get('cser_info') const cser_info = Cookies.get('cser_info')
console.log(Cookies.get('cser_id'),'cser_info',Cookies.get('cser_name')) console.log(Cookies.get('cser_id'),'cser_info',Cookies.get('cser_name'))
cser_info?this.set_cser_info(JSON.parse(cser_info)):this.set_cser_info({}) cser_info?this.set_cser_info(JSON.parse(cser_info)):this.set_cser_info({})
...@@ -78,5 +85,6 @@ export default { ...@@ -78,5 +85,6 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
font-size: 14px;
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论