From 96a924436d3893336ea1b1614b45b4840767bba6 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 25 Sep 2020 17:07:36 +0800
Subject: [PATCH] dash

---
 .../src/views/dashboard/components/PanelGroup.vue      |  8 ++++----
 test_client/src/views/dashboard/index.vue              |  4 ++--
 test_mini/pages/lianxi/index.wxss                      | 10 +++++++++-
 test_mini/pages/yati/index.wxss                        |  2 ++
 test_mini/project.config.json                          |  2 +-
 test_server/analyse/views.py                           |  4 ++--
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/test_client/src/views/dashboard/components/PanelGroup.vue b/test_client/src/views/dashboard/components/PanelGroup.vue
index ea77989..cf088ef 100644
--- a/test_client/src/views/dashboard/components/PanelGroup.vue
+++ b/test_client/src/views/dashboard/components/PanelGroup.vue
@@ -1,26 +1,26 @@
 <template>
   <el-row :gutter="40" class="panel-group">
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('注册用户')">
+      <div class="card-panel" @click="handleSetLineChartData('访问用户')">
         <div class="card-panel-icon-wrapper icon-people">
           <svg-icon icon-class="peoples" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            注册用户
+            访问用户
           </div>
           <count-to :start-val="0" v-bind:end-val="ret.consumer1_count" :duration="1600" class="card-panel-num"  />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('缴费学员')">
+      <div class="card-panel" @click="handleSetLineChartData('缴费用户')">
         <div class="card-panel-icon-wrapper icon-message">
           <svg-icon icon-class="people" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            缴费学员
+            缴费用户
           </div>
           <count-to :start-val="0" v-bind:end-val="ret.consumer2_count" :duration="1600" class="card-panel-num" />
         </div>
diff --git a/test_client/src/views/dashboard/index.vue b/test_client/src/views/dashboard/index.vue
index 2da6dc6..85a20a1 100644
--- a/test_client/src/views/dashboard/index.vue
+++ b/test_client/src/views/dashboard/index.vue
@@ -13,11 +13,11 @@ import PanelGroup from './components/PanelGroup'
 import LineChart from './components/LineChart'
 
 const lineChartData = {
-  '注册用户': {
+  '访问用户': {
     expectedData: [100, 120, 161, 134, 105, 160, 165],
     actualData: [120, 82, 91, 154, 162, 140, 145]
   },
-  '缴费学员': {
+  '缴费用户': {
     expectedData: [200, 192, 120, 144, 160, 130, 140],
     actualData: [180, 160, 151, 106, 145, 150, 130]
   },
diff --git a/test_mini/pages/lianxi/index.wxss b/test_mini/pages/lianxi/index.wxss
index 86e2f44..5dbdb87 100644
--- a/test_mini/pages/lianxi/index.wxss
+++ b/test_mini/pages/lianxi/index.wxss
@@ -3,4 +3,12 @@
   margin-left:8px;
   margin-right:8px;
   border-radius: 8px;
-}
\ No newline at end of file
+  /* background: linear-gradient(to right, #fad8be 0%, #fe6673 100%); */
+  /* background:#00a7d0; */
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 4rpx 16rpx 0px rgba(140, 160, 181, 0.2);
+  /* background: linear-gradient(to right, #3399CC 0%, #0066CC  100%); */
+}
+/* .weui-media-box__title {
+  color:ghostwhite
+} */
\ No newline at end of file
diff --git a/test_mini/pages/yati/index.wxss b/test_mini/pages/yati/index.wxss
index 5e5f5fd..278a808 100644
--- a/test_mini/pages/yati/index.wxss
+++ b/test_mini/pages/yati/index.wxss
@@ -3,4 +3,6 @@
   margin-left:8px;
   margin-right:8px;
   border-radius: 8px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 4rpx 16rpx 0px rgba(140, 160, 181, 0.2);
 }
\ No newline at end of file
diff --git a/test_mini/project.config.json b/test_mini/project.config.json
index 1c112e8..e393d74 100644
--- a/test_mini/project.config.json
+++ b/test_mini/project.config.json
@@ -25,7 +25,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false,
 		"compileHotReLoad": false,
 		"useMultiFrameRuntime": true,
diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py
index 0e4798c..07e3e84 100644
--- a/test_server/analyse/views.py
+++ b/test_server/analyse/views.py
@@ -18,8 +18,8 @@ class BasicCount(APIView):
     '''
     def get(self, request, format=None):
         ret={}
-        ret['consumer1_count'] = Consumer.objects.filter(is_delete=False).exclude(username=None).count()
-        ret['consumer2_count'] = Consumer.objects.filter(is_delete=False).exclude(subjects=None).count()
+        ret['consumer1_count'] = Consumer.objects.filter(is_delete=False).count()
+        ret['consumer2_count'] = Consumer.objects.filter(is_delete=False).exclude(create_admin=None).count()
         ret['test_count'] = ExamTest.objects.filter(is_delete=False).count()
         ret['question_count'] = Question.objects.filter(is_delete=False).count()
         return Response(ret)