build

src/components/reports/src/ControlDisplay.vue

@@ -1,11 +1,9 @@
 <template>
     <div class="app-main">
       <div class="app-main-zhunbeixuanzhuan">
-        {{JSON.stringify(companyArr)}}
         <div class="app-main-xuanzhuan">
           <div class="search clear">
             <h3 style="display:inline-block;" class="fl">业绩报表</h3>
-
             <el-date-picker
               v-model="date"
               style="margin-top:10px;"
@@ -18,31 +16,40 @@
               type="date"
               align="right"
               placeholder="选择日期"
-              :picker-options="{
-                disabledDate(time) {
-                  return time.getTime() > Date.now();
-                }
-              }"
+              :picker-options="{disabledDate(time) { return time.getTime() > Date.now();}}"
             >
             </el-date-picker>
           </div>
 
+        <template v-if="hasPlatformDimension">
           <h3>平台维度</h3>
-
           <el-row class="myul">
-            <el-col style="margin-bottom:20px">
+            <el-col 
+              style="margin-bottom:20px" 
+              :xs="24" 
+              :sm="24" 
+              :md="12" 
+              :lg="12" 
+              :xl="12"
+             >
               <wanyu-report :date="date" />
             </el-col>
           </el-row>
+        </template>
 
 
+        <template v-if="companyArr && companyArr.length > 0">
           <h3>业务公司维度</h3> 
           <el-row :gutter="20">
             <el-col 
                 v-for="(company,index) in companyArr"
                 style="margin-bottom:20px" 
-                :xs="24" :sm="12" :md="12" :lg="6" :xl="6"
                 :key="company.companyNo"
+                :xs="24" 
+                :sm="12" 
+                :md="12" 
+                :lg="6" 
+                :xl="6"
               >
               <department-report 
                 :date="date" 
@@ -51,14 +58,15 @@
               />
             </el-col>
           </el-row>
+        </template>
         </div>
       </div>
     </div>
 </template>
 <script>
 export default {
-  name:'control-display',
-  props:['companyArr'],
+  name:'ControlDisplay',
+  props:['companyArr','hasPlatformDimension'],
   data(){
     return {
       date:''

src/components/unusual/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-empty :description="message">
+    <el-empty description="未获取到用户数据" image="/static/warning.png">
       <el-button type="primary" @click="toLogin">重新登录</el-button>
     </el-empty>
   </div>
@@ -8,6 +8,7 @@
 
 <script>
 export default {
+  name:'UnusualState',
   props:['message'],
   methods:{
     toLogin(){

src/pages/login.vue

@@ -9,10 +9,10 @@ export default {
   name:'login',
   async mounted () {
       const redirect = encodeURIComponent(config.redirect)
-      var state = 'wx_' + Math.random().toString(36).substr(2, 15);
+      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

@@ -1,8 +1,9 @@
 <template>
   <div id="app" v-cloak v-loading="state.loading">
     <template v-if="!state.error">
-      <control-display :companyArr="companyArr" />
+      <control-display :companyArr="companyArr" :hasPlatformDimension="hasPlatformDimension"  />
     </template>
+
     <template v-else>
       <unusual-state :message="state.message" />
     </template>
@@ -10,14 +11,16 @@
 </template>
 <script>
 import asyncRequest from "@/api/index"
-import { getParameterByName,mockData } from "../utils/auth"
+import { getParameterByName } from "../utils/auth"
 import UnusualState from "@/components/unusual/index.vue"
+
 export default {
   name:'report',
   components:{ UnusualState },
   data() {
     return {
       companyArr:[],
+      hasPlatformDimension: false,
       state:{
         error:false,
         loading:false,
@@ -27,20 +30,21 @@ export default {
   },
   async mounted(){
     this.state.loading = true
-    alert(getParameterByName('code'))
-    // const result = await asyncRequest.userinfo({code: getParameterByName('code')})
-    // const result = mockData
-    // this.state.loading = false
+    const result = await asyncRequest.userinfo(
+      { code: getParameterByName('code') }
+    )
 
-    // switch(Number(result.code)){
-    //   case 0:
-    //     this.companyArr = result.data.companyArr || []
-    //     break
-    //   default:
-    //     this.state.error = true
-    //     this.state.message = result.message
-    //     break
-    // }
+    this.state.loading = false
+    switch(Number(result.code)){
+      case 0:
+        this.companyArr = result.data.companyArr
+        this.hasPlatformDimension = result.data.is_show === "1"
+        break
+      default:
+        this.state.error = true
+        this.state.message = result.message
+        break
+    }
   }
 };
 </script>

src/utils/auth.js

@@ -22,32 +22,3 @@ export function getParameterByName(name) {
   if (!results[2]) return '';
   return decodeURIComponent(results[2].replace(/\+/g, ' '));
 }
-
-
-const errorData = {"code":1004,"message":"未获取到用户数据"}
-const data =  {
-	"code": 0,
-	"message": "获取成功",
-	"data": {
-		"id": "1",
-		"openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
-		"mobile": "",
-		"gender": "0",
-		"nickname": "",
-		"avatar": "",
-		"subscribe_time": "2022-12-21 15:52:14",
-		"addr": "",
-		"status": "1",
-		"companyArr": [
-        {"companyNo":"GS2302231323386950","companyName":"北京泓源广诚国际商贸有限公司"},
-        {"companyNo":"GS2302231124114965","companyName":"北京普润心堂商贸有限公司"},
-        {"companyNo":"GS2302231125079621","companyName":"北京百辰荣达国际科贸有限公司"},
-        {"companyNo":"GS2203161855277894","companyName":"北京万宇恒通国际科贸有限公司"}
-      ],
-		"addtime": "2023-04-10 18:11:07",
-		"updatetime": "2023-04-11 09:37:53"
-	}
-}
-
-
-export const mockData = data