微信登录统一

package-lock.json

@@ -9,6 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "amfe-flexible": "^2.2.1",
+        "axios": "^0.24.0",
         "core-js": "^3.6.5",
         "cube-ui": "~1.12.15",
         "vue": "^2.6.11"
@@ -3078,6 +3079,14 @@
       "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=",
       "dev": true
     },
+    "node_modules/axios": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmmirror.com/axios/download/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "dependencies": {
+        "follow-redirects": "^1.14.4"
+      }
+    },
     "node_modules/babel-loader": {
       "version": "8.2.3",
       "resolved": "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz",
@@ -6446,7 +6455,6 @@
       "version": "1.14.6",
       "resolved": "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.6.tgz",
       "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -16304,7 +16312,8 @@
       "version": "4.5.15",
       "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-vuex/download/@vue/cli-plugin-vuex-4.5.15.tgz",
       "integrity": "sha1-RmwfAnd9Av71Opu0mjbMOjvP7E4=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/cli-service": {
       "version": "4.5.15",
@@ -16441,7 +16450,8 @@
       "version": "1.1.2",
       "resolved": "https://registry.nlark.com/@vue/preload-webpack-plugin/download/@vue/preload-webpack-plugin-1.1.2.tgz",
       "integrity": "sha1-zrkktOyzucQ4ccekKaAvhCPmIas=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
@@ -16680,13 +16690,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.nlark.com/ajv-errors/download/ajv-errors-1.0.1.tgz",
       "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz",
       "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -16936,6 +16948,14 @@
       "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=",
       "dev": true
     },
+    "axios": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmmirror.com/axios/download/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "requires": {
+        "follow-redirects": "^1.14.4"
+      }
+    },
     "babel-loader": {
       "version": "8.2.3",
       "resolved": "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz",
@@ -19745,8 +19765,7 @@
     "follow-redirects": {
       "version": "1.14.6",
       "resolved": "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
-      "dev": true
+      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
     },
     "for-in": {
       "version": "1.0.2",

package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "amfe-flexible": "^2.2.1",
+    "axios": "^0.24.0",
     "core-js": "^3.6.5",
     "cube-ui": "~1.12.15",
     "vue": "^2.6.11"

public/index.html

@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
+    <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
+    <title>首页</title>
   </head>
   <body>
     <noscript>

src/App.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app">
-    <cube-button @click="goTo('service')">进入微信服务台</cube-button>
-    <cube-button @click="goTo('user')">进入微信运维端</cube-button>
-    <cube-button @click="goTo('req')">进入微信报修端</cube-button>
+    <cube-button @click="goTo('service')" v-show="isService">进入微信服务台</cube-button>
+    <cube-button @click="goTo('user')" v-show="isUser">进入微信运维端</cube-button>
+    <cube-button @click="goTo('req')" v-show="isReq">进入微信报修端</cube-button>
   </div>
 </template>
 
@@ -12,12 +12,23 @@ export default {
   data() {
     return {
       baseUrl: document.location.protocol + "//" + document.domain,
+      isService:false,//服务台
+      isUser:false,//运维端
+      isReq:false,//报修端
     };
   },
   methods: {
     // 判断角色
-    roleHandler(user){
-
+    roleHandler(user,requester){
+      let userRoles = user.role.map(v=>({id:v.id,rolecode:v.rolecode}));
+      if(userRoles.length){
+        this.isService = userRoles.some(v=>(v.rolecode === 'call center' || v.rolecode === 'call center admin'))
+        this.isUser = userRoles.some(v=>(v.rolecode === 'first-line support' || v.rolecode === 'second-line support' || v.rolecode === 'incident manager' || v.rolecode === 'inspectman' || v.rolecode === 'incident-category-manager'))
+      }else{
+        this.isService = false;
+        this.isUser = false;
+      }
+      this.isReq = requester ? true : false;
     },
     // 跳转应用
     goTo(type) {
@@ -35,12 +46,12 @@ export default {
     },
     // 登陆
     login() {
-      this.$http.post("service/auth/wechatlogin", {}).then(function(res) {
+      this.$http.post("service/auth/wechatAuth", {}).then(function(res) {
         if (res.data.url) {
           window.location.href = res.data.url;
         } else {
           if (res.data.user) {
-            this.roleHandler(res.data.user.user);
+            this.roleHandler(res.data.user.user,res.data.user.requester);
           }
         }
       });
@@ -54,10 +65,10 @@ export default {
         var code = {
           code: url[1],
         };
-        this.$http.post("service/auth/wechatlogin2", code).then(res => {
+        this.$http.post("service/auth/wechatLoginEncrypt", code).then(res => {
           if (res.data.state == 200) {
             if (res.data.user) {
-              this.roleHandler(res.data.user.user);
+              this.roleHandler(res.data.user.user,res.data.user.requester);
             }
           } else if (res.data.state == 501) {
             this

src/cube-ui.js

@@ -8,81 +8,81 @@ import {
   Style,
   // basic
   Button,
-  Loading,
-  Tip,
-  Toolbar,
-  TabBar,
-  TabPanels,
+  // Loading,
+  // Tip,
+  // Toolbar,
+  // TabBar,
+  // TabPanels,
   // form
-  Checkbox,
-  CheckboxGroup,
-  Checker,
-  Radio,
-  RadioGroup,
-  Input,
-  Textarea,
-  Select,
-  Switch,
-  Rate,
-  Validator,
-  Upload,
-  Form,
+  // Checkbox,
+  // CheckboxGroup,
+  // Checker,
+  // Radio,
+  // RadioGroup,
+  // Input,
+  // Textarea,
+  // Select,
+  // Switch,
+  // Rate,
+  // Validator,
+  // Upload,
+  // Form,
   // popup
-  Popup,
-  Toast,
-  Picker,
-  CascadePicker,
-  DatePicker,
-  TimePicker,
-  SegmentPicker,
-  Dialog,
-  ActionSheet,
-  Drawer,
-  ImagePreview,
+  // Popup,
+  // Toast,
+  // Picker,
+  // CascadePicker,
+  // DatePicker,
+  // TimePicker,
+  // SegmentPicker,
+  // Dialog,
+  // ActionSheet,
+  // Drawer,
+  // ImagePreview,
   // scroll
-  Scroll,
-  Slide,
-  IndexList,
-  Swipe,
-  Sticky,
-  ScrollNav,
-  ScrollNavBar
+  // Scroll,
+  // Slide,
+  // IndexList,
+  // Swipe,
+  // Sticky,
+  // ScrollNav,
+  // ScrollNavBar
 } from 'cube-ui'
 
 Vue.use(Button)
-Vue.use(Loading)
-Vue.use(Tip)
-Vue.use(Toolbar)
-Vue.use(TabBar)
-Vue.use(TabPanels)
-Vue.use(Checkbox)
-Vue.use(CheckboxGroup)
-Vue.use(Checker)
-Vue.use(Radio)
-Vue.use(RadioGroup)
-Vue.use(Input)
-Vue.use(Textarea)
-Vue.use(Select)
-Vue.use(Switch)
-Vue.use(Rate)
-Vue.use(Validator)
-Vue.use(Upload)
-Vue.use(Form)
-Vue.use(Popup)
-Vue.use(Toast)
-Vue.use(Picker)
-Vue.use(CascadePicker)
-Vue.use(DatePicker)
-Vue.use(TimePicker)
-Vue.use(SegmentPicker)
-Vue.use(Dialog)
-Vue.use(ActionSheet)
-Vue.use(Drawer)
-Vue.use(ImagePreview)
-Vue.use(Scroll)
-Vue.use(Slide)
-Vue.use(IndexList)
-Vue.use(Swipe)
-Vue.use(Sticky)
-Vue.use(ScrollNav)
-Vue.use(ScrollNavBar)
+// Vue.use(Loading)
+// Vue.use(Tip)
+// Vue.use(Toolbar)
+// Vue.use(TabBar)
+// Vue.use(TabPanels)
+// Vue.use(Checkbox)
+// Vue.use(CheckboxGroup)
+// Vue.use(Checker)
+// Vue.use(Radio)
+// Vue.use(RadioGroup)
+// Vue.use(Input)
+// Vue.use(Textarea)
+// Vue.use(Select)
+// Vue.use(Switch)
+// Vue.use(Rate)
+// Vue.use(Validator)
+// Vue.use(Upload)
+// Vue.use(Form)
+// Vue.use(Popup)
+// Vue.use(Toast)
+// Vue.use(Picker)
+// Vue.use(CascadePicker)
+// Vue.use(DatePicker)
+// Vue.use(TimePicker)
+// Vue.use(SegmentPicker)
+// Vue.use(Dialog)
+// Vue.use(ActionSheet)
+// Vue.use(Drawer)
+// Vue.use(ImagePreview)
+// Vue.use(Scroll)
+// Vue.use(Slide)
+// Vue.use(IndexList)
+// Vue.use(Swipe)
+// Vue.use(Sticky)
+// Vue.use(ScrollNav)
+// Vue.use(ScrollNavBar)

src/main.js

@@ -2,9 +2,16 @@ import Vue from 'vue'
 import './cube-ui'
 import App from './App.vue'
 import 'amfe-flexible'
+import axios from 'axios'
 
 Vue.config.productionTip = false
 
+let domainName = document.domain; //域名
+let protocolName = document.location.protocol; //http协议
+axios.defaults.baseURL = protocolName + "//" + domainName;
+Vue.prototype.$http = axios;
+// Vue.prototype.$host = protocolName + "//" + domainName;
+
 new Vue({
   render: h => h(App),
 }).$mount('#app')