feat: 部分调整

src/views/fs/user/index.vue

@@ -51,6 +51,13 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="是否宠粉" align="center" prop="isRepeat">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isRepeat === 1 ? 'success' : 'danger'">
+            {{ scope.row.status === 1 ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="看课数量" align="center" prop="watchCourseCount" />
       <el-table-column label="参与营期数量" align="center" prop="partCourseCount" />
       <el-table-column label="所属销售" align="center" prop="companyUserNickName" />
@@ -65,17 +72,17 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['fs:user:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleQwAccount(scope.row)"
+            v-hasPermi="['fs:user:remove']"
+          >查看企微账号</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -204,6 +211,10 @@ export default {
     this.getList();
   },
   methods: {
+    // 查看企微账号
+    handleQwAccount(row){
+
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;

src/views/index.vue

@@ -175,46 +175,6 @@
         </el-col>
       </el-row>
     </el-card>
-
-    <el-row :gutter="20" class="charts-section">
-      <el-col :span="12">
-        <el-card shadow="never">
-          <div slot="header" class="chart-header">
-            <span>本月订单数</span>
-            <div class="legend">
-              <div class="legend-item">
-                <span class="dot viewer-dot"></span>
-                <span>订单数</span>
-              </div>
-              <div class="legend-item">
-                <span class="dot complete-dot"></span>
-                <span>订单金额</span>
-              </div>
-            </div>
-          </div>
-          <div ref="viewerOrderChart" class="chart-container"></div>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card shadow="never">
-          <div slot="header" class="chart-header">
-            <span>本月收款数</span>
-            <div class="legend">
-              <div class="legend-item">
-                <span class="dot viewer-dot"></span>
-                <span>收款数</span>
-              </div>
-              <div class="legend-item">
-                <span class="dot complete-dot"></span>
-                <span>收款金额</span>
-              </div>
-            </div>
-          </div>
-          <div ref="viewerReceiveChart" class="chart-container"></div>
-        </el-card>
-      </el-col>
-    </el-row>
-    <br/>
     <!-- 分析概览 (Analysis Overview) -->
     <div class="analysis-section" shadow="never">
       <div slot="header" class="header">
@@ -467,6 +427,45 @@
         </el-col>
       </el-row>
     </transition>
+    <el-row :gutter="20" class="charts-section">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <div slot="header" class="chart-header">
+            <span>本月订单数</span>
+            <div class="legend">
+              <div class="legend-item">
+                <span class="dot viewer-dot"></span>
+                <span>订单数</span>
+              </div>
+              <div class="legend-item">
+                <span class="dot complete-dot"></span>
+                <span>订单金额</span>
+              </div>
+            </div>
+          </div>
+          <div ref="viewerOrderChart" class="chart-container"></div>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card shadow="never">
+          <div slot="header" class="chart-header">
+            <span>本月收款数</span>
+            <div class="legend">
+              <div class="legend-item">
+                <span class="dot viewer-dot"></span>
+                <span>收款数</span>
+              </div>
+              <div class="legend-item">
+                <span class="dot complete-dot"></span>
+                <span>收款金额</span>
+              </div>
+            </div>
+          </div>
+          <div ref="viewerReceiveChart" class="chart-container"></div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <br/>
   </div>
 </template>
 
@@ -1456,7 +1455,7 @@ export default {
   background-color: #fff;
   border-radius: 4px;
   padding: 15px;
-  height: 100px;
+  height: 120px;
   display: flex;
   flex-direction: column;
   position: relative;