Skip to content

C
company_app
提交 108e1d81 作者: 毛细亚
操作

更新 tailwindcss

上级 7e6be5e2
正在显示 包含 141 行增加 和 68 行删除
package.json
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
"vconsole": "^3.15.1", "vconsole": "^3.15.1",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-router": "^3.5.1", "vue-router": "^3.5.1",
"autoprefixer": "^10.4.0",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17",
"vuex": "^3.6.2" "vuex": "^3.6.2"
}, },
"devDependencies": { "devDependencies": {
......
postcss.config.js 0 → 100644
/*
* @Author: maoxiya 937667504@qq.com
* @Date: 2025-08-30 10:58:38
* @LastEditors: maoxiya 937667504@qq.com
* @LastEditTime: 2025-08-30 10:58:43
* @FilePath: /company_app/postcss.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
module.exports = {
plugins: [
require('tailwindcss'),
require('autoprefixer')
]
}
\ No newline at end of file
src/main.js
...@@ -13,6 +13,7 @@ Vue.use(ElementUI); ...@@ -13,6 +13,7 @@ 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 '@/styles/tailwind.css'
import VConsole from 'vconsole'; import VConsole from 'vconsole';
import uploading from '@/utils/cos-upload' import uploading from '@/utils/cos-upload'
import errorHandle from '@/utils/errorHandle' import errorHandle from '@/utils/errorHandle'
......
src/styles/tailwind.css 0 → 100644
@tailwind base;
@tailwind components;
@tailwind utilities;
src/views/newLogin.vue
...@@ -2,21 +2,22 @@ ...@@ -2,21 +2,22 @@
<template> <template>
<div class="loginContent"> <div class="loginContent">
<div class="loginContentContainer"> <div class="loginContentContainer">
<p class="loginContentTitle">选择客服:</p> <p class="loginContentTitle">选择客服:</p>
<div class="loginContentInput rowFlex alignCenter"> <div class="loginContentInput rowFlex alignCenter">
<el-select v-model="cser_user_id" filterable placeholder="请选择客服"> <el-select v-model="cser_user_id" filterable placeholder="请选择客服">
<el-option v-for="item in userList" :key="item.zq_user_id" clearable :label="item.name" :value="item.zq_user_id"> <el-option v-for="item in userList" :key="item.zq_user_id" clearable :label="item.name"
</el-option> :value="item.zq_user_id">
</el-select> </el-option>
<el-button type="primary" style="margin-left: 10px;" size="small" @click="loginConfirm">点击登录</el-button> </el-select>
</div> <el-button type="primary" style="margin-left: 10px;" size="small" @click="loginConfirm">点击登录</el-button>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import * as ww from '@wecom/jssdk' import * as ww from '@wecom/jssdk'
import { getOrganization, getAuthUser, getSignature,getUserList,cserSelected } from '@/api/user' import { getOrganization, getAuthUser, getSignature, getUserList, cserSelected } from '@/api/user'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import { getParams } from '@/utils/index' import { getParams } from '@/utils/index'
import { mapMutations, mapState } from 'vuex' import { mapMutations, mapState } from 'vuex'
...@@ -62,78 +63,78 @@ export default { ...@@ -62,78 +63,78 @@ export default {
if (this.token && userid) { // 已经钉钉扫码过 重新获取授权 获取签名 注册企微js-sdk if (this.token && userid) { // 已经钉钉扫码过 重新获取授权 获取签名 注册企微js-sdk
this.getUserList(userid) this.getUserList(userid)
await this.getSignature(); await this.getSignature();
} else if(!userid) { } else if (!userid) {
await this.startWeComSilentAuth(); await this.startWeComSilentAuth();
}else if(!this.token){ } else if (!this.token) {
this.getUserList(userid) this.getUserList(userid)
} }
}, },
async getUserList(userid) { async getUserList(userid) {
this.urlParams = getParams(); this.urlParams = getParams();
const corp_id = Cookies.get('corp_id') || this.urlParams.corp_id const corp_id = Cookies.get('corp_id') || this.urlParams.corp_id
const res = await getUserList({ userid: userid,corp_id:corp_id }); const res = await getUserList({ userid: userid, corp_id: corp_id });
this.userList = res.data this.userList = res.data
}, },
async userStartLogin(){ async userStartLogin() {
if(!this.cser_user_id){ if (!this.cser_user_id) {
this.$message.error('请选择客服人员') this.$message.error('请选择客服人员')
return return
} }
const cser_user = this.userList.find(item => item.zq_user_id === this.cser_user_id) const cser_user = this.userList.find(item => item.zq_user_id === this.cser_user_id)
const corp_id = Cookies.get('corp_id') const corp_id = Cookies.get('corp_id')
const userid = Cookies.get('userid') const userid = Cookies.get('userid')
this.cacheCser(cser_user.zq_user_id, cser_user.name) this.cacheCser(cser_user.zq_user_id, cser_user.name)
try { try {
const res = await cserSelected({ cser_id: cser_user.zq_user_id, corp_id: corp_id,userid:userid }); const res = await cserSelected({ cser_id: cser_user.zq_user_id, corp_id: corp_id, userid: userid });
console.log(res, '选择客服人员登录') console.log(res, '选择客服人员登录')
if(res.status_code === 1 && res.data.tokens ){ if (res.status_code === 1 && res.data.tokens) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: `当前【${cser_user.name}】已上线，下班后请记得点击下线哦~`, message: `当前【${cser_user.name}】已上线，下班后请记得点击下线哦~`,
duration: 3 * 1000 duration: 3 * 1000
}) })
setTimeout(() => { setTimeout(() => {
this.handleDingCallback(res.data.tokens ) this.handleDingCallback(res.data.tokens)
}, 2000) }, 2000)
}else{ } else {
this.$message.error(res.msg) this.$message.error(res.msg)
setTimeout(() => { setTimeout(() => {
window.location.href = window.location.origin + '/company_app/index.html?corp_id=' + corp_id + '&msg=cser_error' window.location.href = window.location.origin + '/company_app/index.html?corp_id=' + corp_id + '&msg=cser_error'
}, 5000) }, 5000)
}
} catch (error) {
console.log(error, '选择客服人员登录失败')
this.$message.error(error.msg)
setTimeout(() => {
window.location.href = window.location.origin + '/company_app/index.html?corp_id=' + corp_id + '&msg=cser_error'
}, 5000)
} }
} catch (error) {
console.log(error, '选择客服人员登录失败')
this.$message.error(error.msg)
setTimeout(() => {
window.location.href = window.location.origin + '/company_app/index.html?corp_id=' + corp_id + '&msg=cser_error'
}, 5000)
}
}, },
loginConfirm(){ loginConfirm() {
const cser_user = this.userList.find(item => item.zq_user_id === this.cser_user_id) const cser_user = this.userList.find(item => item.zq_user_id === this.cser_user_id)
this.$confirm(`确认登录上线吗，上线后所有会话都会归属到客服【${cser_user.name}】`, '提示', { this.$confirm(`确认登录上线吗，上线后所有会话都会归属到客服【${cser_user.name}】`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.userStartLogin() this.userStartLogin()
}).catch(() => { }).catch(() => {
this.$message.info('已取消登录') this.$message.info('已取消登录')
}) })
}, },
// 设置缓存 // 设置缓存
cacheCorp_id(corp_id) { cacheCorp_id(corp_id) {
Cookies.set('corp_id', corp_id, { expires: 7 }) Cookies.set('corp_id', corp_id, { expires: 30 })
this.set_corp_id(corp_id) this.set_corp_id(corp_id)
}, },
cacheuserid(userid) { cacheuserid(userid) {
Cookies.set('userid', userid, { expires: 7 }) Cookies.set('userid', userid, { expires: 30 })
this.set_userid(userid) this.set_userid(userid)
}, },
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: 30 })
Cookies.set('cser_name', cser_name, { expires: 7 }) Cookies.set('cser_name', cser_name, { expires: 30 })
this.set_cser_info({ this.set_cser_info({
cser_id: cser_id, cser_id: cser_id,
cser_name: cser_name cser_name: cser_name
...@@ -142,14 +143,14 @@ export default { ...@@ -142,14 +143,14 @@ export default {
this.set_cser_name(cser_name) this.set_cser_name(cser_name)
}, },
cacheSignData(signData) { cacheSignData(signData) {
Cookies.set('signData', JSON.stringify(signData), { expires: 7 }) Cookies.set('signData', JSON.stringify(signData), { expires: 30 })
this.set_signData(signData) this.set_signData(signData)
}, },
// 进入的页面地址是 https://companywx.jianshuwenhua.com/company_app/index.html?corp_id=wweaefe716636df3d1 // 进入的页面地址是 https://companywx.jianshuwenhua.com/company_app/index.html?corp_id=wweaefe716636df3d1
// 1. 企微静默授权 // 1. 企微静默授权
async startWeComSilentAuth() { async startWeComSilentAuth() {
this.urlParams = getParams(); this.urlParams = getParams();
const corp_id = Cookies.get('corp_id') || this.urlParams.corp_id const corp_id = Cookies.get('corp_id') || this.urlParams.corp_id
if (!corp_id) { if (!corp_id) {
this.$message.error('当前客服号信息异常，请切换会话后重试') this.$message.error('当前客服号信息异常，请切换会话后重试')
return return
...@@ -165,10 +166,10 @@ export default { ...@@ -165,10 +166,10 @@ 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) {
if(res.data.userid){ if (res.data.userid) {
this.cacheuserid(res.data.userid) this.cacheuserid(res.data.userid)
this.getUserList(res.data.userid) this.getUserList(res.data.userid)
}else{ } else {
this.$message.error('获取用户id失败') this.$message.error('获取用户id失败')
return return
} }
...@@ -202,6 +203,7 @@ export default { ...@@ -202,6 +203,7 @@ export default {
if (res.err_msg === "getCurExternalContact:ok") { if (res.err_msg === "getCurExternalContact:ok") {
console.log(res, '重新进入获取企微外部联系人') console.log(res, '重新进入获取企微外部联系人')
this.set_external_userid(res.userId) this.set_external_userid(res.userId)
this.$cookies.set('external_userid', res.userId, { expires: 30 })
// 确保 Vuex 状态更新后再跳转 // 确保 Vuex 状态更新后再跳转
this.$nextTick(() => { this.$nextTick(() => {
this.$router.replace('/') this.$router.replace('/')
...@@ -275,7 +277,7 @@ export default { ...@@ -275,7 +277,7 @@ export default {
window.location.href = window.location.origin + '/company_app/index.html?corp_id=' + corp_id + '&msg=notoken' window.location.href = window.location.origin + '/company_app/index.html?corp_id=' + corp_id + '&msg=notoken'
} }
}, },
}, },
} }
...@@ -294,12 +296,14 @@ export default { ...@@ -294,12 +296,14 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.loginContentTitle{
font-size: 14px; .loginContentTitle {
line-height: 32px; font-size: 14px;
margin-right: 10px; line-height: 32px;
text-align: left; margin-right: 10px;
text-align: left;
} }
.qr-contain { .qr-contain {
margin: 0 auto; margin: 0 auto;
/* margin-top: 20px; */ /* margin-top: 20px; */
......
tailwind.config.js 0 → 100644
/*
* @Author: maoxiya 937667504@qq.com
* @Date: 2025-08-30 10:54:21
* @LastEditors: maoxiya 937667504@qq.com
* @LastEditTime: 2025-08-30 10:54:29
* @FilePath: /company_app/tailwind.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
module.exports = {
mode: 'jit', // 关键配置
purge: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
darkMode: false,
theme: {
extend: {}
},
variants: {
extend: {}
},
plugins: [
function({ addUtilities }) {
const newUtilities = {
'.truncate-2': {
display: '-webkit-box',
'-webkit-box-orient': 'vertical',
'-webkit-line-clamp': '2',
'overflow': 'hidden',
'text-overflow': 'ellipsis',
'word-wrap': 'break-word',
'word-break': 'break-word',
},
'.truncate-3': {
display: '-webkit-box',
'-webkit-box-orient': 'vertical',
'-webkit-line-clamp': '3',
'overflow': 'hidden',
'text-overflow': 'ellipsis',
'word-wrap': 'break-word',
'word-break': 'break-word',
}
}
addUtilities(newUtilities, ['responsive', 'hover'])
}
],
corePlugins: {
container: false // 禁用默认的 container
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论