ソースを参照

Merge remote-tracking branch 'origin/master'

yusm 1 ヶ月 前
コミット
5c994b5924

BIN
fhKeeper/formulahousekeeper/timesheet/src/assets/image/dingding.png


+ 15 - 10
fhKeeper/formulahousekeeper/timesheet/src/views/Login.vue

@@ -23,6 +23,9 @@
                         <div class="externalLanding_img" @click="wxworkCli()">
                             <img src="../assets/image/qiyeweix.png" alt="">
                         </div>
+                        <div class="externalLanding_img" @click="ddworkCli()">
+                            <img src="../assets/image/dingding.png" alt="">
+                        </div>
                     </div>
                     <div class="toRegister">
                         <el-link type="primary" class="btn" style="float:left;" :underline="false">{{ $t('lian-xi-ke-fu') }}
@@ -124,7 +127,7 @@
                 this.isCorpWX = true;
             } 
             let href = window.location.href;
-            this.wxHrefFlg = href.indexOf('//worktime.ttkuaiban.com') != '-1'
+            this.wxHrefFlg = href.indexOf('//worktime.ttkuaiban.com') != '-1' || href.indexOf('//localhost:10086/') != '-1'
             if (this.isCorpWX) {
                 //企业微信环境下,尝试自动登录
                 //判断企业微信,是否存在授权
@@ -268,20 +271,17 @@
         },
         methods: {
             wxworkCli() {
-                // this.wxworkFlg = true
-                // this.$nextTick(()=>{
-                //     var obj = new WxLogin({
-                //         id: 'wxcode', // 登录页面显示二维码的容器id
-                //         appid: 'wwf11426cf618e1703', // 企业微信的CorpID,在企业微信管理端查看
-                //         redirect_uri: encodeURIComponent('http://localhost:10086/#/login'), // 重定向的地址,需要进行encode
-                //         usertype: 'member'
-                //     })
-                // })
                 var appId = "wwf11426cf618e1703";//企业微信第三方的SUIT ID
                 var url = "https://worktime.ttkuaiban.com/api/corpWXScanningAuth";//授权回调页面
                 var weixinUrl=`https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=${appId}&redirect_uri=${url}&state=0&usertype=member`;
                 window.location.href = weixinUrl;
             },
+            ddworkCli() {
+                var appId = "71020";//钉钉三方的SUIT ID
+                var url = "https://worktime.ttkuaiban.com/api/dingtalk/callback";//授权回调页面
+                var weixinUrl=`https://oapi.dingtalk.com/connect/qrconnect?appid=${appId}&response_type=code&scope=snsapi_login&state=STATE&redirect_uri=${url}`;
+                window.location.href = weixinUrl;
+            },
             getStaffInfo() {
                 console.log('执行了没')
             },
@@ -643,10 +643,15 @@
             display: flex;
             justify-content: center;
             align-items: center;
+            margin-left: 20px;
             img {
                 width: 80%;
                 height: 80%;
             }
+
+            &:first-child {
+                margin-left: 0;
+            }
         }
     }
     .login {