同步代码

40b29fd3 · 毛细亚 · c315da16 · 40b29fd3 · 40b29fd3 · 40b29fd3
--- a/company_app/index.html
+++ b/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"><link rel="icon" href="favicon.ico"><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.00c87327.js"></script><script defer="defer" src="static/js/app.89bab3f8.js"></script><link href="static/css/chunk-vendors.34a02360.css" rel="stylesheet"><link href="static/css/app.c6113497.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>
\ No newline at end of file
+<!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"><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.6db6cb17.js"></script><script defer="defer" src="static/js/app.7d43d61c.js"></script><link href="static/css/chunk-vendors.34a02360.css" rel="stylesheet"><link href="static/css/app.c6113497.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>
\ No newline at end of file
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,7 @@ import 'lib-flexible/flexible.js'
 // import '@/styles/element-theme-colors.css';
 import '@/styles/index.scss';
 import moment from 'moment'
-import VConsole from 'vconsole'; // 注释掉，使用 devMode.js 统一管理
+// import VConsole from 'vconsole'; // 注释掉，使用 devMode.js 统一管理
 // import 'bi-element-ui/lib/bi-element-ui.css'
 import Element from 'bi-eleme'
 // import 'bi-eleme/lib/theme-chalk/index.css'
@@ -21,7 +21,7 @@ import uploading from '@/utils/cos-upload'
 import 'element-ui/lib/theme-chalk/index.css';
 // 导入 VConsole 清理工具
 import '@/utils/vconsoleCleanup'
-new VConsole();
+// new VConsole();
 // 测试一下
 Vue.use(uploading)
 Vue.use(BiElementUi, {

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -96,11 +96,11 @@ router.beforeEach((to, from, next) => {
      } else {
        // 缺少登录信息，跳转到登录页
        // 跳转到 login 的时候带上当前 url 的参数
-        next({
-          path: '/login',
-          query: urlParams
-        })
-        // next()
+        // next({
+        //   path: '/login',
+        //   query: urlParams
+        // })
+        next()
      }
    } else {
      // 登录页、回调页等不需要校验

--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -17,6 +17,7 @@
          <span class="loading-spinner"></span>
        </div>
      </div>
+    </div>
      <!-- 开发模式触发区域 - 隐藏的点击区域 -->
      <div class="dev-mode-trigger" @click="handleDevModeClick" title="开发模式触发区域"></div>
      <!-- 组织切换弹窗 -->
@@ -38,7 +39,6 @@
        </ul>
      </el-dialog>
  </div>
-  </div>
 </template>

 <script>
@@ -87,7 +87,7 @@ export default {
      if (urlParams.type && urlParams.type === 'ding') {// 钉钉回调
        console.log(1)
        this.handleDingCallback();
-      } else if (this.token) { // 已经钉钉扫码过 重新获取授权 获取签名 注册企微js-sdk
+      } else if (this.token && userid) { // 已经钉钉扫码过 重新获取授权 获取签名 注册企微js-sdk
        console.log(2)
        await this.getSignature();
      } else {
@@ -134,7 +134,7 @@ export default {
    // 1. 企微静默授权
    async startWeComSilentAuth() {
      this.urlParams = getParams();
-      const corp_id = this.urlParams.corp_id
+      const corp_id = Cookies.get('corp_id') ||  this.urlParams.corp_id 
      if (!corp_id) {
        this.$message.error('当前客服号信息异常，请切换会话后重试')
        return
@@ -150,8 +150,13 @@ export default {
      // 用code
      const res = await getAuthUser({ code: this.urlParams.code, url: window.location.href, corp_id: corp_id });
      if (res.status_code === 1) {
+        if(res.data.userid){
          this.cacheuserid(res.data.userid)
          this.initDingTalkLogin(); // 初始化钉钉扫码
+        }else{
+          this.$message.error('获取用户id失败')
+          return
+        }
      } else {
        console.log('获取useid失败', res)
        // 错误处理