-
-
+
+
+
请完成安全验证
-
+
diff --git a/template/admin/src/config/index.js b/template/admin/src/config/index.js
index 0d8aaf0a6..c847a051e 100644
--- a/template/admin/src/config/index.js
+++ b/template/admin/src/config/index.js
@@ -13,7 +13,7 @@ export default {
/**
* @description 配置显示在浏览器标签的title
*/
- title: localStorage.getItem('ADMIN_TITLE') || 'CRMEB',
+ title: localStorage.getItem('ADMIN_TITLE') || '',
/**
* @description token在Cookie中存储的天数，默认1天
*/
diff --git a/template/admin/src/main.js b/template/admin/src/main.js
index 4e14a9596..751ec5dd2 100644
--- a/template/admin/src/main.js
+++ b/template/admin/src/main.js
@@ -65,9 +65,12 @@ import dialog from '@/libs/dialog';
import timeOptions from '@/libs/timeOptions';
import scroll from '@/libs/loading';
import * as tools from '@/libs/tools';
+import VueTreeList from 'vue-tree-list';
+
+Vue.use(VueTreeList);
// 版本升级
import upgrade from '@/components/upGrade/index.vue';
-Vue.component('upgrade', upgrade)
+Vue.component('upgrade', upgrade);
//日期
import moment from 'moment';
Vue.prototype.$moment = moment;
diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue
index d9c08121a..8aabea8f2 100644
--- a/template/admin/src/pages/account/login/index.vue
+++ b/template/admin/src/pages/account/login/index.vue
@@ -32,7 +32,7 @@
size="large"
/>
-
+
@@ -91,14 +93,12 @@ export default {
formInline: {
username: '',
password: '',
- code: '',
},
ruleInline: {
username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
- code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
},
- errorNum: 0,
+ login_captcha: 0,
// jigsaw: null,
login_logo: '',
swiperList: [],
@@ -135,9 +135,7 @@ export default {
}, 400);
}
},
- $route(n) {
- this.captchas();
- },
+ $route(n) {},
},
mounted: function () {
this.$nextTick(() => {
@@ -159,7 +157,6 @@ export default {
}
this.swiperData();
});
- this.captchas();
},
methods: {
swiperData() {
@@ -172,6 +169,7 @@ export default {
this.key = data.key;
this.copyright = data.copyright;
this.version = data.version;
+ this.login_captcha = data.login_captcha;
})
.catch((err) => {
this.$Message.error(err);
@@ -193,7 +191,6 @@ export default {
AccountLogin({
account: this.formInline.username,
pwd: this.formInline.password,
- imgcode: this.formInline.code,
key: this.key,
captchaType: 'blockPuzzle',
captchaVerification: params ? params.captchaVerification : '',
@@ -221,6 +218,7 @@ export default {
this.$store.commit('userInfo/logoSmall', data.logo_square);
this.$store.commit('userInfo/version', data.version);
this.$store.commit('userInfo/newOrderAudioLink', data.newOrderAudioLink);
+ this.login_captcha = 0;
// if (this.jigsaw) this.jigsaw.reset();
@@ -247,12 +245,9 @@ export default {
})
.catch((res) => {
msg();
- this.formInline.code = '';
let data = res === undefined ? {} : res;
- this.errorNum++;
- this.captchas();
+ this.login_captcha = res.data.login_captcha;
this.$Message.error(data.msg || '登录失败');
- // if (this.jigsaw) this.jigsaw.reset();
});
setTimeout((e) => {
this.loading = false;
@@ -306,13 +301,10 @@ export default {
document.getElementsByTagName('canvas')[0].className = 'index_bg';
}
},
- captchas: function () {
- this.imgcode = Setting.apiBaseURL + '/captcha_pro?' + Date.parse(new Date());
- },
handleSubmit(name) {
this.$refs[name].validate((valid) => {
if (valid) {
- if (this.errorNum > 2) {
+ if (this.login_captcha == 1) {
this.$refs.verify.show();
} else {
this.closeModel();
@@ -391,7 +383,7 @@ export default {
}
.index_from {
- padding: 0 40px 32px 40px;
+ padding: 32px 40px 32px 40px;
height: 400px;
box-sizing: border-box;
}
diff --git a/template/admin/src/pages/app/wechat/reply/follow.vue b/template/admin/src/pages/app/wechat/reply/follow.vue
index 671febb73..08826b29a 100644
--- a/template/admin/src/pages/app/wechat/reply/follow.vue
+++ b/template/admin/src/pages/app/wechat/reply/follow.vue
@@ -1,18 +1,8 @@
-
-
-
diff --git a/template/admin/src/pages/kefu/pc/index.vue b/template/admin/src/pages/kefu/pc/index.vue
index cf0be3c44..cdf136d6b 100644
--- a/template/admin/src/pages/kefu/pc/index.vue
+++ b/template/admin/src/pages/kefu/pc/index.vue
@@ -33,7 +33,7 @@
+
+ {{ $route.meta.title }}
-
+
{{item.msn}}
@@ -134,9 +134,8 @@
v-model="chatCon"
type="textarea"
:rows="4"
- @keydown.native="listen($event)"
+ @on-keydown="listen($event)"
placeholder="请输入文字内容"
- @on-enter="bindEnter"
style="font-size: 14px"
/>
@@ -381,13 +380,7 @@ export default {
handleFormatError(file) {
this.$Message.error('上传图片只能是 jpg、jpg、jpeg、gif 格式!');
},
- bindEnter(e) {
- if (e.target.value == '') {
- return this.$Message.error('请输入消息');
- }
- this.sendMsg(e.target.value, 1);
- this.chatCon = '';
- },
+ bindEnter(e) {},
//微信截图上传图片时触发
handleParse(e) {
let file = null;
@@ -446,9 +439,14 @@ export default {
},
// 阻止浏览器默认换行操作
listen(e) {
- if (e.keyCode == 13) {
- e.preventDefault();
- return false;
+ if (e.shiftKey && e.keyCode == 13) {
+ console.log('换行');
+ } else if (e.keyCode == 13) {
+ if (e.target.value == '') {
+ return this.$Message.error('请输入消息');
+ }
+ this.sendMsg(e.target.value, 1);
+ this.chatCon = '';
}
},
// 输入框选择表情
@@ -701,6 +699,7 @@ textarea.ivu-input {
.txt-wrapper {
word-break: break-all;
+ white-space: pre-wrap;
}
.pad16 {
@@ -946,4 +945,3 @@ textarea.ivu-input {
width: 0;
}
-
diff --git a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue
index 7a5b994a1..935b4a8d8 100644
--- a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue
+++ b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue
@@ -114,7 +114,7 @@
+
更多