build

public/index.html

@@ -8,6 +8,7 @@
     <script src="./static/vue.min.js" rel="preload" as="script"></script>
     <script src="./static/vue-router.min.js" rel="preload" as="script"></script>
     <script src="./static/axios@0.21.0.min.js" rel="preload" as="script"></script>
+    <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
     <title>报表</title>
     <style>
         [v-cloak] {

src/components/reports/index.js

@@ -1,16 +1,14 @@
 import WanyuReport from "./src/WanyuReport.vue"
 import DepartmentReport from "./src/DepartmentReport.vue"
 
-const reportComponets = [
+const components = [
   WanyuReport,
   DepartmentReport
 ]
 
 export default {
   install(Vue) {
-    // 全局注册组件
-    reportComponets.forEach(component => {
-      Vue.component(component.name,component)
-    })
+    /* 全局注册组件 **/
+    components.forEach(component =>  Vue.component(component.name,component))
   }
 };

src/components/reports/src/DepartmentReport.vue

@@ -65,10 +65,10 @@ export default {
       /* 完成率 = 完成额 / 月指标 **/
       const completionRate = multiplication(division(completion,total_tips) || 0, 100)
       return {
-        /* 月指标 **/
-        total_tips: unit2TenThousand(total_tips),
         /* 完成额 **/
         month: unit2TenThousand(completion),
+        /* 月指标 **/
+        total_tips: unit2TenThousand(total_tips),
         /* 完成率 **/
         completionRate: completionRate ? completionRate.toFixed(2) + '%' : completionRate + '%'
       }

src/components/reports/src/WanyuReport.vue

@@ -47,11 +47,11 @@ import asyncRequest from "@/api/report";
 import setHeight from "@/mixins/index";
 import { 
   unit2TenThousand,
+  getCompanyLabel,
   multiplication,
   subtraction,
   addition, 
-  division,
-getCompanyLabel
+  division
 } from "./_utils";
 
 export default {
@@ -151,8 +151,8 @@ export default {
           }
         },{
           total_tips:0,
-          day:0,
-          month:0
+          month:0,
+          day:0
         })
 
         this.tableData = tableData.map(({depart,total_tips,dayinfo,monthinfo}) => {

src/config/env.development.js

@@ -6,7 +6,8 @@ module.exports = {
   cxApi: "http://stock.api.wanyuhengtong.com/",
   fileURL: `https://api2.edu.futurelab.tv`,
   reportApi: "http://stockinv.test241.wanyuhengtong.com/",
-  appId: "wx5ac3a2c2d72b6f26",
+  appId: "wxfa1f1a0211edf630",
+  redirect:'http://depart.test241.wanyuhengtong.com/',
   ding: {
     //企业id
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",

src/config/env.production.js

@@ -5,7 +5,8 @@ module.exports = {
   cxApi: "http://stock.api.wanyuhengtong.com/",
   fileURL: `https://api2.edu.futurelab.tv`,
   reportApi: "http://stockinv.test241.wanyuhengtong.com/",
-  appId: "wx5ac3a2c2d72b6f26",
+  appId: "wxfa1f1a0211edf630",
+  redirect:'http://depart.test241.wanyuhengtong.com/',
   ding: {
     //企业id
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",

src/pages/login.vue

@@ -1,36 +1,18 @@
 <template>
-  <div class=""></div>
+  <div />
 </template>
 
 
 <script>
-import wx from 'weixin-js-sdk'
-import asyncRequest from "@/api/index"
+import config from "@/config"
 export default {
   name:'login',
   async mounted () {
-    try{
-      const result = await asyncRequest.signature({
-        url:window.location.href.split('#')[0]
-      })
-
-      // 配置微信JSSDK
-      wx.config({
-         debug: false,
-         appId: result.data.appId,
-         timestamp: result.data.timestamp,
-         nonceStr: result.data.nonceStr,
-         signature: result.data.signature,
-         jsApiList: ['checkJsApi', 'onMenuShareTimeline', 'onMenuShareAppMessage']
-      })
-      
-      wx.error(function (res) {
-        console.log(res.errMsg)
-      })
-
-    }catch(error){
-      console.log(error)
-    }
+      const redirect = encodeURIComponent(config.redirect)
+      var state = 'wx_' + Math.random().toString(36).substr(2, 15);
+      const scope = 'snsapi_userinfo'
+      const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${config.appId}&redirect_uri=${redirect}&response_type=code&scope=${scope}&state=${state}#wechat_redirect`
+      window.location.href = url
   }
 }
 </script>

src/pages/report.vue

@@ -37,6 +37,9 @@
             <li style="margin-bottom:20px">
               <department-report companyNo="GS2302231323386950" :date="date" />
             </li>
+            <li style="margin-bottom:20px">
+              <department-report companyNo="GS2203161855277894" :date="date" />
+            </li>
           </ul>
         </div>
       </div>
@@ -44,17 +47,17 @@
   </div>
 </template>
 <script>
-
+import asyncRequest from "@/api/index"
+import { getParameterByName } from "../utils/auth"
 export default {
   name:'report',
   data() {
     return {
-      date: "",
+      date: ""
     };
   },
   async created() {
     this.date = this.transformTime();
-    // this.currentDate = '2023-03-31'
     const { search } = window.location
     if(search.indexOf('?') !== -1){
       const query = {}
@@ -62,10 +65,11 @@ export default {
         const [key,value] = item.split('=')
         query[key] = value
       })
-
-      if(query.companyNo) this.companyNo = query.companyNo
     }
   },
+  mounted(){
+    this.initWechatSdk()
+  },
   methods: {
     transformTime() {
       let time = new Date();
@@ -73,7 +77,50 @@ export default {
       let M = time.getMonth() + 1;
       let d = time.getDate();
       return y + "-" + (M < 10 ? "0" + M : M) + "-" + (d < 10 ? "0" + d : d);
-    }
+    },
+    async initWechatSdk(){
+      try{
+        const code = getParameterByName('code')
+        const result = await asyncRequest.signature({code})
+
+        switch(Number(result.code)){
+          case 0:
+            // 配置微信JSSDK
+            wx.config({
+               debug: true,
+               appId: result.data.appId,
+               timestamp: result.data.timestamp,
+               nonceStr: result.data.nonceStr,
+               signature: result.data.signature,
+               jsApiList: ['checkJsApi', 'onMenuShareTimeline', 'onMenuShareAppMessage']
+            })
+
+            wx.ready(function(){
+              wx.webckJsApi({
+                jsApiList:['getUserInfo'],
+                success:function(res){
+                  console.log(res)
+                  //用户信息...
+                },
+                fail:function(){
+                  //..处理获取用户失败情况
+                  this.$router.push('/')
+                }
+              })
+            })
+
+            wx.error(function () {
+              this.$router.push('/login')
+            })
+            break
+          default:
+            this.$router.push('/login')
+            break
+        }
+      }catch(error){
+        this.$router.push('/login')
+      }
+    },
   }
 };
 </script>

src/router/index.js

@@ -1,12 +1,20 @@
 import Report from "./../pages/report.vue"
+import Login from "./../pages/login.vue"
+import { getParameterByName } from "../utils/auth"
 
 const routes = [
   { path: '/', component: Report},
+  { path:'/login', component: Login}
 ]
 
-const router = new VueRouter({
-  routes,
-  mode:'hash'
+const router = new VueRouter({routes ,mode:'hash'})
+
+router.beforeEach((to, _, next) => {
+  if (to.path !== '/login' && !getParameterByName('code')) {
+    next('/login')
+  } else {
+    next()
+  }
 })
 
 export default router

src/utils/auth.js

@@ -1,41 +1,25 @@
-import wx from 'weixin-js-sdk'
+const CODE_KEY = 'WECHAT_CODE'
 
-export let wxConfig = {}
-/* 获取微信授权签名 **/
-export async function getWechatSignature(){
-  try{
-    const result = await asyncRequest.signature({
-      url:window.location.href.split('#')[0]
-    })
 
-    wxConfig = result.data
-    // 配置微信JSSDK
-    wx.config({
-       debug: false,
-       appId: result.data.appId,
-       timestamp: result.data.timestamp,
-       nonceStr: result.data.nonceStr,
-       signature: result.data.signature,
-       jsApiList: ['checkJsApi', 'onMenuShareTimeline', 'onMenuShareAppMessage']
-    })
-    
-    wx.error(function (res) {
-      console.log(res.errMsg)
-    })
+export function setCode(code){
+  window.localStorage.setItem(CODE_KEY,code || '')
+}
+
+export function getCode(){
+  return window.localStorage.getItem(CODE_KEY) || ''
+}
 
-  }catch(error){
-    console.log(error)
-  }
+export function removeCode(){
+  return window.localStorage.removeItem(CODE_KEY)
 }
 
 
-export function wechatLogin(){
-  wx.openAuth2({
-    appId:wxConfig.appId,
-    responseType:'code',
-    scope: 'snsapi_userinfo',
-    state: '',
-    style: '',
-    href: ''
-  })
+export function getParameterByName(name) {
+  var url = window.location.href;
+  name = name.replace(/[\[\]]/g, '\\$&');
+  var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)');
+  var results = regex.exec(url);
+  if (!results) return null;
+  if (!results[2]) return '';
+  return decodeURIComponent(results[2].replace(/\+/g, ' '));
 }