lijunjie il y a 2 ans
Parent
commit
b746276aac

+ 7 - 0
CallCenterWeb.UI/RMYYAPP/main.js

@@ -8,6 +8,13 @@ import $mConfig from '@/config/index.config.js';
8 8
 import $mRoutesConfig from '@/config/routes.config.js';
9 9
 import $mConstDataConfig from '@/config/constData.config';
10 10
 import $mButtonConfig from '@/config/buttons.config'
11
+
12
+// 调试
13
+// import VConsole from 'vconsole'
14
+// const vConsole = new VConsole()
15
+
16
+// Vue.use(vConsole)
17
+
11 18
 // 引入全局方法
12 19
 import { http } from '@/utils/request';
13 20
 import $mGraceChecker from '@/utils/graceChecker';

+ 48 - 1
CallCenterWeb.UI/RMYYAPP/package-lock.json

@@ -11,9 +11,35 @@
11 11
         "dingtalk-jsapi": "^3.0.25",
12 12
         "echarts": "^5.4.2",
13 13
         "jsencrypt": "^3.3.2",
14
-        "sm-crypto": "^0.3.12"
14
+        "sm-crypto": "^0.3.12",
15
+        "vconsole": "^3.15.1"
15 16
       }
16 17
     },
18
+    "node_modules/@babel/runtime": {
19
+      "version": "7.23.4",
20
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.23.4.tgz",
21
+      "integrity": "sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==",
22
+      "dependencies": {
23
+        "regenerator-runtime": "^0.14.0"
24
+      },
25
+      "engines": {
26
+        "node": ">=6.9.0"
27
+      }
28
+    },
29
+    "node_modules/copy-text-to-clipboard": {
30
+      "version": "3.2.0",
31
+      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz",
32
+      "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==",
33
+      "engines": {
34
+        "node": ">=12"
35
+      }
36
+    },
37
+    "node_modules/core-js": {
38
+      "version": "3.33.3",
39
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.33.3.tgz",
40
+      "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw==",
41
+      "hasInstallScript": true
42
+    },
17 43
     "node_modules/dingtalk-jsapi": {
18 44
       "version": "3.0.25",
19 45
       "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-3.0.25.tgz",
@@ -41,11 +67,21 @@
41 67
       "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.3.2.tgz",
42 68
       "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
43 69
     },
70
+    "node_modules/mutation-observer": {
71
+      "version": "1.0.3",
72
+      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
73
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
74
+    },
44 75
     "node_modules/promise-polyfill": {
45 76
       "version": "7.1.2",
46 77
       "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
47 78
       "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ=="
48 79
     },
80
+    "node_modules/regenerator-runtime": {
81
+      "version": "0.14.0",
82
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
83
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
84
+    },
49 85
     "node_modules/sm-crypto": {
50 86
       "version": "0.3.12",
51 87
       "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.12.tgz",
@@ -59,6 +95,17 @@
59 95
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
60 96
       "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
61 97
     },
98
+    "node_modules/vconsole": {
99
+      "version": "3.15.1",
100
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.1.tgz",
101
+      "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==",
102
+      "dependencies": {
103
+        "@babel/runtime": "^7.17.2",
104
+        "copy-text-to-clipboard": "^3.0.1",
105
+        "core-js": "^3.11.0",
106
+        "mutation-observer": "^1.0.3"
107
+      }
108
+    },
62 109
     "node_modules/zrender": {
63 110
       "version": "5.4.3",
64 111
       "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",

+ 2 - 1
CallCenterWeb.UI/RMYYAPP/package.json

@@ -16,6 +16,7 @@
16 16
     "dingtalk-jsapi": "^3.0.25",
17 17
     "echarts": "^5.4.2",
18 18
     "jsencrypt": "^3.3.2",
19
-    "sm-crypto": "^0.3.12"
19
+    "sm-crypto": "^0.3.12",
20
+    "vconsole": "^3.15.1"
20 21
   }
21 22
 }

+ 2 - 1
CallCenterWeb.UI/RMYYAPP/pages/index/index.vue

@@ -37,6 +37,7 @@
37 37
 			init() {
38 38
 				// 钉钉免登录
39 39
 				getCode((type,code) => {
40
+					// console.log(type , code)
40 41
 					if(type == 'app') {
41 42
 						setTimeout(() =>{
42 43
 							this.$mStore.dispatch("GetInfo").then((e) => {
@@ -52,7 +53,7 @@
52 53
 							})
53 54
 						},2000)
54 55
 					}else if(type == 'H5') {
55
-						if (code === 'fail' ) {
56
+						if (code !== 'fail' ) {
56 57
 							this.$mStore.dispatch("Dinglogin", {code: code,loginway:"phoneDing"}).then((res)=>{
57 58
 								if (res.state.toLowerCase() == 'success') {
58 59
 									uni.setStorageSync('token', res.data)

+ 3 - 1
CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -54,12 +54,14 @@
54 54
 			wButton,
55 55
 		},
56 56
 		onLoad() {
57
-			this.init()//判断是不是钉钉环境
57
+			// this.init()//判断是不是钉钉环境
58 58
 		},
59 59
 
60 60
 		methods: {
61 61
 			init() {
62 62
 				getCode((type,code) => {
63
+					
64
+					
63 65
 					if(type == 'H5') {
64 66
 						if(code == 'fail'){
65 67
 							uni.navigateTo({